[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.14-2-6-g7f2c4c7

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  7f2c4c7920d8fcb20c53a309af370a0d9298ac09 (commit)
      from  0262efbccf24fa56b0fa37cb45157eb68b934c89 (commit)


- Shortlog ------------------------------------------------------------
7f2c4c7 Update patches

Summary of changes:
 debian/changelog                                   |    5 ++-
 .../patches/0001-load-module-gconf-earlier.patch   |   45 --------------------
 debian/patches/series                              |    1 -
 debian/rules                                       |    2 +-
 4 files changed, 5 insertions(+), 48 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 7f2c4c7920d8fcb20c53a309af370a0d9298ac09
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Thu Mar 5 18:10:50 2009 +0000

    Update patches

diff --git a/debian/changelog b/debian/changelog
index b686902..861aded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ pulseaudio (0.9.15~test5-1) UNRELEASED; urgency=low
   * debian/copyright: Updated
   * debian/control: Build-Depends on libltdl7-dev
   * debian/control: Build-Depends on libasound2-dev (>= 1.0.19)
+  * debian/rules: Use git format-patch instead of git-format-patch
+  * debian/patches/0001-load-module-gconf-earlier.patch:
+    - Removed. Merged upstream
 
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 05 Mar 2009 17:44:57 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu, 05 Mar 2009 18:09:32 +0000
 
 pulseaudio (0.9.14-2) unstable; urgency=low
 
diff --git a/debian/patches/0001-load-module-gconf-earlier.patch b/debian/patches/0001-load-module-gconf-earlier.patch
deleted file mode 100644
index 5142e86..0000000
--- a/debian/patches/0001-load-module-gconf-earlier.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a33c3ef391c9bc6d164633e70cb8bb56ed738b06 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at debian.org>
-Date: Sun, 19 Oct 2008 13:39:50 +0100
-Subject: [PATCH] load module gconf earlier
-
----
- src/daemon/default.pa.in |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
-index 517f2c9..cdb62dd 100755
---- a/src/daemon/default.pa.in
-+++ b/src/daemon/default.pa.in
-@@ -76,6 +76,15 @@ load-module module-native-protocol-unix
- #load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink"
- #load-module module-rtp-send source=rtp.monitor
- 
-+### Load additional modules from GConf settings. This can be configured with the paprefs tool.
-+### Please keep in mind that the modules configured by paprefs might conflict with manually
-+### loaded modules.
-+.ifexists module-gconf at PA_SOEXT@
-+.nofail
-+load-module module-gconf
-+.fail
-+.endif
-+
- ### Automatically restore the default sink/source when changed by the user during runtime
- load-module module-default-device-restore
- 
-@@ -96,15 +105,6 @@ load-module module-console-kit
- ### Enable positioned event sounds
- load-module module-position-event-sounds
- 
--### Load additional modules from GConf settings. This can be configured with the paprefs tool.
--### Please keep in mind that the modules configured by paprefs might conflict with manually
--### loaded modules.
--.ifexists module-gconf at PA_SOEXT@
--.nofail
--load-module module-gconf
--.fail
--.endif
--
- # X11 modules should not be started from default.pa so that one daemon
- # can be shared by multiple sessions.
- 
diff --git a/debian/patches/series b/debian/patches/series
index 18dbec1..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-load-module-gconf-earlier.patch
diff --git a/debian/rules b/debian/rules
index 62d7a3c..4ba43c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ clean::
 update-patch-series:
 	mkdir -p $(CURDIR)/debian/patches
 	rm -f $(CURDIR)/debian/patches/*.patch
-	git-format-patch -o $(CURDIR)/debian/patches patches ^upstream | \
+	git format-patch -o $(CURDIR)/debian/patches patches ^upstream | \
 		xargs -n 1 basename > $(CURDIR)/debian/patches/series
 	for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \
 	do \

-- 
pulseaudio packaging