Package: hannah
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 082b3383a18b6e66d59ffaa2d9fea193a2e515fc Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 21:26:28 +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/README.source | 2 --
debian/changelog | 13 +++++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/copyright | 11 +++++++----
debian/patches/00list | 3 ---
.../patches/{data_path.dpatch => data-path.patch} | 8 ++------
.../{extra_cflags.dpatch => extra-cflags.patch} | 8 ++------
.../{fix_score_dir.dpatch => fix-score-dir.patch} | 7 ++-----
debian/patches/series | 3 +++
debian/rules | 19 ++++++++++++-------
debian/source/format | 1 +
12 files changed, 46 insertions(+), 37 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{data_path.dpatch => data-path.patch} (97%)
rename debian/patches/{extra_cflags.dpatch => extra-cflags.patch} (72%)
rename debian/patches/{fix_score_dir.dpatch => fix-score-dir.patch} (90%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 982fbe2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-This package uses dpatch. Please see:
-/usr/share/doc/dpatch/README.source.gz
diff --git a/debian/changelog b/debian/changelog
index c99202a..16aeb6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+hannah (1.0-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt";
+ note that "deps" files was restored from original sources.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+ * Fix dh_desktop-is-deprecated (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 21:26:24 +0300
+
hannah (1.0-2) unstable; urgency=low
* Corrected some lintian warnings:
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 5ba66d3..6efd873 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: hannah
Section: games
Priority: extra
Maintainer: Margarita Manterola <ma...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch, imagemagick, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), imagemagick, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
+Standards-Version: 3.9.3
Homepage: http://www.retrojunkies.co.uk/index.php?page=game
Package: hannah
Architecture: any
-Depends: hannah-data (= ${source:Version}), ${shlibs:Depends}
+Depends: ${misc:Depends}, hannah-data (= ${source:Version}), ${shlibs:Depends}
Description: pacman-like game, child oriented
Help Hannah's Horse is like a cross between Pacman and the Dizzy game
"Fastfood". The objective is to move Hannah to collect the pills around
diff --git a/debian/copyright b/debian/copyright
index 6f63ce0..cf9202d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,11 +5,14 @@ It was downloaded from http://sourceforge.net/projects/hannah/
Upstream Author: Stephen Branley <yotts...@users.sourceforge.net>
-Copyright: 2007, Stephen Branley
+Copyright:
+
+Copyright (C) 2007 Stephen Branley
License: this program is distribued under the terms of the GNU General
Public License, version 2. In Debian systems, you can find the full text
-of the GNU General Public License at /usr/share/common-licenses/GPL
+of the GNU General Public License at /usr/share/common-licenses/GPL-2
-The Debian packaging is (C) 2007, Margarita Manterola <ma...@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 2007, Margarita Manterola
+<ma...@debian.org> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c4dcd45..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-#extra_cflags
-#data_path
-fix_score_dir
diff --git a/debian/patches/data_path.dpatch b/debian/patches/data-path.patch
similarity index 97%
rename from debian/patches/data_path.dpatch
rename to debian/patches/data-path.patch
index b0e07a2..c4c6c97 100644
--- a/debian/patches/data_path.dpatch
+++ b/debian/patches/data-path.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## image_path.dpatch by <ma...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Margarita Manterola <ma...@debian.org>
+Subject: Respect DATADIR setting
-@DPATCH@
diff -urNad hannah-0.2.a~/Animation.cc hannah-0.2.a/Animation.cc
--- hannah-0.2.a~/Animation.cc 2007-01-14 10:33:42.000000000 -0300
+++ hannah-0.2.a/Animation.cc 2007-01-14 10:46:53.000000000 -0300
diff --git a/debian/patches/extra_cflags.dpatch b/debian/patches/extra-cflags.patch
similarity index 72%
rename from debian/patches/extra_cflags.dpatch
rename to debian/patches/extra-cflags.patch
index 9bbf404..88f3ee6 100644
--- a/debian/patches/extra_cflags.dpatch
+++ b/debian/patches/extra-cflags.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## extra_cflags.dpatch by <ma...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Margarita Manterola <ma...@debian.org>
+Subject: Define EXTRA_CFLAGS in Makefile
-@DPATCH@
diff -urNad hannah-0.2.a~/Makefile hannah-0.2.a/Makefile
--- hannah-0.2.a~/Makefile 2007-01-14 11:55:18.000000000 -0300
+++ hannah-0.2.a/Makefile 2007-01-14 11:57:25.000000000 -0300
diff --git a/debian/patches/fix_score_dir.dpatch b/debian/patches/fix-score-dir.patch
similarity index 90%
rename from debian/patches/fix_score_dir.dpatch
rename to debian/patches/fix-score-dir.patch
index 297e70c..01f72d1 100644
--- a/debian/patches/fix_score_dir.dpatch
+++ b/debian/patches/fix-score-dir.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_score_dir.dpatch by Margarita Manterola <ma...@debian.org>
-##
-## DP: Update the Makefile and the code, so that it uses the SCORE_DIR var
+From: Margarita Manterola <ma...@debian.org>
+Subject: Update the Makefile and the code, so that it uses the SCORE_DIR var
-@DPATCH@
diff -urNad hannah-0.2.d~/Makefile hannah-0.2.d/Makefile
--- hannah-0.2.d~/Makefile 2007-02-06 18:31:11.000000000 -0300
+++ hannah-0.2.d/Makefile 2007-03-12 23:29:48.000000000 -0300
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4a14846
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+#extra-cflags.patch
+#data-path.patch
+fix-score-dir.patch
diff --git a/debian/rules b/debian/rules
index ae49248..47b5602 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -13,14 +11,21 @@ else
CFLAGS += -O2
endif
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
+ # Preserve original file
+ cp deps deps.orig
$(MAKE) DATA_INSTALL_DIR=/usr/share/games/hannah/ SCOREDIR=/var/games/hannah/ CXXFLAGS="$(CFLAGS)"
+ mv deps.orig deps
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -30,7 +35,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# dh_install cannot rename files
@@ -69,7 +74,7 @@ binary-arch: build install
dh_installdocs -a
dh_installman -a
dh_installmenu -a
- dh_desktop -a
+# dh_desktop -a
dh_link -a
dh_strip -a
dh_compress -a
@@ -84,4 +89,4 @@ binary-arch: build install
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
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.5
