summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/debian-changes23
1 files changed, 14 insertions, 9 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index d3b8824..817e26c 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -1,13 +1,18 @@
-The Debian packaging of inotify-tools is maintained using dgit. For the sake
-of an efficient workflow, Debian modifications to the upstream
-source are squashed into a single diff, rather than a series of
-quilt patches. To obtain a patch queue for package version
-3.14-1:
+The Debian packaging of inotify-tools 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.
- # apt-get install dgit
- % dgit clone inotify-tools
- % cd inotify-tools
- % git log --oneline 3.14-1..debian/3.14 -- . ':!debian'
+A detailed breakdown of the changes is available from their
+canonical representation - git commits in the packaging repository.
+
+ % git clone https://git.dgit.debian.org/inotify-tools
+ % cd foo
+ % git log --oneline 3.14-3..debian/3.14 -- . ':!debian'
+
+(If you have dgit, use `dgit clone foo', rather than plain `git
+clone'.)
+
+A single combined diff, containing all the changes, follows.
--- inotify-tools-3.14.orig/libinotifytools/src/test.c
+++ inotify-tools-3.14/libinotifytools/src/test.c
@@ -170,12 +170,12 @@ ENTER