Your message dated Sun, 15 Apr 2012 21:05:49 +0000
with message-id <[email protected]>
and subject line Bug#668937: fixed in infon 0~r198-6
has caused the Debian Bug report #668937,
regarding [PATCH] infon: Helping to update to packaging format 3.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
668937: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668937
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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 <[email protected]>
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 <[email protected]>
---
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 <[email protected]> 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 <[email protected]>
-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 <[email protected]>
# infon game:
#
-Copyright: 2006 Florian Wesch
+Copyright:
+
+ Copyright (C) 2006 Florian Wesch
License:
@@ -50,7 +52,7 @@ Copyright: Anders Lindström <[email protected]>
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 <[email protected]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
+The Debian packaging is Copyright (C) 2006, Joachim Breitner
+<[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 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 <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Joachim Breitner <[email protected]>
+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 <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Joachim Breitner <[email protected]>
+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
--- End Message ---
--- Begin Message ---
Source: infon
Source-Version: 0~r198-6
We believe that the bug you reported is fixed in the latest version of
infon, which is due to be installed in the Debian FTP archive:
infon-server_0~r198-6_amd64.deb
to main/i/infon/infon-server_0~r198-6_amd64.deb
infon-viewer_0~r198-6_amd64.deb
to main/i/infon/infon-viewer_0~r198-6_amd64.deb
infon_0~r198-6.debian.tar.gz
to main/i/infon/infon_0~r198-6.debian.tar.gz
infon_0~r198-6.dsc
to main/i/infon/infon_0~r198-6.dsc
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Joachim Breitner <[email protected]> (supplier of updated infon package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 15 Apr 2012 22:01:33 +0200
Source: infon
Binary: infon-server infon-viewer
Architecture: source amd64
Version: 0~r198-6
Distribution: unstable
Urgency: low
Maintainer: Joachim Breitner <[email protected]>
Changed-By: Joachim Breitner <[email protected]>
Description:
infon-server - Program bugs to compete for food and survival - Server
infon-viewer - Program bugs to compete for food and survival - GUI
Closes: 668937
Changes:
infon (0~r198-6) unstable; urgency=low
.
Got some nice packaging cleanup by Jari Aalto, thanks for that (Closes:
668937):
.
[ Jari Aalto ]
* 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).
Checksums-Sha1:
284d765afcbbbc2fa10aadfa324050970b161fda 1266 infon_0~r198-6.dsc
da14415d1f4ba29a0251bd3219bace8de1f0a0f6 7906 infon_0~r198-6.debian.tar.gz
069ad4e98ce414b654d5a051ccd33dc42389c8aa 154026 infon-server_0~r198-6_amd64.deb
0e054aafb2f0ff90e6e233989e401e2526ab953a 116104 infon-viewer_0~r198-6_amd64.deb
Checksums-Sha256:
bb5b4c3930c38ba616a2765b665192fc1a2adf2c20c30c4673eba99fabe0cae8 1266
infon_0~r198-6.dsc
4e0c142413bd3580f6a86c5f5d947719bda35f0ac6d9f54011edc5d75672ea24 7906
infon_0~r198-6.debian.tar.gz
8edac6cef50790ec2906069e50b4667c855d2ee710b45f63f0ed3a3479de74a1 154026
infon-server_0~r198-6_amd64.deb
e3181adcdc724dd3025af242d7fc3063303eefede2d1df5f8ef5e51776ecc2d5 116104
infon-viewer_0~r198-6_amd64.deb
Files:
b09a8833e559ca1f0a51ec7813a4467d 1266 games extra infon_0~r198-6.dsc
01cefaacecfef0d215df75d6c9705901 7906 games extra infon_0~r198-6.debian.tar.gz
524694783b64dcabd7cad3a896a04f03 154026 games extra
infon-server_0~r198-6_amd64.deb
c99a4ccacbe129ff650ed1a0f83ddeff 116104 games extra
infon-viewer_0~r198-6_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAk+LKf0ACgkQ9ijrk0dDIGzBQgCgpVcllkyVv8L0yK97vTmISm3I
6b8AoL3ysmOaXzpgmEAOidvECWIHnlAY
=hx04
-----END PGP SIGNATURE-----
--- End Message ---
