Author: neurocyte-guest
Date: Thu Sep 21 00:04:31 2006
New Revision: 52
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/?sc=1&rev=52
Log:
Use dpatch
Added:
pulseaudio/trunk/debian/patches/
pulseaudio/trunk/debian/patches/00list
pulseaudio/trunk/debian/patches/01_esound_optional.dpatch
Removed:
pulseaudio/trunk/src/
Modified:
pulseaudio/trunk/debian/control
pulseaudio/trunk/debian/rules
Modified: pulseaudio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/control?rev=52&op=diff
==============================================================================
--- pulseaudio/trunk/debian/control (original)
+++ pulseaudio/trunk/debian/control Thu Sep 21 00:04:31 2006
@@ -2,7 +2,7 @@
Section: sound
Priority: optional
Maintainer: CJ van den Berg <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), autotools-dev, m4, libltdl3-dev,
+Build-Depends: debhelper (>= 5), dpatch, autotools-dev, m4, libltdl3-dev,
liboil-dev, libsamplerate-dev, libsndfile-dev, libx11-dev,
x11proto-core-dev, libxt-dev, libcap-dev, libasound-dev, libglib2.0-dev,
libavahi-client-dev, libjack0.100.0-dev, libwrap0-dev,
Added: pulseaudio/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/00list?rev=52&op=file
==============================================================================
--- pulseaudio/trunk/debian/patches/00list (added)
+++ pulseaudio/trunk/debian/patches/00list Thu Sep 21 00:04:31 2006
@@ -1,0 +1,1 @@
+01_esound_optional.dpatch
Added: pulseaudio/trunk/debian/patches/01_esound_optional.dpatch
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/patches/01_esound_optional.dpatch?rev=52&op=file
==============================================================================
--- pulseaudio/trunk/debian/patches/01_esound_optional.dpatch (added)
+++ pulseaudio/trunk/debian/patches/01_esound_optional.dpatch Thu Sep 21 00:04:31 2006
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_esound_optional.dpatch by CJ van den Berg <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: modify default.pa to make esound protocol optional
+
[EMAIL PROTECTED]@
+
+diff -Nru pulseaudio-0.9.5-orig/src/daemon/default.pa.in pulseaudio-0.9.5/src/daemon/default.pa.in
+--- pulseaudio-0.9.5-orig/src/daemon/default.pa.in 2006-08-25 14:08:11.000000000 +0200
++++ pulseaudio-0.9.5/src/daemon/default.pa.in 2006-09-20 23:55:18.987673697 +0200
+@@ -41,8 +41,7 @@
+ #add-autoload-sink output module-alsa-sink sink_name=output
+ #add-autoload-source input module-alsa-source source_name=input
+
+-### Load several protocols
+-load-module module-esound-protocol-unix
++### Load native protocol
+ load-module module-native-protocol-unix
+
+ ### Network access (may be configured with paprefs, so leave this commented
+@@ -71,6 +70,9 @@
+
+ .nofail
+
++### Load esound protocol
++load-module module-esound-protocol-unix
++
+ ### Load something to the sample cache
+ load-sample x11-bell /usr/share/sounds/gtk-events/activate.wav
+ #load-sample-dir-lazy /usr/share/sounds/*.wav
Modified: pulseaudio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/pulseaudio/trunk/debian/rules?rev=52&op=diff
==============================================================================
--- pulseaudio/trunk/debian/rules (original)
+++ pulseaudio/trunk/debian/rules Thu Sep 21 00:04:31 2006
@@ -20,7 +20,7 @@
CONFIGURE_FLAGS += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
endif
-config.status: configure
+config.status: patch configure
dh_testdir
./configure $(CONFIGURE_FLAGS)
@@ -28,7 +28,7 @@
build: build-arch build-indep
build-arch: build-arch-stamp
-build-arch-stamp: config.status
+build-arch-stamp: config.status
$(MAKE)
touch $@
@@ -36,7 +36,8 @@
build-indep-stamp: config.status
touch $@
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
@@ -49,6 +50,15 @@
cp -f /usr/share/misc/config.guess config.guess
endif
dh_clean
+
+patch: patch-stamp
+patch-stamp:
+ dpatch apply-all
+ touch patch-stamp
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
install: install-indep install-arch
install-indep:
_______________________________________________
Pkg-pulseaudio-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-pulseaudio-devel
