Package: magicmaze
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 fd8e5b58923c40dae9b167d01a70caf5af9b603f Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 25 Apr 2012 08:37:59 +0300
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 | 11 +++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/copyright | 5 +++--
debian/patches/00list | 2 --
.../{10_use_FHS_paths.dpatch => 10-use-FHS-paths.patch} | 8 ++------
debian/patches/{20_isabella.dpatch => 20-isabella.patch} | 10 +++-------
debian/patches/series | 2 ++
debian/rules | 14 ++++++++------
debian/source/format | 1 +
10 files changed, 34 insertions(+), 27 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10_use_FHS_paths.dpatch => 10-use-FHS-paths.patch} (90%)
rename debian/patches/{20_isabella.dpatch => 20-isabella.patch} (73%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 45f0ee5..0c90752 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+magicmaze (1.4.3.2.dfsg-1.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.
+ * 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).
+
+ -- Jari Aalto <[email protected]> Wed, 25 Apr 2012 08:36:25 +0300
+
magicmaze (1.4.3.2.dfsg-1.1) unstable; urgency=low
* Non-maintainer upload.
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 e31b678..fc381a8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: magicmaze
Section: games
Priority: extra
Maintainer: Joe Nahmias <[email protected]>
-Build-Depends: debhelper (>= 7), dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://magicmaze.rubyforge.org/
Package: magicmaze
Architecture: all
-Depends: ruby, libsdl-ruby, ttf-isabella (>= 1.2-2)
+Depends: ${misc:Depends}, ruby, libsdl-ruby, ttf-isabella (>= 1.2-2)
Description: rescue the maiden while avoiding the monsters
This is a simple game where you are a wizard searching the evil demon's
tower to try and rescue the beautiful maiden. Inspired by Gauntlet II,
diff --git a/debian/copyright b/debian/copyright
index 719a5ce..44392ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,5 +40,6 @@ License:
############################################################
-The Debian packaging is (C) 2008, Joe Nahmias <[email protected]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 2008 Joe Nahmias
+<[email protected]> 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 1797750..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-10_use_FHS_paths
-20_isabella
diff --git a/debian/patches/10_use_FHS_paths.dpatch b/debian/patches/10-use-FHS-paths.patch
similarity index 90%
rename from debian/patches/10_use_FHS_paths.dpatch
rename to debian/patches/10-use-FHS-paths.patch
index 1beb1ab..2b1f747 100644
--- a/debian/patches/10_use_FHS_paths.dpatch
+++ b/debian/patches/10-use-FHS-paths.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_use_FHS_paths.dpatch by Joe Nahmias <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change paths used by magicmaze to be FHS-compliant
+From: Joe Nahmias <[email protected]>
+Subject: Change paths used by magicmaze to be FHS-compliant
-@DPATCH@
--- magicmaze-1.4.3.2.orig/mm.rb
+++ magicmaze-1.4.3.2/mm.rb
diff --git a/debian/patches/20_isabella.dpatch b/debian/patches/20-isabella.patch
similarity index 73%
rename from debian/patches/20_isabella.dpatch
rename to debian/patches/20-isabella.patch
index d1cf337..7ff7cd2 100644
--- a/debian/patches/20_isabella.dpatch
+++ b/debian/patches/20-isabella.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_isabella.dpatch by gregor herrmann <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Update path to Isabella.ttf
-## DP: Bug-Debian: http://bugs.debian.org/653953
+From: gregor herrmann <[email protected]>
+Subject: Update path to Isabella.ttf
+Bug-Debian: http://bugs.debian.org/653953
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' magicmaze-1.4.3.2.dfsg~/magicmaze/graphics.rb magicmaze-1.4.3.2.dfsg/magicmaze/graphics.rb
--- magicmaze-1.4.3.2.dfsg~/magicmaze/graphics.rb 2012-01-22 16:26:48.000000000 +0100
+++ magicmaze-1.4.3.2.dfsg/magicmaze/graphics.rb 2012-01-22 16:27:14.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4e2d338
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-use-FHS-paths.patch
+20-isabella.patch
diff --git a/debian/rules b/debian/rules
index 9d1e08e..356c2ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,12 +13,14 @@ get-orig-source:
mv magicmaze-1_4_3_2.tar magicmaze-1.4.3.2.dfsg.tar
gzip --best magicmaze-1.4.3.2.dfsg.tar
-include /usr/share/dpatch/dpatch.make
-build: patch
-clean: clean-patched unpatch
-clean-patched:
+build-arch: build
+build-indep: build
+
+build:
+
+clean:
dh_testdir
dh_testroot
dh_clean
@@ -26,7 +28,7 @@ clean-patched:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
dh_install
cp -a mm.rb $(CURDIR)/debian/magicmaze/usr/games/magicmaze
@@ -54,4 +56,4 @@ binary-indep: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install clean-patched
+.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.10
