[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.10-3-5-g316c411

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Oct 19 12:45:40 UTC 2008


The branch, master has been updated
       via  316c41124d6b1f4ded441ac522e3a57c3a74b961 (commit)
      from  7c1684c9a6ec496a20fdbd98ed0c766d73b07b5e (commit)


- Shortlog ------------------------------------------------------------
316c411 rebase patches

Summary of changes:
 debian/changelog                                   |   15 ++++---
 ...ocket-to-tmp-.esd-socket-to-match-up-with.patch |    6 +-
 ...ry-search-path-to-include-lib-and-usr-lib.patch |    6 +-
 debian/patches/0003-Define-PULSE_INTERNAL.patch    |   21 ---------
 .../patches/0003-load-module-gconf-earlier.patch   |   46 ++++++++++++++++++++
 .../patches/0004-load-module-gconf-earlier.patch   |   45 -------------------
 .../0005-Reduce-RT-prio-logging-severity.patch     |   26 -----------
 .../0006-fix-iteration-over-random-devices.patch   |   25 -----------
 .../patches/0007-fix-FTBFS-on-GNU-kFreeBSD.patch   |   26 -----------
 debian/patches/series                              |    6 +--
 10 files changed, 62 insertions(+), 160 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 316c41124d6b1f4ded441ac522e3a57c3a74b961
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Oct 19 13:45:22 2008 +0100

    rebase patches

diff --git a/debian/changelog b/debian/changelog
index bbdfbd8..38b5ce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,16 @@
 pulseaudio (0.9.13-1) UNRELEASED; urgency=low
 
-  [ CJ van den Berg ]
-  * debian/patches/0007-fix-FTBFS-on-GNU-kFreeBSD.patch
-    - Added. Fix FTBTS on GNU/kFreeBSD. (Closes: #497624)
-
   [ Sjoerd Simons ]
   * New Upstream Version
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 19 Oct 2008 12:47:56 +0100
+  * Fixes FTBTS on GNU/kFreeBSD (Closes: #497624)
+  * Dropped patches for things that have been fixed upstream:
+    - debian/patches/0003-Define-PULSE_INTERNAL.patch
+    - debian/patches/0005-Reduce-RT-prio-logging-severity.patch
+    - debian/patches/0006-fix-iteration-over-random-devices.patch
+  * rename debian/patches/0004-load-module-gconf-earlier.patch to
+    debian/patches/0003-load-module-gconf-earlier.patch
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 19 Oct 2008 13:40:50 +0100
 
 pulseaudio (0.9.10-3) unstable; urgency=low
 
diff --git a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
index 87b0b51..a7038f8 100644
--- a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
+++ b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
@@ -1,4 +1,4 @@
-From 6ec4a2caba74203b6814635beec957a899645410 Mon Sep 17 00:00:00 2001
+From f2d3b86adc4e247061cbb747668c038a18f3ad92 Mon Sep 17 00:00:00 2001
 From: CJ van den Berg <cj at vdbonline.com>
 Date: Wed, 31 Oct 2007 13:59:31 +0100
 Subject: [PATCH] Set ESD socket to /tmp/.esd/socket to match up with libesd
@@ -8,10 +8,10 @@ Subject: [PATCH] Set ESD socket to /tmp/.esd/socket to match up with libesd
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
-index 064a6cc..be46526 100755
+index 7032038..27b3458 100755
 --- a/src/daemon/default.pa.in
 +++ b/src/daemon/default.pa.in
-@@ -47,7 +47,7 @@ load-module module-detect
+@@ -55,7 +55,7 @@ load-module module-detect
  
  ### Load several protocols
  .ifexists module-esound-protocol-unix at PA_SOEXT@
diff --git a/debian/patches/0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch b/debian/patches/0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
index 97a9ca1..0a2a187 100644
--- a/debian/patches/0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+++ b/debian/patches/0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
@@ -1,4 +1,4 @@
-From 35b5f2362512ecd8ec56c3cea489b35e7ff637fb Mon Sep 17 00:00:00 2001
+From 887a98aa80e26aa01ba73d11546e2eeeaa193ec8 Mon Sep 17 00:00:00 2001
 From: Courteney van den Berg <vdberg at ffm.tc.iot.dtag.de>
 Date: Mon, 31 Mar 2008 17:11:29 +0200
 Subject: [PATCH] Fix library search path to include /lib and /usr/lib
@@ -8,10 +8,10 @@ Subject: [PATCH] Fix library search path to include /lib and /usr/lib
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/aclocal.m4 b/aclocal.m4
-index 67e4c42..297612a 100644
+index 85fd9db..691752b 100644
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -2820,8 +2820,8 @@ linux* | k*bsd*-gnu)
+@@ -2141,8 +2141,8 @@ linux* | k*bsd*-gnu)
    # Some rework will be needed to allow for fast_install
    # before this can be enabled.
    hardcode_into_libs=yes
diff --git a/debian/patches/0003-Define-PULSE_INTERNAL.patch b/debian/patches/0003-Define-PULSE_INTERNAL.patch
deleted file mode 100644
index 2195a29..0000000
--- a/debian/patches/0003-Define-PULSE_INTERNAL.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7d213f4c7a5328190626b5efdccc45901408650d Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun, 27 Apr 2008 21:39:08 +0200
-Subject: [PATCH] Define PULSE_INTERNAL
-
----
- src/daemon/main.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/daemon/main.c b/src/daemon/main.c
-index 1e3b358..1b6fe3f 100644
---- a/src/daemon/main.c
-+++ b/src/daemon/main.c
-@@ -677,6 +677,7 @@ int main(int argc, char *argv[]) {
- #endif
-     }
- 
-+    set_env("PULSE_INTERNAL", "1");
-     pa_assert_se(chdir("/") == 0);
-     umask(0022);
- 
diff --git a/debian/patches/0004-load-module-gconf-earlier.patch b/debian/patches/0003-load-module-gconf-earlier.patch
similarity index 54%
rename from debian/patches/0004-load-module-gconf-earlier.patch
rename to debian/patches/0003-load-module-gconf-earlier.patch
index 4ea107c..ad0917c 100644
--- a/debian/patches/0004-load-module-gconf-earlier.patch
+++ b/debian/patches/0003-load-module-gconf-earlier.patch
@@ -1,17 +1,17 @@
-From c10991788a48ffb8d47a9d6fa8684086ee6e6c5a Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sat, 10 May 2008 18:35:08 +0200
-Subject: [PATCH] load module-gconf earlier
+From 3117863ef8395c6c1a7f61e5745438013bcac059 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(-)
+ src/daemon/default.pa.in |   19 ++++++++++---------
+ 1 files changed, 10 insertions(+), 9 deletions(-)
 
 diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
-index be46526..47ea7ab 100755
+index 27b3458..f420a36 100755
 --- a/src/daemon/default.pa.in
 +++ b/src/daemon/default.pa.in
-@@ -64,6 +64,15 @@ load-module module-native-protocol-unix
+@@ -72,6 +72,16 @@ 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
  
@@ -24,12 +24,13 @@ index be46526..47ea7ab 100755
 +.fail
 +.endif
 +
- ### Automatically restore the volume of playback streams
- load-module module-volume-restore
- 
-@@ -85,15 +94,6 @@ load-module module-suspend-on-idle
- # Instead we load this via /etc/xdg/autostart/ and "pactl load-module" now
- # load-module module-x11-xsmp
++
+ ### Automatically restore the volume of streams and devices
+ load-module module-stream-restore
+ load-module module-device-restore
+@@ -96,15 +106,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
@@ -40,6 +41,6 @@ index be46526..47ea7ab 100755
 -.fail
 -.endif
 -
- ### Publish connection data in the X11 root window
- .ifexists module-x11-publish at PA_SOEXT@
- .nofail
+ # X11 modules should not be started from default.pa so that one daemon
+ # can be shared by multiple sessions.
+ 
diff --git a/debian/patches/0005-Reduce-RT-prio-logging-severity.patch b/debian/patches/0005-Reduce-RT-prio-logging-severity.patch
deleted file mode 100644
index 7626ffd..0000000
--- a/debian/patches/0005-Reduce-RT-prio-logging-severity.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 44a4f2b01915544994bdff805d4b0a163f3454d0 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sat, 10 May 2008 21:59:57 +0200
-Subject: [PATCH] Reduce RT prio logging severity
-
----
- src/daemon/main.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/daemon/main.c b/src/daemon/main.c
-index 1b6fe3f..74d1350 100644
---- a/src/daemon/main.c
-+++ b/src/daemon/main.c
-@@ -449,9 +449,10 @@ int main(int argc, char *argv[]) {
-             suid_root = real_root = FALSE;
- 
-             if (conf->high_priority || conf->realtime_scheduling)
--                pa_log_notice("Called SUID root and real-time/high-priority scheduling was requested in the configuration. However, we lack the necessary priviliges:\n"
-+                pa_log_info("Called SUID root and real-time/high-priority scheduling was requested in the configuration. However, we lack the necessary priviliges:\n"
-                               "We are not in group '"PA_REALTIME_GROUP"' and PolicyKit refuse to grant us priviliges. Dropping SUID again.\n"
--                              "For enabling real-time scheduling please acquire the appropriate PolicyKit priviliges, or become a member of '"PA_REALTIME_GROUP"', or increase the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this user.");
-+                              "For enabling real-time scheduling please acquire the appropriate PolicyKit priviliges, or become a member of '"PA_REALTIME_GROUP"', or increase the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this user.\n"
-+                              "Note that real-time/high-priority scheduling is NOT normally required. If you experience crackling or other sound anomalies, consider one or more of the above solutions.");
-         }
- 
-     } else {
diff --git a/debian/patches/0006-fix-iteration-over-random-devices.patch b/debian/patches/0006-fix-iteration-over-random-devices.patch
deleted file mode 100644
index bc57578..0000000
--- a/debian/patches/0006-fix-iteration-over-random-devices.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 78c55228a18940134a4e811ed8249fc365587cb4 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun, 3 Aug 2008 12:29:18 +0100
-Subject: [PATCH] fix iteration over random devices
-
-Actually iterate over the various random devices. Fixes a infinite loop on
-startup when /dev/urandom isn't readable. Patch by Matt Kraai on Debian bug
-491270, closes #333
----
- src/pulsecore/random.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/pulsecore/random.c b/src/pulsecore/random.c
-index c72876e..ff73532 100644
---- a/src/pulsecore/random.c
-+++ b/src/pulsecore/random.c
-@@ -75,6 +75,8 @@ static int random_proper(void *ret_data, size_t length) {
- 
-         if (ret == 0)
-             break;
-+
-+        device++;
-     }
- 
-     return ret;
diff --git a/debian/patches/0007-fix-FTBFS-on-GNU-kFreeBSD.patch b/debian/patches/0007-fix-FTBFS-on-GNU-kFreeBSD.patch
deleted file mode 100644
index f03169a..0000000
--- a/debian/patches/0007-fix-FTBFS-on-GNU-kFreeBSD.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3cd2b7dc37de1ac6876e4cb0de8b73e8f81d844a Mon Sep 17 00:00:00 2001
-From: Petr Salinger <Petr.Salinger at seznam.cz>
-Date: Wed, 3 Sep 2008 09:28:20 +0200
-Subject: [PATCH] fix FTBFS on GNU/kFreeBSD
-
-The implementation of function pa_drop_caps() in caps.c does not match
-prototype in caps.h.
----
- src/daemon/caps.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/daemon/caps.c b/src/daemon/caps.c
-index 8b19838..fbe4471 100644
---- a/src/daemon/caps.c
-+++ b/src/daemon/caps.c
-@@ -131,9 +131,8 @@ int pa_limit_caps(void) {
-     return 0;
- }
- 
--int pa_drop_caps(void) {
-+void pa_drop_caps(void) {
-     pa_drop_root();
--    return 0;
- }
- 
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index c4a0bf5..10f81b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
 0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
-0003-Define-PULSE_INTERNAL.patch
-0004-load-module-gconf-earlier.patch
-0005-Reduce-RT-prio-logging-severity.patch
-0006-fix-iteration-over-random-devices.patch
-0007-fix-FTBFS-on-GNU-kFreeBSD.patch
+0003-load-module-gconf-earlier.patch

-- 
pulseaudio packaging



More information about the Pkg-pulseaudio-devel mailing list