Package: mousetrap
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 d42df35db0b4b0b6f997c50f981220e051ab0ebb Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 09:30:34 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
.../{gcc4.3-fixed.dpatch => gcc4.3-fixed.patch} | 20 ++------------------
.../{hurd_ftbfs.dpatch => hurd_ftbfs.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 20 insertions(+), 32 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{gcc4.3-fixed.dpatch => gcc4.3-fixed.patch} (86%)
rename debian/patches/{hurd_ftbfs.dpatch => hurd_ftbfs.patch} (68%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 4bfe76f..e93575e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mousetrap (0.9-2.2) 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.
+
+ -- Jari Aalto <[email protected]> Tue, 28 Feb 2012 09:28:33 -0500
+
mousetrap (0.9-2.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 98243a0..6aca3ac 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: mousetrap
Section: games
Priority: optional
Maintainer: Anibal Avelar <[email protected]>
-Build-Depends: debhelper (>= 4.1.16), libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-mixer1.2-dev, autoconf, automake1.9, dpatch
+Build-Depends: debhelper (>= 9), libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-mixer1.2-dev, autoconf, automake1.9
Homepage: http://www.steve.org.uk/Software/mousetrap/
-Standards-Version: 3.7.3
+Standards-Version: 3.9.3
Package: mousetrap
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d21f971..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc4.3-fixed
-hurd_ftbfs
diff --git a/debian/patches/gcc4.3-fixed.dpatch b/debian/patches/gcc4.3-fixed.patch
similarity index 86%
rename from debian/patches/gcc4.3-fixed.dpatch
rename to debian/patches/gcc4.3-fixed.patch
index ada5f3b..96ba28b 100644
--- a/debian/patches/gcc4.3-fixed.dpatch
+++ b/debian/patches/gcc4.3-fixed.patch
@@ -1,22 +1,6 @@
-##
-## DP: Patch to fullfil with gcc4.3
+From: Anibal Avelar <[email protected]>
+Subject: Patch to fullfil with gcc4.3 (Closes: #463742)
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
- case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
- esac
-
-exit 0
diff -bBdNrw -U5 --exclude=debian mousetrap-0.9/Makefile.in mousetrap-0.9.modif/Makefile.in
--- mousetrap-0.9/Makefile.in 2007-12-02 08:07:23.000000000 -0600
+++ mousetrap-0.9.modif/Makefile.in 2008-02-10 16:40:07.744733108 -0600
diff --git a/debian/patches/hurd_ftbfs.dpatch b/debian/patches/hurd_ftbfs.patch
similarity index 68%
rename from debian/patches/hurd_ftbfs.dpatch
rename to debian/patches/hurd_ftbfs.patch
index 9d9a915..16c7b23 100644
--- a/debian/patches/hurd_ftbfs.dpatch
+++ b/debian/patches/hurd_ftbfs.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## hurd_ftbfs.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: <[email protected]>
+Subject: Fix FTBFS on Hurd. (Closes: #533735)
-@DPATCH@
diff -urNad mousetrap-0.9~/src/highscore.cpp mousetrap-0.9/src/highscore.cpp
--- mousetrap-0.9~/src/highscore.cpp 2007-12-02 09:07:24.000000000 -0500
+++ mousetrap-0.9/src/highscore.cpp 2009-12-23 16:06:50.000000000 -0500
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b69f050
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+gcc4.3-fixed.patch
+hurd_ftbfs.patch
diff --git a/debian/rules b/debian/rules
index 9dd9d72..0ba54e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
config.status: configure
dh_testdir
@@ -13,7 +12,7 @@ config.status: configure
--prefix=/usr --mandir=\$${prefix}/share/man/man6 \
--bindir=/usr/games --datadir=/usr/share/games CFLAGS="$(CFLAGS)"
-build: patch-stamp build-stamp
+build: build-stamp
build-stamp: config.status
dh_testdir
@@ -22,7 +21,7 @@ build-stamp: config.status
# Add here commands to compile the package.
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9.1
