diff options
author | Dmitry Bogatov <KAction@gnu.org> | 2017-03-14 08:53:07 +0300 |
---|---|---|
committer | Dmitry Bogatov <KAction@gnu.org> | 2017-03-14 08:53:07 +0300 |
commit | ed0e5905eff7383b05b87ecf1689a6938f9d79d3 (patch) | |
tree | 50ee52b847c4a021b4890e6aa7c11d0692a4a07c | |
parent | f44a1a9409f620a99ccdd4220726be451be172d8 (diff) |
Commit Debian 3.0 (quilt) metadata
[dgit (3.10) quilt-fixup]
-rw-r--r-- | debian/patches/debian-changes | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 78e42ed..b7e94cf 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -1,13 +1,32 @@ -The Debian packaging of farbfeld 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 -2.20170109-1: +The Debian packaging of farbfeld 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 foo +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/farbfeld % cd foo % git log --oneline 2.20170109-1..debian/2.20170109 -- . ':!debian' + +(If you have dgit, use `dgit clone foo', rather than plain `git +clone'.) + +A single combined diff, containing all the changes, follows. +--- farbfeld-2.20170109.orig/2ff ++++ farbfeld-2.20170109/2ff +@@ -24,6 +24,11 @@ image/jpeg) + jpg2ff < "$TMP" + ;; + *) ++ if [ ! -x /usr/bin/convert ] ; then ++ printf "%s: cant convert from %s -- missing \`convert' program" "$0" "$FORMAT" >&2 ++ printf "Run \`apt-get install imagemagick' to install it" >&2 ++ exit 1 ++ fi + convert "$TMP" png:- 2>/dev/null | png2ff 2>/dev/null + ;; + esac --- farbfeld-2.20170109.orig/config.mk +++ farbfeld-2.20170109/config.mk @@ -4,8 +4,8 @@ VERSION = 2 |