[Pkg-mpd-commits] [pkg-mpd] 07/08: clean up various bits obsoleted by dbgsym transition

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 5dfc27031195190c67eb34b9f942ff830a535e95
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sun Mar 27 00:40:15 2016 +0100

    clean up various bits obsoleted by dbgsym transition
---
 debian/mpd.docs                     |  1 -
 debian/mpd.examples                 |  1 -
 debian/mpd.install                  |  1 -
 debian/patches/libsystemd.patch     |  4 ++--
 debian/patches/prune-doc-data.patch | 15 +++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  6 ------
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/mpd.docs b/debian/mpd.docs
index 4856e8c..152ed76 100644
--- a/debian/mpd.docs
+++ b/debian/mpd.docs
@@ -1,2 +1 @@
-AUTHORS
 user-manual.html
diff --git a/debian/mpd.examples b/debian/mpd.examples
deleted file mode 100644
index 5dbd820..0000000
--- a/debian/mpd.examples
+++ /dev/null
@@ -1 +0,0 @@
-doc/mpdconf.example
diff --git a/debian/mpd.install b/debian/mpd.install
index edf175c..af303e7 100644
--- a/debian/mpd.install
+++ b/debian/mpd.install
@@ -1,4 +1,3 @@
 debian/mpd.conf			etc
-usr/bin/mpd                     usr/bin
 debian/mpd.desktop              etc/xdg/autostart
 debian/source_mpd.py            usr/share/apport/package-hooks
diff --git a/debian/patches/libsystemd.patch b/debian/patches/libsystemd.patch
index 4efb128..1c9b9d4 100644
--- a/debian/patches/libsystemd.patch
+++ b/debian/patches/libsystemd.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed (solved in a less invasive and backward-compatible way ups
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -571,10 +571,10 @@
+@@ -572,10 +572,10 @@
  MPD_DEPENDS([enable_sqlite], [enable_glib],
  	[Cannot use --enable-sqlite with --disable-glib])
  
@@ -23,7 +23,7 @@ Forwarded: not-needed (solved in a less invasive and backward-compatible way ups
  
  AC_ARG_ENABLE(tcp,
  	AS_HELP_STRING([--disable-tcp],
-@@ -761,11 +761,11 @@
+@@ -762,11 +762,11 @@
  	AC_MSG_ERROR([No client interfaces configured!])
  fi
  
diff --git a/debian/patches/prune-doc-data.patch b/debian/patches/prune-doc-data.patch
new file mode 100644
index 0000000..d139b8b
--- /dev/null
+++ b/debian/patches/prune-doc-data.patch
@@ -0,0 +1,15 @@
+Description: only install wanted docs
+Author: Florian Schlichting <fsfs at debian.org>
+Forwarded: not-needed
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2093,7 +2093,7 @@
+ #
+ 
+ man_MANS = doc/mpd.1 doc/mpd.conf.5
+-doc_DATA = AUTHORS COPYING NEWS README doc/mpdconf.example
++doc_DATA = AUTHORS doc/mpdconf.example
+ 
+ DOCBOOK_FILES = doc/protocol.xml doc/user.xml doc/developer.xml
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 87e7807..2805d77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ protect_system.patch
 libsystemd.patch
 curl-proxy.patch
 bind-to-address-socket-activation.patch
+prune-doc-data.patch
diff --git a/debian/rules b/debian/rules
index 9037288..69318e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,8 @@ endif
 # no systemd and no alsa on non-linux arches
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 WITH_SYSTEMD=--enable-systemd --with-systemdsystemunitdir=/lib/systemd/system --enable-alsa
-CP_SYSTEMD_UNIT=mkdir -p debian/mpd/lib/systemd && cp -a debian/tmp/lib/systemd/system debian/mpd/lib/systemd/
 else
 WITH_SYSTEMD=--disable-systemd --disable-alsa
-CP_SYSTEMD_UNIT=echo "no systemd, not copying systemd .service file"
 endif
 
 
@@ -147,7 +145,3 @@ override_dh_strip:
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
-
-override_dh_install:
-	dh_install
-	$(CP_SYSTEMD_UNIT)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git