summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-06-20 17:31:35 +0100
committerSean Whitton <spwhitton@spwhitton.name>2017-06-20 17:31:35 +0100
commitcab46e4db552cddfe800d4e81239639037068a3f (patch)
tree80f86c106c69ad6f8dcf9d6c93389a7849ed83e0
parent817a99de283888189f1712b686208ef349a1b096 (diff)
Commit Debian 3.0 (quilt) metadatadebian/0.0.15-2archive/debian/0.0.15-2
[dgit (4.0) quilt-fixup]
-rw-r--r--debian/patches/debian-changes50
-rw-r--r--debian/patches/series1
2 files changed, 51 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
new file mode 100644
index 0000000..21c516f
--- /dev/null
+++ b/debian/patches/debian-changes
@@ -0,0 +1,50 @@
+The Debian packaging of emacs-noflet 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/emacs-noflet
+ % cd emacs-noflet
+ % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone emacs-noflet`, rather than plain
+`git clone`.)
+
+A single combined diff, containing all the changes, follows.
+--- /dev/null
++++ emacs-noflet-0.0.15/.gitignore
+@@ -0,0 +1 @@
++debian/elpa-noflet
+--- emacs-noflet-0.0.15.orig/noflet.el
++++ emacs-noflet-0.0.15/noflet.el
+@@ -6,6 +6,7 @@
+ ;; Keywords: lisp
+ ;; Version: 0.0.15
+ ;; Url: https://github.com/nicferrier/emacs-noflet
++;; Package-Requires: ((cl-lib "0.4") (dash "2.10.0"))
+
+ ;; This program is free software; you can redistribute it and/or modify
+ ;; it under the terms of the GNU General Public License as published by
+@@ -28,7 +29,8 @@
+
+ ;;; Code:
+
+-(eval-when-compile (require 'cl))
++(require 'dash)
++(eval-when-compile (require 'cl-lib))
+ (if (version< emacs-version "24.4.1")
+ (load-library "cl-indent")
+ (require 'cl-indent))
+@@ -155,7 +157,7 @@ maintainers refuse to add the correct in
+ (indent noflet-indent-func))
+ `(cl-flet ,bindings ,@body))
+
+-(defmacro* letn (tag bindings &rest body)
++(cl-defmacro letn (tag bindings &rest body)
+ (declare (debug (sexp sexp &rest form))
+ (indent 2))
+ `(cl-labels ((,tag ,(-map 'car bindings) ,@body))
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