Package: glhack
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 25337fc84f8137c9ff37eee8a40f7608dc64d3c8 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 28 Feb 2012 08:41:06 -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/README.source | 26 --------------------
debian/changelog | 8 ++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 6 ----
...1-makefile-fix.dpatch => 01-makefile-fix.patch} | 8 +----
...ge.dpatch => 02-remove-guidebook-manpage.patch} | 8 +----
...tupfile-fix.dpatch => 03-startupfile-fix.patch} | 8 +----
...g-files-path.dpatch => 04-png-files-path.patch} | 8 +----
...{05-var-dir-fix.dpatch => 05-var-dir-fix.patch} | 8 +----
...6-fix-manpages.dpatch => 06-fix-manpages.patch} | 8 +----
debian/patches/series | 6 ++++
debian/rules | 5 +--
debian/source/format | 1 +
14 files changed, 32 insertions(+), 74 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01-makefile-fix.dpatch => 01-makefile-fix.patch} (89%)
rename debian/patches/{02-remove-guidebook-manpage.dpatch => 02-remove-guidebook-manpage.patch} (62%)
rename debian/patches/{03-startupfile-fix.dpatch => 03-startupfile-fix.patch} (73%)
rename debian/patches/{04-png-files-path.dpatch => 04-png-files-path.patch} (91%)
rename debian/patches/{05-var-dir-fix.dpatch => 05-var-dir-fix.patch} (69%)
rename debian/patches/{06-fix-manpages.dpatch => 06-fix-manpages.patch} (88%)
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 b89f232..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,26 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
diff --git a/debian/changelog b/debian/changelog
index 9a958ef..68a7f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+glhack (1.2-1.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.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 28 Feb 2012 08:34:58 -0500
+
glhack (1.2-1) unstable; urgency=low
Initial release (Closes: #528034)
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 eab73d1..8391492 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: games
Priority: extra
Maintainer: Stefan Ritter <x...@thehappy.de>
Homepage: http://glhack.sourceforge.net/
-Build-Depends: debhelper (>= 7.0.50), dpatch, bison, flex, libsdl1.2-dev, libncurses5-dev, libpng12-dev
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 9), bison, flex, libsdl1.2-dev, libncurses5-dev, libpng12-dev
+Standards-Version: 3.9.3
Package: glhack
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index cc69a0d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-01-makefile-fix.dpatch
-02-remove-guidebook-manpage.dpatch
-03-startupfile-fix.dpatch
-04-png-files-path.dpatch
-05-var-dir-fix.dpatch
-06-fix-manpages.dpatch
diff --git a/debian/patches/01-makefile-fix.dpatch b/debian/patches/01-makefile-fix.patch
similarity index 89%
rename from debian/patches/01-makefile-fix.dpatch
rename to debian/patches/01-makefile-fix.patch
index 179ae18..c019d61 100644
--- a/debian/patches/01-makefile-fix.dpatch
+++ b/debian/patches/01-makefile-fix.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-makefile-fix.dpatch by Stefan Ritter <x...@thehappy.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes to make it debian compatible
+From: Stefan Ritter <x...@thehappy.de>
+Subject: Fixes to make it debian compatible
-@DPATCH@
diff -urNad glhack-1.2~/Makefile glhack-1.2/Makefile
--- glhack-1.2~/Makefile 2004-05-28 10:58:32.000000000 +0200
+++ glhack-1.2/Makefile 2009-08-19 12:11:07.000000000 +0200
diff --git a/debian/patches/02-remove-guidebook-manpage.dpatch b/debian/patches/02-remove-guidebook-manpage.patch
similarity index 62%
rename from debian/patches/02-remove-guidebook-manpage.dpatch
rename to debian/patches/02-remove-guidebook-manpage.patch
index e12747b..bcbb190 100644
--- a/debian/patches/02-remove-guidebook-manpage.dpatch
+++ b/debian/patches/02-remove-guidebook-manpage.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-use-txt-guidebook.dpatch by Stefan Ritter <x...@thehappy.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: We're using the .txt variant instead of a broken manpage
+From: Stefan Ritter <x...@thehappy.de>
+Subject: We're using the .txt variant instead of a broken manpage
-@DPATCH@
diff -urNad glhack-1.2~/Makefile glhack-1.2/Makefile
--- glhack-1.2~/Makefile 2004-05-28 10:58:32.000000000 +0200
+++ glhack-1.2/Makefile 2009-07-23 20:30:07.000000000 +0200
diff --git a/debian/patches/03-startupfile-fix.dpatch b/debian/patches/03-startupfile-fix.patch
similarity index 73%
rename from debian/patches/03-startupfile-fix.dpatch
rename to debian/patches/03-startupfile-fix.patch
index c746d85..b812657 100644
--- a/debian/patches/03-startupfile-fix.dpatch
+++ b/debian/patches/03-startupfile-fix.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-startupfile-fix.dpatch by Stefan Ritter <x...@thehappy.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The old script was weird
+From: Stefan Ritter <x...@thehappy.de>
+Subject: The old script was weird
-@DPATCH@
diff -urNad glhack-1.2~/win/gl/glhack.sh glhack-1.2/win/gl/glhack.sh
--- glhack-1.2~/win/gl/glhack.sh 2002-01-11 14:10:31.000000000 +0100
+++ glhack-1.2/win/gl/glhack.sh 2009-07-23 21:16:46.000000000 +0200
diff --git a/debian/patches/04-png-files-path.dpatch b/debian/patches/04-png-files-path.patch
similarity index 91%
rename from debian/patches/04-png-files-path.dpatch
rename to debian/patches/04-png-files-path.patch
index e8264ca..a014a24 100644
--- a/debian/patches/04-png-files-path.dpatch
+++ b/debian/patches/04-png-files-path.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-png-files-path.dpatch by Stefan Ritter <x...@thehappy.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: PNG files are now in /u/s/pixmaps, so we had to fix the paths in source
+From: Stefan Ritter <x...@thehappy.de>
+Subject: PNG files are now in /u/s/pixmaps, so we had to fix the paths in source
-@DPATCH@
diff -urNad glhack-1.2~/win/gl/gl_font.c glhack-1.2/win/gl/gl_font.c
--- glhack-1.2~/win/gl/gl_font.c 2002-12-15 12:23:04.000000000 +0100
+++ glhack-1.2/win/gl/gl_font.c 2009-07-24 13:56:37.000000000 +0200
diff --git a/debian/patches/05-var-dir-fix.dpatch b/debian/patches/05-var-dir-fix.patch
similarity index 69%
rename from debian/patches/05-var-dir-fix.dpatch
rename to debian/patches/05-var-dir-fix.patch
index 3fa17de..6d08c1e 100644
--- a/debian/patches/05-var-dir-fix.dpatch
+++ b/debian/patches/05-var-dir-fix.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05-var-dir-fix.dpatch by Stefan Ritter <x...@thehappy.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixed path to vardir
+From: Stefan Ritter <x...@thehappy.de>
+Subject: Fixed path to vardir
-@DPATCH@
diff -urNad glhack-1.2~/include/unixconf.h glhack-1.2/include/unixconf.h
--- glhack-1.2~/include/unixconf.h 2004-05-28 10:00:02.000000000 +0200
+++ glhack-1.2/include/unixconf.h 2009-07-24 13:57:20.000000000 +0200
diff --git a/debian/patches/06-fix-manpages.dpatch b/debian/patches/06-fix-manpages.patch
similarity index 88%
rename from debian/patches/06-fix-manpages.dpatch
rename to debian/patches/06-fix-manpages.patch
index 5c98f45..587465f 100644
--- a/debian/patches/06-fix-manpages.dpatch
+++ b/debian/patches/06-fix-manpages.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06-fix-manpages.dpatch by Stefan Ritter <x...@thehappy.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: escaped minus-signs in manpages
+From: Stefan Ritter <x...@thehappy.de>
+Subject: escaped minus-signs in manpages
-@DPATCH@
diff -urNad glhack-1.2~/doc/glhack.6 glhack-1.2/doc/glhack.6
--- glhack-1.2~/doc/glhack.6 2003-01-08 06:49:58.000000000 +0100
+++ glhack-1.2/doc/glhack.6 2009-08-19 12:28:36.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5897690
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+01-makefile-fix.patch
+02-remove-guidebook-manpage.patch
+03-startupfile-fix.patch
+04-png-files-path.patch
+05-var-dir-fix.patch
+06-fix-manpages.patch
diff --git a/debian/rules b/debian/rules
index 807f999..aae0a41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
override_dh_installchangelogs:
dh_installchangelogs CHANGELOG.GL
@@ -10,11 +9,11 @@ build-stamp:
dh build
touch build-stamp
-clean: unpatch
+clean:
dh clean
install: build install-stamp
-install-stamp: patch-stamp
+install-stamp:
dh install
# Pixmaps
install -m 0644 dat/*.png debian/glhack/usr/share/pixmaps/glhack/
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
