From: Sebastian Harl Date: Sun, 27 Apr 2014 11:20:34 +0000 (+0200) Subject: Drop bts589660-updated-manpage; merged upstream. X-Git-Tag: ncmpc-0.21-1~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=21f2c616acb545e892a4ee55b19410d085da285a;p=pkg-ncmpc.git Drop bts589660-updated-manpage; merged upstream. --- diff --git a/debian/changelog b/debian/changelog index 54fa940..8bace24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ ncmpc (0.21-1) UNRELEASED; urgency=low - Enable chat-screen feature. * debian/control, debian/rules: - Enable documentation and build-depend on doxygen. + * debian/patches, debian/control: + - Drop bts589660-updated-manpage; merged upstream. + - Drop build-dependency on dpatch. -- Sebastian Harl Sat, 23 Nov 2013 20:33:15 +0100 diff --git a/debian/control b/debian/control index 72d983a..e99dd27 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ncmpc Section: sound Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.14.6), dpatch, autotools-dev, libncursesw5-dev, libglib2.0-dev, liblircclient-dev, libmpdclient-dev (>= 2.5~), doxygen +Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.14.6), autotools-dev, libncursesw5-dev, libglib2.0-dev, liblircclient-dev, libmpdclient-dev (>= 2.5~), doxygen Standards-Version: 3.9.1 Homepage: http://mpd.wikia.com/wiki/Client:Ncmpc Vcs-Git: git://git.tokkee.org/pkg-ncmpc.git 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/bts589660-updated-manpage.dpatch deleted file mode 100755 index 0e40b44..0000000 --- a/debian/patches/bts589660-updated-manpage.dpatch +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## bts589660-updated-manpage.dpatch by Sebastian Harl -## -## 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. - - -@DPATCH@ - -diff a/doc/ncmpc.1 b/doc/ncmpc.1 ---- a/doc/ncmpc.1 -+++ b/doc/ncmpc.1 -@@ -35,6 +35,12 @@ Enable colors. - .TP - .B \-C, \-\-no\-colors - Disable colors. -+.TP -+.B \-m, \-\-mouse -+Enable mouse. -+.TP -+.B \-M, \-\-no\-mouse -+Disable mouse. - .TP - .B \-e, \-\-exit - Exit on connection errors. The default is to reconnect. -@@ -54,7 +60,7 @@ Read configuration from file. - .B \-k, \-\-key\-file=FILE - Read key bindings from FILE. - .TP --.B \-P, \-\-no\-splash=FILE -+.B \-S, \-\-no\-splash - Disable the splash screen. - .TP - Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options. diff --git a/debian/rules b/debian/rules index 271e3f8..02ed5ce 100755 --- a/debian/rules +++ b/debian/rules @@ -25,9 +25,7 @@ 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 \ @@ -62,7 +60,7 @@ build-stamp: config.status touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp