[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.7-3-15-g7864b8c
neurocyte-guest at users.alioth.debian.org
neurocyte-guest at users.alioth.debian.org
Thu Nov 22 02:55:40 UTC 2007
The branch, master has been updated
via 7864b8c9c57d5ec6c737e9fc62ae2a7f2e6bc657 (commit)
from b81f6c047c3487c21dc721bf502fa176c467b608 (commit)
- Shortlog ------------------------------------------------------------
7864b8c Rebase patchset to new upstream release
Summary of changes:
debian/changelog | 8 +++++-
...ocket-to-tmp-.esd-socket-to-match-up-with.patch | 2 +-
.../0002-Double-esound-maximum-sample-size.patch | 24 ++++++++++++++++++++
...readlink-to-put-a-0-in-the-right-location.patch | 22 ------------------
...R_eventfd-on-arm-if-it-wasn-t-defined-yet.patch | 24 --------------------
.../0004-Double-esound-maximum-sample-size.patch | 24 --------------------
debian/patches/series | 4 +--
7 files changed, 32 insertions(+), 76 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 7864b8c9c57d5ec6c737e9fc62ae2a7f2e6bc657
Author: CJ van den Berg <cj at vdbonline.com>
Date: Thu Nov 22 03:50:28 2007 +0100
Rebase patchset to new upstream release
diff --git a/debian/changelog b/debian/changelog
index f7768dd..ddffde4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,12 @@ pulseaudio (0.9.8-1) UNRELEASED; urgency=low
+ Add libpulsecore4-dbg package.
+ Rename gstreamer plugin package in recommends.
+ Add Homepage field.
- * debian/patches:
- + Added 0004-Double-esound-maximum-sample-size.patch from Ubuntu.
+ * debian/patches/0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch:
+ - Dropped, merged upstream.
+ * debian/p..s/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch:
+ - Dropped, merged upstream.
+ * debian/patches/0002-Double-esound-maximum-sample-size.patch:
+ + Added, from Ubuntu.
[Daniel T Chen]
* debian/control: Add lsb-base (>= 3) to pulseaudio's dependencies.
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 819ed6d..263f843 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 4c1844dbd5fdd8128fc609764ecd7ef09a6a04ef Mon Sep 17 00:00:00 2001
+From 2c5b1549cf30232a10ab855a2e240b1b217fbbe8 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
diff --git a/debian/patches/0004-Double-esound-maximum-sample-size.patch b/debian/patches/0002-Double-esound-maximum-sample-size.patch
similarity index 88%
rename from debian/patches/0004-Double-esound-maximum-sample-size.patch
rename to debian/patches/0002-Double-esound-maximum-sample-size.patch
index 2b08bcb..0c9a20a 100644
--- a/debian/patches/0004-Double-esound-maximum-sample-size.patch
+++ b/debian/patches/0002-Double-esound-maximum-sample-size.patch
@@ -1,4 +1,4 @@
-From 4834d66f60e6e57a69d4f3873ef9760e1bbb05fc Mon Sep 17 00:00:00 2001
+From 5def85371aa7f80523c0aa1640772ada6c66831c Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra at ubuntu.com>
Date: Sun, 18 Nov 2007 20:36:17 +0100
Subject: [PATCH] Double esound maximum sample size
@@ -10,7 +10,7 @@ connections.
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
-index 8b6b33a..b70ef88 100644
+index 70be848..e59c7da 100644
--- a/src/pulsecore/protocol-esound.c
+++ b/src/pulsecore/protocol-esound.c
@@ -72,7 +72,7 @@
diff --git a/debian/patches/0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch b/debian/patches/0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch
deleted file mode 100644
index bbbbe29..0000000
--- a/debian/patches/0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c8c7a262a5a53ce1e8edbd5cca00b087d7e95d76 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sat, 3 Nov 2007 21:13:38 +0100
-Subject: [PATCH] Fix pa_readlink to put a \0 in the right location
-
----
- src/pulsecore/core-util.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
-index b33241a..b2bc5f0 100644
---- a/src/pulsecore/core-util.c
-+++ b/src/pulsecore/core-util.c
-@@ -1523,7 +1523,7 @@ char *pa_readlink(const char *p) {
- }
-
- if ((size_t) n < l-1) {
-- c[l-1] = 0;
-+ c[n] = 0;
- return c;
- }
-
diff --git a/debian/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch b/debian/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch
deleted file mode 100644
index 7fdcb7c..0000000
--- a/debian/patches/0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 546cf4b92fa968d9a5242921272ad09c26cda049 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun, 4 Nov 2007 13:30:57 +0100
-Subject: [PATCH] Define __NR_eventfd on arm if it wasn't defined yet
-
----
- src/pulsecore/fdsem.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/pulsecore/fdsem.c b/src/pulsecore/fdsem.c
-index 927bf00..59eec18 100644
---- a/src/pulsecore/fdsem.c
-+++ b/src/pulsecore/fdsem.c
-@@ -53,6 +53,10 @@
- #define __NR_eventfd 284
- #endif
-
-+#if !defined(__NR_eventfd) && defined(__arm__)
-+#define __NR_eventfd (__NR_SYSCALL_BASE+351)
-+#endif
-+
- #if !defined(SYS_eventfd) && defined(__NR_eventfd)
- #define SYS_eventfd __NR_eventfd
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index 2ca9b81..842e64a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
-0002-Fix-pa_readlink-to-put-a-0-in-the-right-location.patch
-0003-Define-__NR_eventfd-on-arm-if-it-wasn-t-defined-yet.patch
-0004-Double-esound-maximum-sample-size.patch
+0002-Double-esound-maximum-sample-size.patch
--
pulseaudio packaging
More information about the Pkg-pulseaudio-devel
mailing list