[Pkg-mpd-commits] [SCM] Git repository for pkg-mpc branch, master, updated. debian/0.22-1-16-g8a72c5d

[Florian Schlichting]

The following commit has been merged in the master branch:
commit a820eed9e721fbc9bccff6d696a490b7cc18ae69
Author: Florian Schlichting <fsfs at debian.org>
Date:   Thu Apr 11 00:54:02 2013 +0200

    switch from cdbs to dh

diff --git a/debian/control b/debian/control
index 29c3fea..1eb3282 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Florian Schlichting <fsfs at debian.org>
 Vcs-Browser: http://git.debian.org/?p=pkg-mpd/pkg-mpc.git
 Vcs-Git: git://git.debian.org/pkg-mpd/pkg-mpc.git
 Homepage: http://www.musicpd.org/clients/mpc/
-Build-Depends: debhelper (>= 9), cdbs, pkg-config, libmpdclient-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, autoconf-archive, pkg-config, libmpdclient-dev
 Standards-Version: 3.9.4
 
 Package: mpc
diff --git a/debian/mpc.dirs b/debian/mpc.dirs
deleted file mode 100644
index a23e43d..0000000
--- a/debian/mpc.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-etc/bash_completion.d
diff --git a/debian/patches/Makefile.am.patch b/debian/patches/Makefile.am.patch
new file mode 100644
index 0000000..fff4fab
--- /dev/null
+++ b/debian/patches/Makefile.am.patch
@@ -0,0 +1,17 @@
+Description: prevent automake from installing doc/* files in wrong location
+ It puts them all into /usr/share/doc/mpc/; dh can do better.
+Author: Florian Schlichting <fsfs at debian.org>
+Forwarded: not-needed
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,9 +2,6 @@
+ AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2
+ 
+ man_MANS = doc/mpc.1
+-doc_DATA = AUTHORS COPYING NEWS README \
+-	doc/mpd-m3u-handler.sh doc/mpd-pls-handler.sh doc/mppledit \
+-	doc/mpc-completion.bash
+ EXTRA_DIST = $(man_MANS) $(doc_DATA)
+ 
+ bin_PROGRAMS = src/mpc
diff --git a/debian/patches/series b/debian/patches/series
index 01c0c6c..84dded8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+Makefile.am.patch
 hyphen-as-minus-sign.patch
diff --git a/debian/rules b/debian/rules
index 7961d46..cf8a276 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,7 @@
 #!/usr/bin/make -f
-DEB_BUILDDIR:=build-dir
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-install/mpc::
-	mv debian/mpc/usr/share/doc/mpc/mpc-completion.bash debian/mpc/etc/bash_completion.d/mpc
-	rm -f debian/mpc/usr/share/doc/mpc/COPYING 
-	rm debian/mpc/usr/share/doc/mpc/mppledit
-
-	# dunno why autotools puts stuff here, forwarded to upstream
-	-rmdir --ignore-fail-on-non-empty \
-	  debian/$(DEB_SOURCE_PACKAGE)/usr/share/$(DEB_SOURCE_PACKAGE)
-	
-	# the shell scripts are in the usr/share/doc/examples dir:
-	rm debian/mpc/usr/share/doc/mpc/*.sh
+
+%:
+	dh $@ --with autoreconf
 
 # uncomment as needed for user customization:
 
@@ -24,3 +12,13 @@ install/mpc::
 
 # Use as port when MPD_PORT environment variable is not set
 #DEB_CONFIGURE_USER_FLAGS += --with-default-port=PORT
+
+#override_dh_auto_configure:
+#	dh_auto_configure -- $(DEB_CONFIGURE_USER_FLAGS)
+
+override_dh_install:
+	install -m 644 -D doc/mpc-completion.bash $(CURDIR)/debian/mpc/etc/bash_completion.d/mpc
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
+

-- 
Git repository for pkg-mpc