Package: ncmpc
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 bdfc7686120d4e3c308dab084b68e77ec512b8d0 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 10:59:05 +0300
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/README.source | 4 ----
debian/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 2 +-
debian/patches/00list | 2 --
...e.dpatch => 10-bug-589660-update-manpage.patch} | 14 +++++---------
debian/patches/series | 1 +
debian/rules | 9 ++++++---
debian/source/format | 1 +
10 files changed, 27 insertions(+), 22 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{bts589660-updated-manpage.dpatch => 10-bug-589660-update-manpage.patch} (69%)
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 a7decf0..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream source.
-See /usr/share/doc/dpatch/README.source.gz for instructions how to generate
-the patched source, add a new modification, and remove an existing one.
-
diff --git a/debian/changelog b/debian/changelog
index fda47dc..b54c913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ncmpc (0.17-1.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.
+ * Add build-arch and build-indep targets to rules file.
+ * Restore files from original sources: Makefile.in aclocal.m4 configure.
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 10:41:37 +0300
+
ncmpc (0.17-1) unstable; urgency=low
* New upstream release.
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 2e48fb1..eb72a67 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: ncmpc
Section: sound
Priority: optional
Maintainer: Sebastian Harl <tok...@debian.org>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.14.6), dpatch, autotools-dev, libncursesw5-dev, libglib2.0-dev, liblircclient-dev, libmpdclient-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), autotools-dev, libncursesw5-dev, libglib2.0-dev, liblircclient-dev, libmpdclient-dev
+Standards-Version: 3.9.3.1
Homepage: http://mpd.wikia.com/wiki/Client:Ncmpc
Vcs-Git: git://git.tokkee.org/pkg-ncmpc.git
Vcs-Browser: http://git.tokkee.org/?p=pkg-ncmpc.git
diff --git a/debian/copyright b/debian/copyright
index df41268..5cebeb6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -133,7 +133,7 @@ License:
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
+can be found in `/usr/share/common-licenses/GPL-2'.
The Debian packaging is © 2005, 2006 René van Bevern <r...@progn.org>
and © 2006-2010 Sebastian Harl <tok...@debian.org> and is licensed under the
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7d4befe..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-bts589660-updated-manpage.dpatch
-
diff --git a/debian/patches/bts589660-updated-manpage.dpatch b/debian/patches/10-bug-589660-update-manpage.patch
similarity index 69%
rename from debian/patches/bts589660-updated-manpage.dpatch
rename to debian/patches/10-bug-589660-update-manpage.patch
index 0e40b44..9398bcb 100644
--- a/debian/patches/bts589660-updated-manpage.dpatch
+++ b/debian/patches/10-bug-589660-update-manpage.patch
@@ -1,14 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts589660-updated-manpage.dpatch by Sebastian Harl <tok...@debian.org>
-##
-## DP: doc: Updated manpage.
-## DP:
-## DP: Added -m/-M options; fixed -S/--no-splash option.
-## DP:
-## DP: As reported by Martin Hradil in Debian bug #589660.
+From: Sebastian Harl <tok...@debian.org>
+Subject: doc: Updated manpage.
+Added -m/-M options; fixed -S/--no-splash option.
+
+As reported by Martin Hradil in Debian bug #589660.
-@DPATCH@
diff a/doc/ncmpc.1 b/doc/ncmpc.1
--- a/doc/ncmpc.1
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..925c4fc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-bug-589660-update-manpage.patch
diff --git a/debian/rules b/debian/rules
index 23f2f13..3b80d49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,9 +25,8 @@ ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
CHECK =
endif
-include /usr/share/dpatch/dpatch.make
-config.status: configure $(DPATCH_STAMPFN)
+config.status: configure
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
@@ -50,6 +49,10 @@ config.status: configure $(DPATCH_STAMPFN)
--with-ncursesw \
CFLAGS="$(CFLAGS)"
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: config.status
@@ -60,7 +63,7 @@ build-stamp: config.status
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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
