Your message dated Sat, 29 Dec 2012 18:17:33 +0000 with message-id <[email protected]> and subject line Bug#664343: fixed in njam 1.25-6~exp1 has caused the Debian Bug report #664343, regarding [PATCH] njam: 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.) -- 664343: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664343 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: njam 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 2f255226bb050544c32e92ae4c61220580335ea9 Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Tue, 28 Feb 2012 11:48:42 -0500 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 | 8 +++++++ debian/compat | 2 +- debian/control | 4 +- debian/patches/00list | 2 - ...core_name.dpatch => changed_hiscore_name.patch} | 23 +------------------ debian/patches/{gcc_46.dpatch => gcc_46.patch} | 8 +----- debian/patches/series | 2 + debian/rules | 19 +++++++--------- debian/source/format | 1 + 9 files changed, 26 insertions(+), 43 deletions(-) delete mode 100644 debian/patches/00list rename debian/patches/{changed_hiscore_name.dpatch => changed_hiscore_name.patch} (68%) rename debian/patches/{gcc_46.dpatch => gcc_46.patch} (70%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 003d16b..64bb946 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +njam (1.25-5.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. + + -- Jari Aalto <[email protected]> Tue, 28 Feb 2012 09:53:26 -0500 + njam (1.25-5.1) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/compat b/debian/compat index b8626c4..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +9 diff --git a/debian/control b/debian/control index 8c462c2..7c86c56 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: njam Section: games Priority: optional Maintainer: Anibal Avelar <[email protected]> -Build-Depends: debhelper (>= 4.0.0), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl1.2-dev, dpatch +Build-Depends: debhelper (>= 9), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl1.2-dev Homepage: http://njam.sourceforge.net -Standards-Version: 3.7.3 +Standards-Version: 3.9.3 Package: njam Architecture: any diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 5350814..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,2 +0,0 @@ -changed_hiscore_name -gcc_46.dpatch diff --git a/debian/patches/changed_hiscore_name.dpatch b/debian/patches/changed_hiscore_name.patch similarity index 68% rename from debian/patches/changed_hiscore_name.dpatch rename to debian/patches/changed_hiscore_name.patch index d6cd8b2..4707314 100644 --- a/debian/patches/changed_hiscore_name.dpatch +++ b/debian/patches/changed_hiscore_name.patch @@ -1,25 +1,6 @@ -#! /bin/sh -e -## changed_hiscore_name.dpatch by Anibal Avelar <[email protected]> -## -## DP: apply patch to change the hiscore name +From: Anibal Avelar <[email protected]> +Subject: apply patch to change the hiscore name -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -ent" - exit 1;; -esac - -exit 0 diff -bBdNrw -U5 njam-1.25/src/njam.cpp njam-1.25.modif/src/njam.cpp --- njam-1.25/src/njam.cpp 2005-12-13 05:56:43.000000000 -0600 +++ njam-1.25.modif/src/njam.cpp 2008-05-12 11:59:46.694847801 -0500 diff --git a/debian/patches/gcc_46.dpatch b/debian/patches/gcc_46.patch similarity index 70% rename from debian/patches/gcc_46.dpatch rename to debian/patches/gcc_46.patch index 43601d1..68594f1 100644 --- a/debian/patches/gcc_46.dpatch +++ b/debian/patches/gcc_46.patch @@ -1,10 +1,6 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -Description: gcc4.5 and later are more restrictive with c++ function calls, - this trivial patch fixes build failures with -fpermissive -Author: Andreas Moog <[email protected]> -Last-Update: 2011-07-15 +From: gregor herrmann <[email protected]> +Subject: Fix gcc compile (LP: #756133) (Closes: #565087) -=== modified file 'src/njamedit.cpp' --- a/src/njamedit.cpp 2006-07-27 23:15:50 +0000 +++ b/src/njamedit.cpp 2011-07-15 20:01:54 +0000 @@ -114,7 +114,7 @@ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..b0e1371 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +changed_hiscore_name.patch +gcc_46.patch diff --git a/debian/rules b/debian/rules index 25e9233..1d5e708 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -25,18 +24,14 @@ else CFLAGS += -O2 endif -config.status: configure +config.status: dh_testdir - # Add here commands to configure the package. -ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess -endif ./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games + cp configure configure.orig -build: patch build-stamp +build: build-stamp build-stamp: config.status dh_testdir @@ -45,14 +40,16 @@ build-stamp: config.status $(MAKE) touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - -rm -f config.sub config.guess + [ ! -f missing ] || chmod +x missing + [ ! -f configure.orig ] || mv configure.orig configure + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.sub config.guess config.log dh_clean 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
--- End Message ---
--- Begin Message ---Source: njam Source-Version: 1.25-6~exp1 We believe that the bug you reported is fixed in the latest version of njam, which is due to be installed in the Debian FTP archive. 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. Daniel Echeverry <[email protected]> (supplier of updated njam 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: Wed, 28 Nov 2012 22:48:08 -0500 Source: njam Binary: njam Architecture: source amd64 Version: 1.25-6~exp1 Distribution: experimental Urgency: low Maintainer: Debian QA Group <[email protected]> Changed-By: Daniel Echeverry <[email protected]> Description: njam - pacman-like game with multiplayer support Closes: 474716 664343 Changes: njam (1.25-6~exp1) experimental; urgency=low . * QA Upload. * debian/control + Update long description. Closes: #474716 + Set maintainer to Debian QA group + Bump standard versions 3.9.4 + Update to DEP5 copyright format 1.0 + Switch to debhelper 9 + Add ${misc:Depends} * Switch compat level to 9 * debian/njam.1 + Fix some lintian warnings * debian/patches + Switch to dpkg-source 3.0 (quilt) format. Closes: #664343 + add fix_error_gcc.diff * Update watch file. Thanks to Bart Martens * debian/njam.desktop + Erase encoding field * Add clean file + Do not need to be installed the njamicon.ico file * Add njam.install file * Add njam.links file Checksums-Sha1: 57d39990030fbd2e307faa277ac1e198a5c5d772 1782 njam_1.25-6~exp1.dsc 1975c17e83fcc1042d758b25bccb784130bb22ad 1665803 njam_1.25.orig.tar.gz dc08e2aa78cce65411d6a6b92e3c422fff9e481d 8037 njam_1.25-6~exp1.debian.tar.gz ac19ea5ee702fcb002789da89ba732dd8aa7e980 1443140 njam_1.25-6~exp1_amd64.deb Checksums-Sha256: 7c4803b8e5191db7a12607d12ca1062d174362cfbed9c54ed191fcaa93c683cb 1782 njam_1.25-6~exp1.dsc 8ed3eee3f387ce5ecdab7dd528f98cf77f65971510964000f2f1dfbf8b6f3000 1665803 njam_1.25.orig.tar.gz 692ddbf4d2be94d98e6bdbbe363b3144f0330dcbf960f742b3fe9f8408ac1423 8037 njam_1.25-6~exp1.debian.tar.gz 1a1bdecc1bc9cf43d154d7586ef1cf03f5046cdc4f856220e1b03aa08fe7f18f 1443140 njam_1.25-6~exp1_amd64.deb Files: c22bc9c3f9b116d72d0ff9cc91b21a26 1782 games optional njam_1.25-6~exp1.dsc 231fda022d309e1ef4a0d993ca693462 1665803 games optional njam_1.25.orig.tar.gz 234bf4ea9f8bcb380ea5c674e8d7ceeb 8037 games optional njam_1.25-6~exp1.debian.tar.gz de1a180a3455f17625a1519f5e294f27 1443140 games optional njam_1.25-6~exp1_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBAgAGBQJQ3zKHAAoJEHtYWzCAfCqHxzcP/R/5N9NNaWjyPn3W9XPf2fw7 T6jRTxL9f5Qwifo7yztIdR1fq49SiYdxYYLaB4j8KJAa+3U99HhQwLQdrNOM+aRy uiAjupRmVGLI19drqLBjp14BMaMOY1iZJ2/2iMNh3O51Dta81joPoslGzIpAcfyX YMvq2h6asR0u6hqUvsbA2zCvPB+11clnXrMInx8Iv8mlZUqBfJM3Y1ZG9NfMHUl9 YWX2JJOAkDnmwctIasa2GukNEgkCfpYEnXSqPx65h6W5oPQGQEyHYiahdfx5GdJl G3xnki/KmOD0nDKA3p4LFOcGU+/eO0qV1Zjgex9aO8uLfrEQh5Z8+ZS0TW3K/xZr 7f7YEez+JOp9dg2PyRz7kVx7p28W+0DnFb8ExdFbmoRtQ5XtoaswdpyFaTfnS0hZ BPpGJswUOY/f9tBBJryxdskO+qyh1EoNEWIMz+L6lZLsGLHrpWGD/X96UzDxy/pb ARJhEXG/OBuHkv1+JDoF8ZlQmIGNb/jjx+r7YJ9XJlVpWrUJg9ofu7h+4WdQchIw L9RUxB7MYpN1PNx0kfDphooEIu0dajMMLPSpsaTTdJHjiQZnJII174/IQsqMk9xr fS0zPeA36CJkVImDFHuRAx/lNlkr/EFIaTc0Ap+xh54uPZL7W45w3QazGB49QX5J Hgq7FvXyoHdzt0I0QugB =5Knv -----END PGP SIGNATURE-----
--- End Message ---
