Package: infon
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 bcfad67dfe9017548cb758c05aff617c5764872f Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 15 Apr 2012 22:27:23 +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>
---
REVISION | 2 +-
debian/changelog | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 12 +++++++-----
debian/patches/00list | 2 --
.../{10-config.lua.dpatch => 10-config.lua.patch} | 8 ++------
...tic-binary.dpatch => 20-no-static-binary.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 16 ++++++----------
debian/source/format | 1 +
11 files changed, 36 insertions(+), 33 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10-config.lua.dpatch => 10-config.lua.patch} (79%)
rename debian/patches/{20-no-static-binary.dpatch => 20-no-static-binary.patch} (72%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/REVISION b/REVISION
index 5b42c94..0e9d28d 100644
--- a/REVISION
+++ b/REVISION
@@ -1 +1 @@
-REVISION=198
+REVISION=exported
diff --git a/debian/changelog b/debian/changelog
index 2f2ccfc..dd02d7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+infon (0~r198-5.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.
+ * Use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 15 Apr 2012 22:21:07 +0300
+
infon (0~r198-5) unstable; urgency=low
* Reorganize targets in debian/rules (Closes: #666291)
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 b8db38e..82e432c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: infon
Section: games
Priority: extra
Maintainer: Joachim Breitner <nome...@debian.org>
-Build-Depends: debhelper (>= 5), libevent-dev, zlib1g-dev, libreadline-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-sge-dev, dpatch, dh-metainit
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9), libevent-dev, zlib1g-dev, libreadline-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-sge-dev, dh-metainit
+Standards-Version: 3.9.3
Homepage: http://infon.dividuum.de/
XS-Vcs-Svn: http://infon.dividuum.de/svn/infon/trunk/contrib/debian
diff --git a/debian/copyright b/debian/copyright
index 7bcbf50..5bedcf7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,9 @@ Upstream Author: Florian Wesch <f...@dividuum.de>
# infon game:
#
-Copyright: 2006 Florian Wesch
+Copyright:
+
+ Copyright (C) 2006 Florian Wesch
License:
@@ -50,7 +52,7 @@ Copyright: Anders Lindström <c...@swipnet.se>
This file is available under the GNU Library General Public License.
On Debian GNU/Linux systems, the complete text of the GNU Library General
-Public License is found in `/usr/share/common-licenses/LGPL'.
+Public License is found in `/usr/share/common-licenses/LGPL-2'.
#
# included lua source:
@@ -90,6 +92,6 @@ THE SOFTWARE.
# Debian packaging, including daemonize.h
#
-The Debian packaging is (C) 2006, Joachim Breitner <nome...@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
+The Debian packaging is Copyright (C) 2006, Joachim Breitner
+<nome...@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 b4a2722..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-10-config.lua
-20-no-static-binary
diff --git a/debian/patches/10-config.lua.dpatch b/debian/patches/10-config.lua.patch
similarity index 79%
rename from debian/patches/10-config.lua.dpatch
rename to debian/patches/10-config.lua.patch
index 2f221b8..eeb5b1a 100644
--- a/debian/patches/10-config.lua.dpatch
+++ b/debian/patches/10-config.lua.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-config.lua.dpatch by Joachim Breitner <nome...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Joachim Breitner <nome...@debian.org>
+Subject: No description.
-@DPATCH@
diff -urNad infon-0~r198~/config.lua infon-0~r198/config.lua
--- infon-0~r198~/config.lua 2007-06-01 21:39:54.000000000 +0200
+++ infon-0~r198/config.lua 2007-06-01 21:41:56.135930724 +0200
diff --git a/debian/patches/20-no-static-binary.dpatch b/debian/patches/20-no-static-binary.patch
similarity index 72%
rename from debian/patches/20-no-static-binary.dpatch
rename to debian/patches/20-no-static-binary.patch
index 2ec3a5b..5231f2e 100644
--- a/debian/patches/20-no-static-binary.dpatch
+++ b/debian/patches/20-no-static-binary.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-no-static-binary.dpatch by Joachim Breitner <nome...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Joachim Breitner <nome...@debian.org>
+Subject: No description.
-@DPATCH@
diff -urNad infon-0~r198~/Makefile infon-0~r198/Makefile
--- infon-0~r198~/Makefile 2007-03-31 01:13:42.000000000 +0200
+++ infon-0~r198/Makefile 2009-09-13 15:30:52.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f729c22
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-config.lua.patch
+20-no-static-binary.patch
diff --git a/debian/rules b/debian/rules
index 2166055..0fc1b23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -39,7 +37,7 @@ addfiles_out:
build: build-arch build-indep
build-arch: build-arch-stamp
-build-arch-stamp: patch addfiles_in configure-stamp
+build-arch-stamp: addfiles_in configure-stamp
# Add here commands to compile the arch part of the package.
$(MAKE) infond PREFIX=/usr/share/infon-server/
@@ -47,21 +45,19 @@ build-arch-stamp: patch addfiles_in configure-stamp
touch $@
build-indep: build-indep-stamp
-build-indep-stamp: patch addfiles_in configure-stamp
+build-indep-stamp: addfiles_in configure-stamp
# Add here commands to compile the indep part of the package.
#$(MAKE) doc
touch $@
-clean: clean-patched addfiles_out unpatch
-
-clean-patched:
+clean: addfiles_out
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ $(MAKE) distclean
dh_clean
@@ -69,7 +65,7 @@ install: install-indep install-arch
install-indep:
dh_testdir
dh_testroot
- dh_clean -k -i
+ dh_prep
dh_installdirs -i
dh_install -i
@@ -77,7 +73,7 @@ install-indep:
install-arch:
dh_testdir
dh_testroot
- dh_clean -k -s
+ dh_prep
dh_installdirs -s
#(MAKE) DESTDIR=$(CURDIR)/debian/infon 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
