[Pkg-pulseaudio-devel] r159 - in /pulseaudio/trunk/debian: changelog control patches/fix-build-on-newer-gcc.patch patches/series rules

[neurocyte-guest at users.alioth.debian.org]

Author: neurocyte-guest
Date: Sat Sep  1 10:26:18 2007
New Revision: 159

URL: http://svn.debian.org/wsvn/pkg-pulseaudio/?sc=1&rev=159
Log:
Fix build on GNU/kFreeBSD

Added:
    pulseaudio/trunk/debian/patches/fix-build-on-newer-gcc.patch
Modified:
    pulseaudio/trunk/debian/changelog
    pulseaudio/trunk/debian/control
    pulseaudio/trunk/debian/patches/series
    pulseaudio/trunk/debian/rules

Modified: pulseaudio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/changelog?rev=159&op=diff
==============================================================================
--- pulseaudio/trunk/debian/changelog (original)
+++ pulseaudio/trunk/debian/changelog Sat Sep  1 10:26:18 2007
@@ -1,13 +1,16 @@
 pulseaudio (0.9.6-2) UNRELEASED; urgency=low
 
-  * debian/control: Add -dbg packages.
+  * debian/control:
+    - Add -dbg packages.
+    - Make libpulse-browse0 depend on avahi-daemon to ensure that the avahi
+        daemon is running. (Closes: #440333)
+    - Make libcap-dev and libasound-dev arch specific build deps.
+  * debian/rules: Generate arch specific install files. (Closes: #430366)
   * debian/overrides/pulseaudio: Update libpulsecore override to new
       soversion.
   * debian/copyright: Update e-mail address for Lennart Poettering.
-  * debian/control: Make libpulse-browse0 depend on avahi-daemon to ensure
-      that the avahi daemon is running. (Closes: #440333)
 
- -- CJ van den Berg <cj at vdbonline.com>  Fri, 31 Aug 2007 22:10:21 +0200
+ -- CJ van den Berg <cj at vdbonline.com>  Sat, 01 Sep 2007 01:28:12 +0200
 
 pulseaudio (0.9.6-1) unstable; urgency=low
 

Modified: pulseaudio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/control?rev=159&op=diff
==============================================================================
--- pulseaudio/trunk/debian/control (original)
+++ pulseaudio/trunk/debian/control Sat Sep  1 10:26:18 2007
@@ -6,7 +6,9 @@
 Build-Depends: debhelper (>= 5), cdbs, quilt, autotools-dev, m4,
     libltdl3-dev, liboil0.3-dev (>= 0.3.0) | liboil-dev, libsamplerate0-dev,
     libsndfile1-dev (>= 1.0.10) | libsndfile-dev, libx11-dev,
-    x11proto-core-dev, libxt-dev, libcap-dev, libasound-dev, libglib2.0-dev,
+    x11proto-core-dev, libxt-dev, libglib2.0-dev,
+    libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+    libasound-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
     libavahi-client-dev, libjack0.100.0-dev, libwrap0-dev,
     liblircclient-dev, libgconf2-dev, libhal-dev, libasyncns-dev,
     libatomic-ops-dev

Added: pulseaudio/trunk/debian/patches/fix-build-on-newer-gcc.patch
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/fix-build-on-newer-gcc.patch?rev=159&op=file
==============================================================================
--- pulseaudio/trunk/debian/patches/fix-build-on-newer-gcc.patch (added)
+++ pulseaudio/trunk/debian/patches/fix-build-on-newer-gcc.patch Sat Sep  1 10:26:18 2007
@@ -1,0 +1,17 @@
+From: Petr Salinger <Petr.Salinger at seznam.cz>
+
+---
+
+ core-util.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
++++ pulseaudio-0.9.6/src/pulsecore/core-util.c
+@@ -544,6 +544,7 @@
+         cap_free(caps);
+     }
+ #endif
++    ;
+ }
+ 
+ /* Reset the priority to normal, inverting the changes made by pa_raise_priority() */

Modified: pulseaudio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/series?rev=159&op=diff
==============================================================================
--- pulseaudio/trunk/debian/patches/series (original)
+++ pulseaudio/trunk/debian/patches/series Sat Sep  1 10:26:18 2007
@@ -1,2 +1,2 @@
-# This series applies on GIT commit 2dc3546dc1ed3d6229684ea12695c384a4900a8e
 use-ifexists-in-default-pa.patch
+fix-build-on-newer-gcc.patch

Modified: pulseaudio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/rules?rev=159&op=diff
==============================================================================
--- pulseaudio/trunk/debian/rules (original)
+++ pulseaudio/trunk/debian/rules Sat Sep  1 10:26:18 2007
@@ -4,9 +4,20 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+common-build-arch::
+	grep -v -e alsa -e evdev debian/pulseaudio.install > \
+	    debian/pulseaudio.install.kfreebsd-i386
+	grep -v -e alsa -e evdev debian/pulseaudio.install > \
+	    debian/pulseaudio.install.kfreebsd-amd64
+
+
 common-install-arch::
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian
 	cp -a $(CURDIR)/debian/overrides $(CURDIR)/debian/tmp/usr/share/lintian
+
+clean::
+	rm -f debian/pulseaudio.install.kfreebsd-i386
+	rm -f debian/pulseaudio.install.kfreebsd-amd64
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-realtime-group=pulse-rt
 DEB_FIXPERMS_EXCLUDE = usr/bin/pulseaudio