[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.17.4-1-3-gf531ff4

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 34e43c2eb2bf9b49135873266190584fef33ceb9
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sun Apr 14 22:39:58 2013 +0200

    fix build on !linux
    
    - on kfreebsd and hurd, alsa is misdetected by configure now that
      liboss4-salsa-dev might be around, so disable it explicitly
    
    - without systemd, there's no unit file to copy around

diff --git a/debian/control b/debian/control
index ca109ad..fb8ccba 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Build-Depends: debhelper (>= 9),
                libresid-builder-dev,
                libsamplerate0-dev,
                libshout3-dev,
-               libsystemd-daemon-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
+               libsystemd-daemon-dev [linux-any],
                libsidplay2-dev,
                libsqlite3-dev,
                libvorbis-dev [!arm !armel !armeb],
diff --git a/debian/mpd.install b/debian/mpd.install
index 7a73d74..e298e3f 100644
--- a/debian/mpd.install
+++ b/debian/mpd.install
@@ -1,3 +1,2 @@
 debian/mpd.conf			etc
 usr/bin/mpd             usr/bin
-lib/systemd/system
diff --git a/debian/patches/fix-ESTRPIPE.patch b/debian/patches/fix-ESTRPIPE.patch
deleted file mode 100644
index 4977535..0000000
--- a/debian/patches/fix-ESTRPIPE.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: (attempt to) fix build failure on kfreebsd and hurd
- apparently, ESTRPIPE is not defined (but how did it ever build before??)
-Author: Florian Schlichting <fsfs at debian.org>
-Forwarded: no
-
---- a/src/output/alsa_output_plugin.c
-+++ b/src/output/alsa_output_plugin.c
-@@ -684,8 +684,10 @@
- {
- 	if (err == -EPIPE) {
- 		g_debug("Underrun on ALSA device \"%s\"\n", alsa_device(ad));
-+#ifdef ESTRPIPE
- 	} else if (err == -ESTRPIPE) {
- 		g_debug("ALSA device \"%s\" was suspended\n", alsa_device(ad));
-+#endif
- 	}
- 
- 	switch (snd_pcm_state(ad->pcm)) {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4a163b0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-ESTRPIPE.patch
diff --git a/debian/rules b/debian/rules
index 340c0e9..df1746c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,13 @@ ifeq ($(DEB_HOST_ARCH), armeb)
 WITH_TREMOR=--with-tremor
 endif
 
-WITH_SYSTEMD=
+# no systemd and no alsa on non-linux arches
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 WITH_SYSTEMD=--enable-systemd-daemon --with-systemdsystemunitdir=/lib/systemd/system
+CP_SYSTEMD_UNIT=mkdir -p debian/mpd/lib/systemd && cp -a debian/tmp/lib/systemd/system debian/mpd/lib/systemd/
+else
+WITH_SYSTEMD=--disable-alsa
+CP_SYSTEMD_UNIT=echo "no systemd, not copying systemd .service file"
 endif
 
 LDFLAGS += -Wl,--as-needed
@@ -55,3 +59,4 @@ override_dh_installchangelogs:
 override_dh_install:
 	dh_install
 	cp $(CURDIR)/debian/mpd.tmpfiles $(CURDIR)/debian/mpd/usr/lib/tmpfiles.d/mpd.conf
+	$(CP_SYSTEMD_UNIT)

-- 
Git repository for pkg-mpd