Commit Debian 3.0 (quilt) metadata

[dgit (3.1) quilt-fixup]

4 files changed, 37 insertions, 48 deletions

diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
new file mode 100644
index 0000000..78e42ed
--- /dev/null
+++ b/debian/patches/debian-changes
@@ -0,0 +1,36 @@
+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:
+
+    # apt-get install dgit
+    % dgit clone foo
+    % cd foo
+    % git log --oneline 2.20170109-1..debian/2.20170109 -- . ':!debian'
+--- farbfeld-2.20170109.orig/config.mk
++++ farbfeld-2.20170109/config.mk
+@@ -4,8 +4,8 @@ VERSION = 2
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/man
++PREFIX = /usr
++MANPREFIX = ${PREFIX}/share/man
+ 
+ PNGLIB = /usr/local/lib
+ PNGINC = /usr/local/include
+@@ -17,9 +17,9 @@ INCS =
+ LIBS =
+ 
+ # flags
+-CPPFLAGS = -D_DEFAULT_SOURCE
+-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS}
+-LDFLAGS  = -s ${LIBS}
++CPPFLAGS += -D_DEFAULT_SOURCE
++CFLAGS   += -std=c99 -pedantic -Wall -Os ${INCS}
++LDFLAGS  += -s ${LIBS}
+ 
+ # compiler and linker
+ CC = cc
diff --git a/debian/patches/fix-installation-paths b/debian/patches/fix-installation-paths
deleted file mode 100644
index f4b6a26..0000000
--- a/debian/patches/fix-installation-paths
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Dmitry Bogatov <KAction@gnu.org>
-Date: Thu, 12 Jan 2017 14:24:35 +0300
-X-Dgit-Generated: 2.20170109-1 39b48232f24a32481cd68b4482ed0ec24ea40220
-Subject: Fix installation paths
-
- * prefix=/usr
- * manpath=/usr/share/man
-
----
-
---- farbfeld-2.20170109.orig/config.mk
-+++ farbfeld-2.20170109/config.mk
-@@ -4,8 +4,8 @@ VERSION = 2
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/man
-+PREFIX = /usr
-+MANPREFIX = ${PREFIX}/share/man
- 
- PNGLIB = /usr/local/lib
- PNGINC = /usr/local/include
diff --git a/debian/patches/respect-flags-passed-by-debhelper b/debian/patches/respect-flags-passed-by-debhelper
deleted file mode 100644
index ee5fbc4..0000000
--- a/debian/patches/respect-flags-passed-by-debhelper
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Dmitry Bogatov <KAction@gnu.org>
-Date: Thu, 12 Jan 2017 14:30:25 +0300
-X-Dgit-Generated: 2.20170109-1 3f2edacf422c4096bc36e172f72e0088a24cd2a3
-Subject: Respect FLAGS passed by debhelper
-
-
----
-
---- farbfeld-2.20170109.orig/config.mk
-+++ farbfeld-2.20170109/config.mk
-@@ -17,9 +17,9 @@ INCS =
- LIBS =
- 
- # flags
--CPPFLAGS = -D_DEFAULT_SOURCE
--CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS}
--LDFLAGS  = -s ${LIBS}
-+CPPFLAGS += -D_DEFAULT_SOURCE
-+CFLAGS   += -std=c99 -pedantic -Wall -Os ${INCS}
-+LDFLAGS  += -s ${LIBS}
- 
- # compiler and linker
- CC = cc
diff --git a/debian/patches/series b/debian/patches/series
index 95486a2..7bb8252 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix-installation-paths
-respect-flags-passed-by-debhelper
+debian-changes