[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.16.2-1-8-gd69655e

[Alexander Wirt]

The following commit has been merged in the master branch:
commit d69655ed8dae3e46548bfe644e06dcfad9af9bc4
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Jul 31 22:16:04 2011 +0200

    Move from cdbs to dh

diff --git a/debian/mpd.docs b/debian/mpd.docs
new file mode 100644
index 0000000..e111442
--- /dev/null
+++ b/debian/mpd.docs
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+UPGRADING
diff --git a/debian/mpd.install b/debian/mpd.install
index 00d3be5..e298e3f 100644
--- a/debian/mpd.install
+++ b/debian/mpd.install
@@ -1 +1,2 @@
 debian/mpd.conf			etc
+usr/bin/mpd             usr/bin
diff --git a/debian/mpd.manpages b/debian/mpd.manpages
new file mode 100644
index 0000000..c6619b9
--- /dev/null
+++ b/debian/mpd.manpages
@@ -0,0 +1,2 @@
+doc/mpd.1
+doc/mpd.conf.5
diff --git a/debian/rules b/debian/rules
index c36e451..7b3252f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,20 +11,27 @@ ifeq ($(ARCH), armeb)
 WITH_TREMOR=--with-tremor
 endif
 
-DEB_BUILDDIR := debian/build
-DEB_CONFIGURE_USER_FLAGS += $(WITH_TREMOR) --enable-sqlite --enable-un --enable-ao --enable-lastfm --enable-pipe-output --disable-lame --disable-cue --enable-mikmod
 LDFLAGS += -Wl,--as-needed
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_FIXPERMS_EXCLUDE:=var/*
-DEB_DH_INSTALLINIT_ARGS:=-n
+%:
+	dh $@
 
-DEB_DH_STRIP_ARGS := --dbg-package=mpd-dbg
-# oh bleah. see #380614
-DEB_DESTDIR = $(CURDIR)/debian/mpd
+override_dh_auto_configure:
+	./configure $(WITH_TREMOR) --enable-sqlite \
+		--enable-un \
+		--enable-ao \
+		--enable-lastfm \
+		--enable-pipe-output \
+		--disable-lame \
+		--disable-cue \
+		--enable-mikmod \
+		--prefix=/usr \
+		--sysconfdir=/etc/mpd
 
-binary-post-install/mpd::
+override_dh_auto_install:
+	dh_auto_install
 	rm -f $(CURDIR)/debian/mpd/usr/share/doc/mpd/mpdconf.example
 	rm -f $(CURDIR)/debian/mpd/usr/share/doc/mpd/COPYING
+
+override_dh_strip:
+	dh_strip  --dbg-package=mpd-dbg

-- 
Git repository for pkg-mpd