summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-01-28 14:08:11 -0700
committerSean Whitton <spwhitton@spwhitton.name>2017-01-28 14:08:11 -0700
commit7c079fa8567c0fbbbebbfdbbfbad9bd0207ffead (patch)
tree147e0670208df6759faf0427d482504f1e363346
parent2a9da7fd7b757bc37015281b6b390d76df2a995d (diff)
Commit Debian 3.0 (quilt) metadata
[dgit (3.8) quilt-fixup]
-rw-r--r--debian/patches/debian-changes35
-rw-r--r--debian/patches/series1
2 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
new file mode 100644
index 0000000..b359363
--- /dev/null
+++ b/debian/patches/debian-changes
@@ -0,0 +1,35 @@
+The Debian packaging of paredit-everywhere is maintained in git, using
+the merging workflow described in dgit-maint-merge(7). There isn't a
+patch queue that can be represented as a quilt series.
+
+A detailed breakdown of the changes is available from their
+canonical representation - git commits in the packaging repository.
+For example, to see the changes made by the Debian maintainer in
+the first upload of upstream version 1.2.3, you could use:
+
+ % git clone https://git.dgit.debian.org/paredit-everywhere
+ % cd paredit-everywhere
+ % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone paredit-everywhere`, rather than
+plain `git clone`.)
+
+A single combined diff, containing all the changes, follows.
+--- paredit-everywhere-0.4.orig/paredit-everywhere.el
++++ paredit-everywhere-0.4/paredit-everywhere.el
+@@ -42,14 +42,12 @@
+ (define-key m (kbd "C-)") 'paredit-forward-slurp-sexp)
+ (define-key m (kbd "C-}") 'paredit-forward-barf-sexp)
+ (define-key m (kbd "M-(") 'paredit-wrap-round)
+- (define-key m (kbd "M-[") 'paredit-wrap-square)
+- (define-key m (kbd "M-{") 'paredit-wrap-curly)
+ (define-key m (kbd "M-)") 'paredit-close-round-and-newline)
+ (define-key m (kbd "M-]") 'paredit-close-square-and-newline)
+ (define-key m (kbd "M-}") 'paredit-close-curly-and-newline)
+ (define-key m (kbd "M-\"") 'paredit-meta-doublequote)
+ (define-key m (kbd "M-S") 'paredit-split-sexp)
+- (define-key m (kbd "M-J") 'paredit-join-sexp)
++ (define-key m (kbd "M-J") 'paredit-join-sexps)
+ (define-key m (kbd "M-s") 'paredit-splice-sexp)
+ (define-key m (kbd "M-r") 'paredit-raise-sexp)
+ (define-key m (kbd "M-DEL") 'paredit-backward-kill-word)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7bb8252
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes