Package: zatacka
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 3441fdd8f47565aaa24beef0b451232d8e7f54f3 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 28 Feb 2012 12:23:00 -0500
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 | 10 ++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
debian/patches/kfreebsd.dpatch | 31 -------------------------------
debian/patches/kfreebsd.patch | 18 ++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 35 insertions(+), 38 deletions(-)
delete mode 100644 debian/patches/00list
delete mode 100644 debian/patches/kfreebsd.dpatch
create mode 100644 debian/patches/kfreebsd.patch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index f3aa446..72c9f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zatacka (0.1.8-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: patch was updated with "quilt refresh" to make
+ it apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 28 Feb 2012 12:12:08 -0500
+
zatacka (0.1.8-2) unstable; urgency=low
* Added kfreebsd.dpatch to fix the FTBFS on GNU/kFreeBSD.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 97745da..d8ab9c4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: zatacka
Section: games
Priority: optional
Maintainer: Anibal Avelar <aave...@cofradia.org>
-Build-Depends: debhelper (>= 5), autoconf, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, ttf-dejavu, dpatch
+Build-Depends: debhelper (>= 9), autoconf, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, ttf-dejavu
Homepage: http://zatacka.sourceforge.net/
-Standards-Version: 3.7.3
+Standards-Version: 3.9.3
Package: zatacka
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f27ef98..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-kfreebsd
diff --git a/debian/patches/kfreebsd.dpatch b/debian/patches/kfreebsd.dpatch
deleted file mode 100644
index d92cc00..0000000
--- a/debian/patches/kfreebsd.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-##
-## DP: Patch to fix the FTBFS on GNU/kFreeBSD
-
-[ -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 zatacka-0.1.8/src/main.cpp zatacka-0.1.8.modif/src/main.cpp
---- zataka-0.1.8/src/main.cpp 2008-02-15 21:11:00.000000000 +0100
-+++ zatacka-0.1.8.modif/src/main.cpp 2008-02-15 21:11:00.000000000 +0100
-@@ -17,7 +17,7 @@
- *
- */
-
--#ifdef __linux__
-+#ifdef __unix__
- #include <unistd.h>
- #include <defaults.h>
- #endif
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
new file mode 100644
index 0000000..f6ecfc0
--- /dev/null
+++ b/debian/patches/kfreebsd.patch
@@ -0,0 +1,18 @@
+From: Unknown
+Subject: Patch to fix the FTBFS on GNU/kFreeBSD
+
+---
+ src/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -17,7 +17,7 @@
+ *
+ */
+
+-#ifdef __linux__
++#ifdef __unix__
+ #include <unistd.h>
+ #include <defaults.h>
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..26238c9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kfreebsd.patch
diff --git a/debian/rules b/debian/rules
index 73eb5c1..102bfcb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -29,14 +28,14 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
endif
./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games
-build: patch-stamp build-stamp
+build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
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
