[SCM] pulseaudio packaging branch, master, updated. debian/0.9.21-2-13-g7e2fcd3

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Dec 5 11:35:32 UTC 2010


The branch, master has been updated
       via  7e2fcd3dcaf03b6ef8554355671421549a8ad796 (commit)
       via  7ec8bdca1883f49e626d4adc315dd25dacd1383c (commit)
       via  3e3cd667e44d84641d66cbe6310eea22c415eaac (commit)
      from  cf9ded0f2f8c99a33df86914dc1fd0bde7a6bd9a (commit)


- Shortlog ------------------------------------------------------------
7e2fcd3 Bump shlibs and other version specific rules
7ec8bdc Suggest rtkit
3e3cd66 Ensure building with X11

Summary of changes:
 debian/changelog         |    5 ++++-
 debian/control           |    8 ++++----
 debian/libpulse0.shlibs  |    4 ++--
 debian/pulseaudio.shlibs |    2 +-
 debian/rules             |    8 +++++---
 5 files changed, 16 insertions(+), 11 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 7e2fcd3dcaf03b6ef8554355671421549a8ad796
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Dec 5 11:33:19 2010 +0000

    Bump shlibs and other version specific rules

diff --git a/debian/libpulse0.shlibs b/debian/libpulse0.shlibs
index 6cbd415..c69955e 100644
--- a/debian/libpulse0.shlibs
+++ b/debian/libpulse0.shlibs
@@ -1,3 +1,3 @@
-libpulse 0 libpulse0 (>= 0.9.21)
+libpulse 0 libpulse0 (>= 0.9.22)
 libpulse-simple 0 libpulse0
-libpulsecommon 0.9.21 libpulse0
+libpulsecommon 0.9.22 libpulse0
diff --git a/debian/pulseaudio.shlibs b/debian/pulseaudio.shlibs
index 13de9dd..8e76da7 100644
--- a/debian/pulseaudio.shlibs
+++ b/debian/pulseaudio.shlibs
@@ -1 +1 @@
-libpulsecore 0.9.21 pulseaudio
+libpulsecore 0.9.22 pulseaudio
diff --git a/debian/rules b/debian/rules
index f3ca55d..78f7cc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ common-install-arch::
 
 common-configure-arch::
 ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
-	make -C src libpulsecore_0.9.21_la-svolume_arm.lo CFLAGS+=-march=armv6
+	make -C src libpulsecore_0.9.22_la-svolume_arm.lo CFLAGS+=-march=armv6
 endif
 
 pulseaudio-install-arch::
@@ -51,7 +51,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), "linux"))
   DEB_CONFIGURE_EXTRA_FLAGS += --enable-hal-compat --disable-hal
 endif
 
-DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.21/modules
+DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.22/modules
 DEB_DH_SHLIBDEPS_ARGS_libpulse0 = -u -L/dev/null
 DEB_DH_SHLIBDEPS_ARGS_pulseaudio = -u -Ldebian/shlibs_pulseaudio.local
 DEB_DH_INSTALL_ARGS = --sourcedir=$(CURDIR)/debian/tmp

commit 7ec8bdca1883f49e626d4adc315dd25dacd1383c
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Dec 5 11:27:22 2010 +0000

    Suggest rtkit

diff --git a/debian/changelog b/debian/changelog
index 0033b19..357a52a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ pulseaudio (0.9.22-1) UNRELEASED; urgency=low
   * debian/rules: Stop using -g0 on mips{,el} the toolchain has been fixed
   * debian/rules, debian/control: Update build-depends and force building
     with X11
+  * debian/control: Suggest rtkit
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Dec 2010 11:27:43 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Dec 2010 11:28:54 +0000
 
 pulseaudio (0.9.21-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7e670c6..24909ac 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Conflicts: libltdl3 (<< 1.5.24-1)
 Recommends: pulseaudio-module-x11,
     libasound2-plugins, gstreamer0.10-pulseaudio,
     pulseaudio-esound-compat
-Suggests: pulseaudio-utils, pavumeter, pavucontrol, paman, paprefs
+Suggests: pulseaudio-utils, pavumeter, pavucontrol, paman, paprefs, rtkit
 Description: PulseAudio sound server
  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
  WIN32 systems. It is a drop in replacement for the ESD sound server with

commit 3e3cd667e44d84641d66cbe6310eea22c415eaac
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Dec 5 11:21:02 2010 +0000

    Ensure building with X11

diff --git a/debian/changelog b/debian/changelog
index 57efcac..0033b19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ pulseaudio (0.9.22-1) UNRELEASED; urgency=low
   * debian/patches/0003-Re-bootstrap.patch
     + Dropped, not needed anymore
   * debian/rules: Stop using -g0 on mips{,el} the toolchain has been fixed
+  * debian/rules, debian/control: Update build-depends and force building
+    with X11
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Dec 2010 11:07:44 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Dec 2010 11:27:43 +0000
 
 pulseaudio (0.9.21-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 61c0f50..7e670c6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debian.org>
 Uploaders: CJ van den Berg <cj at vdbonline.com>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, quilt, m4, libltdl-dev (>= 2.2.6a-2),
-    libsamplerate0-dev, libsndfile1-dev (>= 1.0.20), libx11-dev,
-    x11proto-core-dev, libxt-dev, libglib2.0-dev,
+    libsamplerate0-dev, libsndfile1-dev (>= 1.0.20), libglib2.0-dev,
     libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
     libasound2-dev (>= 1.0.19) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
     libavahi-client-dev, libjack-dev, libwrap0-dev,
@@ -16,7 +15,8 @@ Build-Depends: debhelper (>= 5), cdbs, quilt, m4, libltdl-dev (>= 2.2.6a-2),
     libatomic-ops-dev, libspeexdsp-dev (>= 1.2~rc1),
     libbluetooth-dev (>= 4.40) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
     libgdbm-dev, intltool, libgtk2.0-dev, libxtst-dev,
-    libssl-dev
+    libssl-dev,
+    libx11-xcb-dev, libice-dev, libxcb-atom1-dev
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/pulseaudio.git
 Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/pulseaudio.git
diff --git a/debian/rules b/debian/rules
index 3503079..f3ca55d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,10 @@ update-patch-series:
 		mv $${patch}.chomped $$patch ; \
 	done
 
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11
+
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), "linux"))
-  DEB_CONFIGURE_EXTRA_FLAGS = --enable-hal-compat --disable-hal
+  DEB_CONFIGURE_EXTRA_FLAGS += --enable-hal-compat --disable-hal
 endif
 
 DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.21/modules

-- 
pulseaudio packaging



More information about the pkg-pulseaudio-devel mailing list