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 0a6db1f0e5b9bbcbfe79889343922f6954aad25b Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Fri, 24 Feb 2012 13:13:47 -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/README.source | 2 -- debian/changelog | 11 +++++++++++ debian/compat | 2 +- debian/control | 4 ++-- debian/patches/00list | 1 - .../{01_configure.dpatch => 01_configure.patch} | 8 ++------ debian/patches/series | 1 + debian/rules | 5 ++--- debian/source/format | 1 + 9 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/patches/00list rename debian/patches/{01_configure.dpatch => 01_configure.patch} (65%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 585889f..0000000 --- a/debian/README.source +++ /dev/null @@ -1,2 +0,0 @@ -This package uses dpatch to fix some errors. To know more about dpatch see -/usr/share/doc/dpatch/README.source.gz file. diff --git a/debian/changelog b/debian/changelog index 56a2af6..b4f2c12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +hlbr (1.7.2-2.1) unstable; urgency=low + + * Non-maintainer upload. + - Upgrade to packaging format "3.0 quilt". + * debian/rules: + - Remove dpatch. + * debian/control: + - Update to Standards-Version to 3.9.3 and debhelper to 9. + + -- Jari Aalto <[email protected]> Fri, 24 Feb 2012 13:13:41 -0500 + hlbr (1.7.2-2) unstable; urgency=low * debian/control: diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index bc8e85b..d99a082 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: net Priority: optional Maintainer: Joao Eriberto Mota Filho <[email protected]> Uploaders: Andre Bertelli Araujo <[email protected]> -Build-Depends: debhelper (>= 7), dpatch, libpcre3-dev -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 9), libpcre3-dev +Standards-Version: 3.9.3 Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/hlbr Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/hlbr Homepage: http://hlbr.sourceforge.net diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 9b8b728..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -01_configure.dpatch diff --git a/debian/patches/01_configure.dpatch b/debian/patches/01_configure.patch similarity index 65% rename from debian/patches/01_configure.dpatch rename to debian/patches/01_configure.patch index 5d552dc..75f7363 100644 --- a/debian/patches/01_configure.dpatch +++ b/debian/patches/01_configure.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_configure.dpatch by Joao Eriberto Mota Filho <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Turns English the default language. +From: Joao Eriberto Mota Filho <[email protected]> +Subject: Turns English the default language. -@DPATCH@ diff -urNad hlbr-1.5-rc2~/configure hlbr-1.5-rc2/configure --- hlbr-1.5-rc2~/configure 2008-05-29 18:52:04.000000000 -0300 +++ hlbr-1.5-rc2/configure 2008-06-17 17:47:25.000000000 -0300 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ca4d273 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_configure.patch diff --git a/debian/rules b/debian/rules index c924433..902d343 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,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) @@ -15,7 +14,7 @@ else CROSS= --build $(DEB_BUILD_GNU_TYPE) endif -config.status: patch-stamp configure +config.status: configure dh_testdir ./configure $(CROSS) CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" touch $@ @@ -27,7 +26,7 @@ build-stamp: config.status $(MAKE) touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp config.status 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
