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 <jari.aa...@cante.net>
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 <jari.aa...@cante.net>
---
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 <jari.aa...@cante.net> 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 <aave...@cofradia.org>
-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 <aave...@cofradia.org>
-##
-## DP: apply patch to change the hiscore name
+From: Anibal Avelar <aave...@cofradia.org>
+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 <am...@ubuntu.com>
-Last-Update: 2011-07-15
+From: gregor herrmann <gre...@debian.org>
+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
