Package: xxgdb
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 000e87e5ce1844c53bf4977ece01b5c8b0fbf67c Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 25 Apr 2012 10:56:41 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 11 +++++++
debian/compat | 2 +-
debian/control | 6 ++--
.../{001-imakefile.dpatch => 001-imakefile.patch} | 8 ++---
...{002-x-terminal.dpatch => 002-x-terminal.patch} | 8 ++---
...-debian-patch.dpatch => 003-debian-patch.patch} | 8 ++---
.../{004-backspace.dpatch => 004-backspace.patch} | 8 ++---
debian/patches/005-kfreebsd.dpatch | 21 -------------
debian/patches/005-kfreebsd.patch | 20 +++++++++++++
...06-nroff-fixes.dpatch => 006-nroff-fixes.patch} | 23 +++++++--------
...ort-filemenu.dpatch => 007-sort-filemenu.patch} | 21 +++++++------
...08-unix98-ptys.dpatch => 008-unix98-ptys.patch} | 31 ++++++++++----------
...09-iowinttypid.dpatch => 009-iowinttypid.patch} | 8 ++---
debian/patches/00list | 11 -------
.../{010-gcc-wall.dpatch => 010-gcc-wall.patch} | 8 ++---
....man-fixes.dpatch => 020-xxgdb.man-fixes.patch} | 8 ++---
debian/patches/series | 11 +++++++
debian/rules | 26 +++++-----------
debian/source/format | 2 +-
19 files changed, 105 insertions(+), 136 deletions(-)
rename debian/patches/{001-imakefile.dpatch => 001-imakefile.patch} (87%)
rename debian/patches/{002-x-terminal.dpatch => 002-x-terminal.patch} (73%)
rename debian/patches/{003-debian-patch.dpatch => 003-debian-patch.patch} (98%)
rename debian/patches/{004-backspace.dpatch => 004-backspace.patch} (90%)
delete mode 100644 debian/patches/005-kfreebsd.dpatch
create mode 100644 debian/patches/005-kfreebsd.patch
rename debian/patches/{006-nroff-fixes.dpatch => 006-nroff-fixes.patch} (80%)
rename debian/patches/{007-sort-filemenu.dpatch => 007-sort-filemenu.patch} (55%)
rename debian/patches/{008-unix98-ptys.dpatch => 008-unix98-ptys.patch} (66%)
rename debian/patches/{009-iowinttypid.dpatch => 009-iowinttypid.patch} (88%)
delete mode 100644 debian/patches/00list
rename debian/patches/{010-gcc-wall.dpatch => 010-gcc-wall.patch} (98%)
rename debian/patches/{020-xxgdb.man-fixes.dpatch => 020-xxgdb.man-fixes.patch} (89%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 6774991..58eb310 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xxgdb (1.12-17.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add required build-arch and build-indep targets to rules file.
+ * Patches 00[5678]: update with "quilt refresh" to make them apply cleanly.
+ * Fix description-synopsis-starts-with-article (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 25 Apr 2012 10:53:51 +0300
+
xxgdb (1.12-17) unstable; urgency=low
* Import NMU
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f8f938c..43258ec 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: xxgdb
Section: devel
Priority: optional
Maintainer: Joey Schulze <j...@debian.org>
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7.1), dpatch, libxaw7-dev, libx11-dev,
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), libxaw7-dev, libx11-dev,
libxt-dev, x11proto-core-dev, xutils-dev
Package: xxgdb
Architecture: any
Depends: ${misc:Depends}, gdb, ${shlibs:Depends}
-Description: An X front-end to the GNU debugger gdb
+Description: graphical front-end to the GNU debugger gdb
xxgdb is a simple but powerful graphical interface to the GNU
debugger gdb. A more powerful (but slower and much bigger) interface
is available in the ddd package.
diff --git a/debian/patches/001-imakefile.dpatch b/debian/patches/001-imakefile.patch
similarity index 87%
rename from debian/patches/001-imakefile.dpatch
rename to debian/patches/001-imakefile.patch
index 175d71c..14693c2 100644
--- a/debian/patches/001-imakefile.dpatch
+++ b/debian/patches/001-imakefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-imakefile.dpatch by
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian adjustments to Imakefile
+From: Unknown
+Subject: Debian adjustments to Imakefile
-@DPATCH@
diff -urNad xxgdb-1.12~/Imakefile xxgdb-1.12/Imakefile
--- xxgdb-1.12~/Imakefile 1996-10-02 10:59:44.000000000 +0200
+++ xxgdb-1.12/Imakefile 2008-05-16 17:37:24.000000000 +0200
diff --git a/debian/patches/002-x-terminal.dpatch b/debian/patches/002-x-terminal.patch
similarity index 73%
rename from debian/patches/002-x-terminal.dpatch
rename to debian/patches/002-x-terminal.patch
index cfb3422..ae18787 100644
--- a/debian/patches/002-x-terminal.dpatch
+++ b/debian/patches/002-x-terminal.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 002-x-terminal.dpatch by Matej Vela <v...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use x-terminal-emulator
+From: Matej Vela <v...@debian.org>
+Subject: Use x-terminal-emulator
-@DPATCH@
diff -urNad xxgdb-1.12~/calldbx.c xxgdb-1.12/calldbx.c
--- xxgdb-1.12~/calldbx.c 1996-10-02 10:59:45.000000000 +0200
+++ xxgdb-1.12/calldbx.c 2008-05-16 17:20:34.000000000 +0200
diff --git a/debian/patches/003-debian-patch.dpatch b/debian/patches/003-debian-patch.patch
similarity index 98%
rename from debian/patches/003-debian-patch.dpatch
rename to debian/patches/003-debian-patch.patch
index 269f23f..19e2a7c 100644
--- a/debian/patches/003-debian-patch.dpatch
+++ b/debian/patches/003-debian-patch.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 003-debian-patch.dpatch by misc maintainers
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Misc Debian related patch up to 1.12-13
+From: misc maintainers
+Subject: Misc Debian related patch up to 1.12-13
-@DPATCH@
diff -urNad xxgdb-1.12~/XDbx.OLD_INTERFACE xxgdb-1.12/XDbx.OLD_INTERFACE
--- xxgdb-1.12~/XDbx.OLD_INTERFACE 1970-01-01 01:00:00.000000000 +0100
+++ xxgdb-1.12/XDbx.OLD_INTERFACE 2008-05-16 17:39:25.000000000 +0200
diff --git a/debian/patches/004-backspace.dpatch b/debian/patches/004-backspace.patch
similarity index 90%
rename from debian/patches/004-backspace.dpatch
rename to debian/patches/004-backspace.patch
index cbdf1e4..3435850 100644
--- a/debian/patches/004-backspace.dpatch
+++ b/debian/patches/004-backspace.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 004-backspace.dpatch by Francesco Paolo Lovergine <fran...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Properly support backspace key
+From: Francesco Paolo Lovergine <fran...@debian.org>
+Subject: Properly support backspace key
-@DPATCH@
diff -urNad xxgdb-1.12~/dialog.c xxgdb-1.12/dialog.c
--- xxgdb-1.12~/dialog.c 1995-06-20 00:15:13.000000000 +0200
+++ xxgdb-1.12/dialog.c 2008-05-16 17:31:45.000000000 +0200
diff --git a/debian/patches/005-kfreebsd.dpatch b/debian/patches/005-kfreebsd.dpatch
deleted file mode 100644
index b8cf9f2..0000000
--- a/debian/patches/005-kfreebsd.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 005-kfreebsd.dpatch by Petr Salinger <petr.salin...@seznam.cz>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support GNU/kFreeBSD
-
-@DPATCH@
-diff -urNad xxgdb-1.12~/Imakefile xxgdb-1.12/Imakefile
---- xxgdb-1.12~/Imakefile 1996-10-02 10:59:44.000000000 +0200
-+++ xxgdb-1.12/Imakefile 2008-05-16 17:37:48.000000000 +0200
-@@ -62,6 +62,10 @@
- DEFINES = -DSYSV $(DEFGDB)
- #endif
-
-+#if defined(KFreeBSDArchitecture)
-+DEFINES = -DHAVE_SIGNAL_H -DHAVE_WAITPID -DHAVE_KILLPG -DNO_SCANDIR $(DEFGDB) -DBSD
-+#endif
-+
- #if defined(NeXTArchitecture) || defined(NextArchitecture)
- #if OSMajorVersion == 3
- #if OSMinorVersion == 0
diff --git a/debian/patches/005-kfreebsd.patch b/debian/patches/005-kfreebsd.patch
new file mode 100644
index 0000000..1c26adf
--- /dev/null
+++ b/debian/patches/005-kfreebsd.patch
@@ -0,0 +1,20 @@
+From: Petr Salinger <petr.salin...@seznam.cz>
+Subject: Support GNU/kFreeBSD
+
+---
+ Imakefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/Imakefile
++++ b/Imakefile
+@@ -63,6 +63,10 @@
+ DEFINES = -DHAVE_SIGNAL_H -DHAVE_WAITPID -DHAVE_KILLPG -DNO_SCANDIR $(DEFGDB)
+ #endif
+
++#if defined(KFreeBSDArchitecture)
++DEFINES = -DHAVE_SIGNAL_H -DHAVE_WAITPID -DHAVE_KILLPG -DNO_SCANDIR $(DEFGDB) -DBSD
++#endif
++
+ #if defined(NeXTArchitecture) || defined(NextArchitecture)
+ #if OSMajorVersion == 3
+ #if OSMinorVersion == 0
diff --git a/debian/patches/006-nroff-fixes.dpatch b/debian/patches/006-nroff-fixes.patch
similarity index 80%
rename from debian/patches/006-nroff-fixes.dpatch
rename to debian/patches/006-nroff-fixes.patch
index cffd71f..3a04402 100644
--- a/debian/patches/006-nroff-fixes.dpatch
+++ b/debian/patches/006-nroff-fixes.patch
@@ -1,13 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 006-nroff-fixes.dpatch by Nicolas Francois <nicolas.franc...@centraliens.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: nroff corrections
+From: Nicolas Francois <nicolas.franc...@centraliens.net>
+Subject: nroff corrections
-@DPATCH@
-diff -urNad xxgdb-1.12~/xxgdb.man xxgdb-1.12/xxgdb.man
---- xxgdb-1.12~/xxgdb.man 1996-10-02 10:59:45.000000000 +0200
-+++ xxgdb-1.12/xxgdb.man 2008-05-16 17:40:25.000000000 +0200
+---
+ xxgdb.man | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+--- a/xxgdb.man
++++ b/xxgdb.man
@@ -1,4 +1,4 @@
-.TH XXGDB 1.10 "November 1994" "X Version 11"
+.TH XXGDB 1 "November 1994" "X Version 11"
@@ -34,7 +33,7 @@ diff -urNad xxgdb-1.12~/xxgdb.man xxgdb-1.12/xxgdb.man
Specify the filename of initial gdb command file. The default
is ".gdbinit".
.IP -nx
-@@ -168,7 +168,7 @@
+@@ -171,7 +171,7 @@
Print the arguments of the selected frame.
.IP "\fBshow display\fP"
Show the names of currently displayed expressions.
@@ -43,7 +42,7 @@ diff -urNad xxgdb-1.12~/xxgdb.man xxgdb-1.12/xxgdb.man
Print the local variables of the selected frame.
.IP "\fBstack\fP"
Print a backtrace of the entire stack.
-@@ -285,7 +285,7 @@
+@@ -292,7 +292,7 @@
.IP \fBdisplayWindow\fP
If True, the display window appears on start up. (False)
.IP \fBdelimiters\fP
@@ -52,7 +51,7 @@ diff -urNad xxgdb-1.12~/xxgdb.man xxgdb-1.12/xxgdb.man
.IP \fBstop_color\fP
Color of the stop sign. (Red)
.IP \fBarrow_color\fP
-@@ -323,9 +323,12 @@
+@@ -330,9 +330,12 @@
X(1), gdb(1)
.SH COPYRIGHT
Copyright 1989 The University of Texas at Austin.
diff --git a/debian/patches/007-sort-filemenu.dpatch b/debian/patches/007-sort-filemenu.patch
similarity index 55%
rename from debian/patches/007-sort-filemenu.dpatch
rename to debian/patches/007-sort-filemenu.patch
index 91a7952..29265ac 100644
--- a/debian/patches/007-sort-filemenu.dpatch
+++ b/debian/patches/007-sort-filemenu.patch
@@ -1,15 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 007-sort-filemenu.dpatch by Michael Kebe <michael.k...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Sort files in file menu
+From: Michael Kebe <michael.k...@gmail.com>
+Subject: Sort files in file menu
-@DPATCH@
-diff -urNad xxgdb-1.12~/filemenu.c xxgdb-1.12/filemenu.c
---- xxgdb-1.12~/filemenu.c 1994-08-29 21:38:28.000000000 +0200
-+++ xxgdb-1.12/filemenu.c 2008-05-16 17:41:54.000000000 +0200
+---
+ filemenu.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/filemenu.c
++++ b/filemenu.c
@@ -220,6 +220,15 @@
- #endif /* not SYSV */
+ #endif /* not NO_SCANDIR */
+#ifdef NO_SCANDIR
@@ -26,7 +25,7 @@ diff -urNad xxgdb-1.12~/filemenu.c xxgdb-1.12/filemenu.c
* entries called namelist.
@@ -307,6 +316,8 @@
- #ifdef SYSV
+ #ifdef NO_SCANDIR
closedir(WorkingDir);
+ nfiles = i;
+ qsort(filelist, nfiles-1, sizeof(filelist[0]), filenamecmp);
diff --git a/debian/patches/008-unix98-ptys.dpatch b/debian/patches/008-unix98-ptys.patch
similarity index 66%
rename from debian/patches/008-unix98-ptys.dpatch
rename to debian/patches/008-unix98-ptys.patch
index 047cec0..3a7f4b4 100644
--- a/debian/patches/008-unix98-ptys.dpatch
+++ b/debian/patches/008-unix98-ptys.patch
@@ -1,16 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 008-unix98-ptys.dpatch by Francesco Paolo Lovergine <fran...@debian.org> and Joey Schulze <j...@infodrom.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support Unix98 PTYs
+From: Francesco Paolo Lovergine <fran...@debian.org> and Joey Schulze <j...@infodrom.org>
+Subject: Support Unix98 PTYs
-@DPATCH@
-diff -urNad xxgdb-1.12~/calldbx.c xxgdb-1.12/calldbx.c
---- xxgdb-1.12~/calldbx.c 1996-10-02 10:59:45.000000000 +0200
-+++ xxgdb-1.12/calldbx.c 2008-05-16 17:44:05.000000000 +0200
-@@ -85,8 +85,10 @@
- #include <sys/un.h>
- #endif /* CREATE_IO_WINDOW */
+---
+ calldbx.c | 32 ++++++++++++++++++++++++++++----
+ 1 file changed, 28 insertions(+), 4 deletions(-)
+
+--- a/calldbx.c
++++ b/calldbx.c
+@@ -88,8 +88,10 @@
+
+ #include "global.h"
-#ifdef SVR4
+#if defined(SVR4) || defined(UNIX98)
@@ -20,7 +19,7 @@ diff -urNad xxgdb-1.12~/calldbx.c xxgdb-1.12/calldbx.c
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/stropts.h>
-@@ -125,13 +127,14 @@
+@@ -128,13 +130,14 @@
{
int master;
@@ -37,7 +36,7 @@ diff -urNad xxgdb-1.12~/calldbx.c xxgdb-1.12/calldbx.c
int i;
char c;
-@@ -150,7 +153,7 @@
+@@ -153,7 +156,7 @@
#ifndef sco
}
#endif
@@ -46,7 +45,7 @@ diff -urNad xxgdb-1.12~/calldbx.c xxgdb-1.12/calldbx.c
#ifdef GDB
fprintf(stderr, "xxgdb: all ptys in use\n");
-@@ -166,6 +169,25 @@
+@@ -169,6 +172,25 @@
{
int slave;
@@ -72,7 +71,7 @@ diff -urNad xxgdb-1.12~/calldbx.c xxgdb-1.12/calldbx.c
#ifdef SVR4 /* (MJH) */
char *slave_name = "unknown";
extern char *ptsname(int master);
-@@ -193,6 +215,8 @@
+@@ -196,6 +218,8 @@
}
return slave;
#endif /* SVR4 */
diff --git a/debian/patches/009-iowinttypid.dpatch b/debian/patches/009-iowinttypid.patch
similarity index 88%
rename from debian/patches/009-iowinttypid.dpatch
rename to debian/patches/009-iowinttypid.patch
index e03fcb4..f1f11db 100644
--- a/debian/patches/009-iowinttypid.dpatch
+++ b/debian/patches/009-iowinttypid.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 009-iowinttypid.dpatch by Joey Schulze <j...@infodrom.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move Unix socket into home directory to prevent symlink attacks
+From: Joey Schulze <j...@infodrom.org>
+Subject: Move Unix socket into home directory to prevent symlink attacks
-@DPATCH@
diff -urNad xxgdb-1.12~/calldbx.c xxgdb-1.12/calldbx.c
--- xxgdb-1.12~/calldbx.c 2008-05-16 17:50:07.000000000 +0200
+++ xxgdb-1.12/calldbx.c 2008-05-16 17:50:07.000000000 +0200
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0095cc7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,11 +0,0 @@
-001-imakefile
-002-x-terminal
-003-debian-patch
-004-backspace
-005-kfreebsd
-006-nroff-fixes
-007-sort-filemenu
-008-unix98-ptys
-009-iowinttypid
-010-gcc-wall
-020-xxgdb.man-fixes
diff --git a/debian/patches/010-gcc-wall.dpatch b/debian/patches/010-gcc-wall.patch
similarity index 98%
rename from debian/patches/010-gcc-wall.dpatch
rename to debian/patches/010-gcc-wall.patch
index 16ebefc..85c6bb2 100644
--- a/debian/patches/010-gcc-wall.dpatch
+++ b/debian/patches/010-gcc-wall.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 010-gcc-wall.dpatch by Joey Schulze <j...@infodrom.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Clean up code so that it is -Wall clean
+From: Joey Schulze <j...@infodrom.org>
+Subject: Clean up code so that it is -Wall clean
-@DPATCH@
diff -urNad xxgdb~/calldbx.c xxgdb/calldbx.c
--- xxgdb~/calldbx.c 2008-05-17 10:05:14.000000000 +0200
+++ xxgdb/calldbx.c 2008-05-17 10:05:14.000000000 +0200
diff --git a/debian/patches/020-xxgdb.man-fixes.dpatch b/debian/patches/020-xxgdb.man-fixes.patch
similarity index 89%
rename from debian/patches/020-xxgdb.man-fixes.dpatch
rename to debian/patches/020-xxgdb.man-fixes.patch
index 9ff1183..b22e9f4 100644
--- a/debian/patches/020-xxgdb.man-fixes.dpatch
+++ b/debian/patches/020-xxgdb.man-fixes.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 020-xxgdb.man-fixes.dpatch by Jari Aalto <jari.aa...@cante.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Hyphenation fixes in xxgdb.man
+From: Jari Aalto <jari.aa...@cante.net>
+Subject: Hyphenation fixes in xxgdb.man
-@DPATCH@
diff --git a/xxgdb.man b/xxgdb.man
index 9ef9235..239e31c 100644
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..20a1283
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,11 @@
+001-imakefile.patch
+002-x-terminal.patch
+003-debian-patch.patch
+004-backspace.patch
+005-kfreebsd.patch
+006-nroff-fixes.patch
+007-sort-filemenu.patch
+008-unix98-ptys.patch
+009-iowinttypid.patch
+010-gcc-wall.patch
+020-xxgdb.man-fixes.patch
diff --git a/debian/rules b/debian/rules
index 618037f..dd31988 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,12 @@ endif
export CC = gcc
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -26,15 +30,14 @@ build-stamp: patch
> debian/upstream.changelog
touch build-stamp
-clean: clean1 unpatch
-clean1:
+clean:
dh_testdir
dh_testroot
dh_prep
dh_clean debian/upstream.changelog
# Add here commands to clean up after the build process.
- test ! -f Makefile || { $(MAKE) clean && rm Makefile; }
+ [ ! -f Makefile ] || { $(MAKE) clean && rm Makefile; }
install: build-stamp
dh_testdir
@@ -83,19 +86,6 @@ binary-arch: build install
dh_builddeb
-# And now the simple things for dpatch. Here we only apply/unapply the patches.
-# You can do more things with dpatch, like having patches only applied on
-# a special architecture - see the non-dh version of the sample for this!
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
- touch patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
binary: binary-indep binary-arch
-.PHONY: binary clean binary-indep binary-arch build install patch unpatch \
+.PHONY: binary clean binary-indep binary-arch build install \
clean1
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.10
