Hi, As we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok to upload with these changes. Thanks, Jari
>From 4691d48f1669b8deed6b480dee06ba8bb8b276f1 Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Fri, 24 Feb 2012 13:46:53 -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 | 1 - .../{01_Makefile.dpatch => 01_Makefile.patch} | 8 ++------ debian/patches/series | 1 + debian/rules | 5 ++--- debian/source/format | 1 + 8 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 debian/patches/00list rename debian/patches/{01_Makefile.dpatch => 01_Makefile.patch} (72%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index dd5106b..6b9dc62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +phpwebcounter (1.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove 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]> Fri, 24 Feb 2012 13:29:07 -0500 + phpwebcounter (1.0-1) unstable; urgency=low * New upstream release (Closes: #449212) 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 6a28fc3..6ef8b8e 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: phpwebcounter Section: web Priority: optional Maintainer: Joao Eriberto Mota Filho <[email protected]> -Build-Depends: debhelper (>= 5), dpatch -Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.3 Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/phpwebcounter Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/phpwebcounter Homepage: http://phpwebcounter.sourceforge.net diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 38d5419..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -01_Makefile.dpatch diff --git a/debian/patches/01_Makefile.dpatch b/debian/patches/01_Makefile.patch similarity index 72% rename from debian/patches/01_Makefile.dpatch rename to debian/patches/01_Makefile.patch index ed8b000..3eb86ee 100644 --- a/debian/patches/01_Makefile.dpatch +++ b/debian/patches/01_Makefile.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_Makefile.dpatch by Joao Eriberto Mota Filho <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Makes Makefile compliant with Debian. +From: Joao Eriberto Mota Filho <[email protected]> +Subject: Makes Makefile compliant with Debian. -@DPATCH@ diff -urNad phpwebcounter-0.2~/Makefile phpwebcounter-0.2/Makefile --- phpwebcounter-0.2~/Makefile 2007-11-03 23:11:39.000000000 -0200 +++ phpwebcounter-0.2/Makefile 2007-11-04 11:05:23.000000000 -0200 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c3de10c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_Makefile.patch diff --git a/debian/rules b/debian/rules index 34a50aa..14e3173 100755 --- a/debian/rules +++ b/debian/rules @@ -3,14 +3,13 @@ # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make -clean: unpatch +clean: dh_testdir dh_testroot dh_clean -install: patch-stamp +install: dh_testdir dh_testroot dh_clean -k 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
