The branch, master has been updated
via c555bc2b0f0b4de22bc5de366fd252b8bba7c381 (commit)
via 7e6e1fa4b5da0cf6cac38ba2483562033ce5d3d7 (commit)
via fef71d5fa77720b706ceef8824d0036bc6f98bc5 (commit)
via feedc40c42c024a50df5e8087d9e053870a30e9a (commit)
via 32ed077aad463ab4c7474040dea94c33f9f12001 (commit)
via 22372319a7c1b4897a5757d6a5392bcf877d37fc (commit)
via 79f6b95ec06389584399c10ae2248dddf2137d17 (commit)
from d36f28c0d642b98353a1c06beb904863c426207f (commit)
- Shortlog ------------------------------------------------------------
c555bc2 debian/patches/0001_man_page_typos.patch:
debian/patches/remove-analog-mono.patch
debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
7e6e1fa debian/control: Update-builddepends
fef71d5 Split out the libpulsedsp into its own package
feedc40 debian/{pulseaudio.install,apport-hook.py}: Install apport hook
32ed077 debian/pulseaudio.install: Install module-switch-on-port-available
2237231 debian/pulseaudio-module-bluetooth.install: Updated
79f6b95 debian/libpulse-dev.install: Install cmake files
Summary of changes:
debian/apport-hook.py | 15 +++
debian/changelog | 14 ++-
debian/control | 72 +++++++++---
debian/libpulse-dev.install | 1 +
debian/libpulsedsp.install | 2 +
debian/overrides/libpulsedsp | 3 +
debian/overrides/pulseaudio-utils | 3 -
debian/patches/0001_man_page_typos.patch | 33 -----
debian/patches/remove-analog-mono.patch | 124 --------------------
debian/patches/series | 4 +-
...s-needs-to-be-installed-before-module-ech.patch | 37 ------
debian/pulseaudio-module-bluetooth.install | 3 +-
debian/pulseaudio-utils.install | 2 -
debian/pulseaudio.install | 2 +
debian/rules | 2 +
15 files changed, 97 insertions(+), 220 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit c555bc2b0f0b4de22bc5de366fd252b8bba7c381
Author: Sjoerd Simons <[email protected]>
Date: Sat Nov 17 15:35:12 2012 +0100
debian/patches/0001_man_page_typos.patch:
debian/patches/remove-analog-mono.patch
debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
* debian/patches/0001_man_page_typos.patch:
debian/patches/remove-analog-mono.patch
debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
* Removed. All fixed upstream
diff --git a/debian/changelog b/debian/changelog
index f13e55c..f2b5914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,12 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* debian/{pulseaudio.install,apport-hook.py}: Install apport hook
* Split out the libpulsedsp into its own package
* debian/control: Update-builddepends
+ * debian/patches/0001_man_page_typos.patch:
+ debian/patches/remove-analog-mono.patch
+ debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
+ * Removed. All fixed upstream
- -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 15:19:37 +0100
+ -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 15:34:20 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/patches/0001_man_page_typos.patch
b/debian/patches/0001_man_page_typos.patch
deleted file mode 100644
index 1ce5f86..0000000
--- a/debian/patches/0001_man_page_typos.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: fixes man page typos spotted by Lintian
-Author: Martin-Ãric Racine <[email protected]>
---- pulseaudio-2.0.orig/man/pulse-daemon.conf.5.xml.in
-+++ pulseaudio-2.0/man/pulse-daemon.conf.5.xml.in
-@@ -267,7 +267,7 @@ USA.
- <option>
- <p><opt>dl-search-path=</opt> The path were to look for dynamic
- shared objects (DSOs/plugins). You may specify more than one
-- path seperated by colons. The default path depends on compile
-+ path separated by colons. The default path depends on compile
- time settings. The <opt>--dl-search-path</opt> command line
- option takes precedence. </p>
- </option>
-@@ -410,7 +410,7 @@ USA.
- <opt>s16be</opt>, <opt>s24le</opt>, <opt>s24be</opt>,
- <opt>s24-32le</opt>, <opt>s24-32be</opt>, <opt>s32le</opt>,
- <opt>s32be</opt> <opt>float32le</opt>, <opt>float32be</opt>,
-- <opt>ulaw</opt>, <opt>alaw</opt>. Depending on the endianess of
-+ <opt>ulaw</opt>, <opt>alaw</opt>. Depending on the endianness of
- the CPU the formats <opt>s16ne</opt>, <opt>s16re</opt>,
- <opt>s24ne</opt>, <opt>s24re</opt>, <opt>s24-32ne</opt>,
- <opt>s24-32re</opt>, <opt>s32ne</opt>, <opt>s32re</opt>,
---- pulseaudio-2.0.orig/man/pacat.1.xml.in
-+++ pulseaudio-2.0/man/pacat.1.xml.in
-@@ -116,7 +116,7 @@ USA.
- <opt>float32le</opt>, <opt>float32be</opt>, <opt>ulaw</opt>,
- <opt>alaw</opt>, <opt>s32le</opt>, <opt>s32be</opt>,
- <opt>s24le</opt>, <opt>s24be</opt>, <opt>s24-32le</opt>,
-- <opt>s24-32be</opt>. Depending on the endianess of the CPU the
-+ <opt>s24-32be</opt>. Depending on the endianness of the CPU the
- formats <opt>s16ne</opt>, <opt>s16re</opt>, <opt>s32ne</opt>,
- <opt>s32re</opt>, <opt>float32ne</opt>, <opt>float32re</opt>,
- <opt>s32ne</opt>, <opt>s32re</opt>, <opt>s24ne</opt>,
diff --git a/debian/patches/remove-analog-mono.patch
b/debian/patches/remove-analog-mono.patch
deleted file mode 100644
index 46e833c..0000000
--- a/debian/patches/remove-analog-mono.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/default.conf
-===================================================================
---- pulseaudio-2.0.orig/src/modules/alsa/mixer/profile-sets/default.conf
2012-05-13 15:26:37.000000000 +0200
-+++ pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/default.conf
2012-07-11 10:36:40.594590601 +0200
-@@ -101,42 +101,42 @@
- [Mapping analog-mono]
- device-strings = hw:%f
- channel-map = mono
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2
- paths-input = analog-input-front-mic analog-input-rear-mic
analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic
analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner
analog-input-fm analog-input-mic-line
- priority = 1
-
- [Mapping analog-stereo]
- device-strings = front:%f hw:%f
- channel-map = left,right
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2
- paths-input = analog-input-front-mic analog-input-rear-mic
analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic
analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner
analog-input-fm analog-input-mic-line
- priority = 10
-
- [Mapping analog-surround-40]
- device-strings = surround40:%f
- channel-map = front-left,front-right,rear-left,rear-right
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 7
- direction = output
-
- [Mapping analog-surround-41]
- device-strings = surround41:%f
- channel-map = front-left,front-right,rear-left,rear-right,lfe
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 8
- direction = output
-
- [Mapping analog-surround-50]
- device-strings = surround50:%f
- channel-map = front-left,front-right,rear-left,rear-right,front-center
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 7
- direction = output
-
- [Mapping analog-surround-51]
- device-strings = surround51:%f
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 8
- direction = output
-
-@@ -144,7 +144,7 @@
- device-strings = surround71:%f
- channel-map =
front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- description = Analog Surround 7.1
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 7
- direction = output
-
-Index: pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
-===================================================================
---- pulseaudio-2.0.orig/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
2012-05-13 15:26:37.000000000 +0200
-+++ pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
2012-07-11 10:34:12.474169115 +0200
-@@ -27,42 +27,42 @@
- [Mapping analog-mono]
- device-strings = hw:%f
- channel-map = mono
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2
- paths-input = analog-input-front-mic analog-input-rear-mic
analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic
analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner
analog-input-fm analog-input-mic-line
- priority = 1
-
- [Mapping analog-stereo]
- device-strings = front:%f hw:%f
- channel-map = left,right
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2
- paths-input = analog-input-front-mic analog-input-rear-mic
analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic
analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner
analog-input-fm analog-input-mic-line
- priority = 10
-
- [Mapping analog-surround-40]
- device-strings = surround40:%f
- channel-map = front-left,front-right,rear-left,rear-right
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 7
- direction = output
-
- [Mapping analog-surround-41]
- device-strings = surround41:%f
- channel-map = front-left,front-right,rear-left,rear-right,lfe
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 8
- direction = output
-
- [Mapping analog-surround-50]
- device-strings = surround50:%f
- channel-map = front-left,front-right,rear-left,rear-right,front-center
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 7
- direction = output
-
- [Mapping analog-surround-51]
- device-strings = surround51:%f
- channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 8
- direction = output
-
-@@ -70,7 +70,7 @@
- device-strings = surround71:%f
- channel-map =
front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
- description = Analog Surround 7.1
--paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
-+paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
- priority = 7
- direction = output
-
diff --git a/debian/patches/series b/debian/patches/series
index 3e8b479..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001_man_page_typos.patch
-webrtc-utils-needs-to-be-installed-before-module-ech.patch
-remove-analog-mono.patch
+
diff --git
a/debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch
b/debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch
deleted file mode 100644
index 5e3541f..0000000
--- a/debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9c141a3b230f1e2e5ecdb2eb95ad597610df73cd Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <[email protected]>
-Date: Fri, 20 Jul 2012 21:18:26 +0200
-Subject: [PATCH] webrtc-utils needs to be installed before module-echo-cancel
-
-Like other plugin helper libraries these need to be installed
-before the plugins that use them..
----
- src/Makefile.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9b71b17..aae13b5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -905,6 +905,10 @@ modlibexec_LTLIBRARIES = \
- libprotocol-http.la \
- libprotocol-native.la
-
-+if HAVE_WEBRTC
-+modlibexec_LTLIBRARIES += libwebrtc-util.la
-+endif
-+
- if HAVE_ESOUND
- modlibexec_LTLIBRARIES += \
- libprotocol-esound.la
-@@ -1837,7 +1841,6 @@ if HAVE_WEBRTC
- # The webrtc code is split off into a helper library to avoid having automake
- # link module-echo-cancel with C++ (which it does if there are any C++ deps,
- # even conditional ones).
--modlibexec_LTLIBRARIES += libwebrtc-util.la
-
- libwebrtc_util_la_SOURCES = modules/echo-cancel/webrtc.cc
- libwebrtc_util_la_CXXFLAGS = $(AM_CXXFLAGS) $(SERVER_CFLAGS) $(WEBRTC_CFLAGS)
-DHAVE_WEBRTC=1
---
-1.7.10.4
-
commit 7e6e1fa4b5da0cf6cac38ba2483562033ce5d3d7
Author: Sjoerd Simons <[email protected]>
Date: Sat Nov 17 15:19:56 2012 +0100
debian/control: Update-builddepends
diff --git a/debian/changelog b/debian/changelog
index f34521a..f13e55c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,9 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* debian/pulseaudio.install: Install module-switch-on-port-available
* debian/{pulseaudio.install,apport-hook.py}: Install apport hook
* Split out the libpulsedsp into its own package
+ * debian/control: Update-builddepends
- -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 14:58:09 +0100
+ -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 15:19:37 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 1ff2970..d187aad 100644
--- a/debian/control
+++ b/debian/control
@@ -4,23 +4,40 @@ Priority: optional
Maintainer: Pulseaudio maintenance team
<[email protected]>
Uploaders: Sjoerd Simons <[email protected]>,
Martin-Ãric Racine <[email protected]>
-Build-Depends: debhelper (>= 8.1.3), cdbs, m4, dh-autoreconf,
- libltdl-dev (>= 2.2.6a-2),
- libsamplerate0-dev, libsndfile1-dev (>= 1.0.20), libglib2.0-dev,
- libcap-dev [linux-any],
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs,
+ dh-autoreconf,
+ intltool,
libasound2-dev (>= 1.0.19) [linux-any],
- libavahi-client-dev, libjack-dev (>= 0.117.0), libwrap0-dev,
- liblircclient-dev, libgconf2-dev,
- libudev-dev (>= 143) [linux-any],
libasyncns-dev,
- libatomic-ops-dev, libspeexdsp-dev (>= 1.2~rc1),
+ libatomic-ops-dev,
+ libavahi-client-dev,
libbluetooth-dev (>= 4.40) [linux-any],
- libtdb-dev, intltool, libgtk2.0-dev, libxtst-dev,
+ libcap-dev [linux-any],
+ libfftw3-dev,
+ libgconf2-dev,
+ libglib2.0-dev,
+ libgtk2.0-dev,
+ libice-dev,
+ libjack-dev (>= 0.117.0),
+ libjson0-dev,
+ liblircclient-dev,
+ libltdl-dev (>= 2.2.6a-2),
+ liborc-0.4-dev (>= 1:0.4.11),
+ libsamplerate0-dev,
+ libsbc-dev,
+ libsndfile1-dev (>= 1.0.20),
+ libspeexdsp-dev (>= 1.2~rc1),
libssl-dev,
- libx11-xcb-dev, libice-dev, libxcb1-dev (>= 1.6),
- libjson0-dev, liborc-0.4-dev (>= 1:0.4.11), libfftw3-dev,
- libsystemd-daemon-dev [linux-any], libsystemd-login-dev [linux-any],
- libwebrtc-audio-processing-dev
+ libsystemd-daemon-dev [linux-any],
+ libsystemd-login-dev [linux-any],
+ libtdb-dev,
+ libudev-dev (>= 143) [linux-any],
+ libwebrtc-audio-processing-dev,
+ libwrap0-dev,
+ libx11-xcb-dev,
+ libxcb1-dev (>= 1.6),
+ libxtst-dev
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/pulseaudio.git
Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/pulseaudio.git
commit fef71d5fa77720b706ceef8824d0036bc6f98bc5
Author: Sjoerd Simons <[email protected]>
Date: Sat Nov 17 14:59:04 2012 +0100
Split out the libpulsedsp into its own package
diff --git a/debian/changelog b/debian/changelog
index 3f06532..f34521a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,9 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* debian/pulseaudio-module-bluetooth.install: Updated
* debian/pulseaudio.install: Install module-switch-on-port-available
* debian/{pulseaudio.install,apport-hook.py}: Install apport hook
+ * Split out the libpulsedsp into its own package
- -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 14:43:35 +0100
+ -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 14:58:09 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 4d3b03a..1ff2970 100644
--- a/debian/control
+++ b/debian/control
@@ -78,7 +78,7 @@ Description: PulseAudio sound server (debugging symbols)
Package: pulseaudio-utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpulsedsp
Suggests: avahi-daemon
Description: Command line tools for the PulseAudio sound server
PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
@@ -387,3 +387,30 @@ Description: PulseAudio client development headers and
libraries
.
Headers and libraries for developing applications that access a PulseAudio
sound server via PulseAudio's native interface.
+
+Package: libpulsedsp
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: PulseAudio OSS pre-load library
+ 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
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package provides the pre-load library used to redirect applications
+ using OSS through pulseaudio.
+
+Package: libpulsedsp-dbg
+Architecture: any
+Multi-Arch: same
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, libpulsedsp (= ${binary:Version})
+Description: PulseAudio OSS pre-load library detached debugging symbols
+ 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
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains detached debugging symbols for the OSS pre-load
+ library.
diff --git a/debian/libpulsedsp.install b/debian/libpulsedsp.install
new file mode 100644
index 0000000..e635c2c
--- /dev/null
+++ b/debian/libpulsedsp.install
@@ -0,0 +1,2 @@
+usr/lib/*/pulseaudio/libpulsedsp.so
+usr/share/lintian/overrides/libpulsedsp
diff --git a/debian/overrides/libpulsedsp b/debian/overrides/libpulsedsp
new file mode 100644
index 0000000..2f8bff9
--- /dev/null
+++ b/debian/overrides/libpulsedsp
@@ -0,0 +1,3 @@
+libpulsedsp: shlib-without-versioned-soname */libpulsedsp.so libpulsedsp.so
+libpulsedsp: no-shlibs-control-file */libpulsedsp.so
+libpulsedsp: postinst-must-call-ldconfig */libpulsedsp.so
diff --git a/debian/overrides/pulseaudio-utils
b/debian/overrides/pulseaudio-utils
deleted file mode 100644
index bd0596e..0000000
--- a/debian/overrides/pulseaudio-utils
+++ /dev/null
@@ -1,3 +0,0 @@
-pulseaudio-utils: no-shlibs-control-file usr/lib/libpulsedsp.so
-pulseaudio-utils: postinst-must-call-ldconfig usr/lib/libpulsedsp.so
-pulseaudio-utils: package-name-doesnt-match-sonames libpulsedsp
diff --git a/debian/pulseaudio-utils.install b/debian/pulseaudio-utils.install
index 1e33c4f..7139d75 100644
--- a/debian/pulseaudio-utils.install
+++ b/debian/pulseaudio-utils.install
@@ -8,5 +8,3 @@ usr/bin/parecord
usr/bin/padsp
usr/bin/pax11publish
usr/bin/pasuspender
-usr/lib/*/pulseaudio/libpulsedsp.so
-usr/share/lintian/overrides/pulseaudio-utils
commit feedc40c42c024a50df5e8087d9e053870a30e9a
Author: Sjoerd Simons <[email protected]>
Date: Sat Nov 17 14:44:19 2012 +0100
debian/{pulseaudio.install,apport-hook.py}: Install apport hook
diff --git a/debian/apport-hook.py b/debian/apport-hook.py
new file mode 100644
index 0000000..9af35ae
--- /dev/null
+++ b/debian/apport-hook.py
@@ -0,0 +1,15 @@
+'''apport package hook for pulseaudio
+
+(c) 2009 Canonical Ltd.
+Author:
+Matt Zimmerman <[email protected]>
+
+'''
+
+from apport.hookutils import *
+import re
+
+def add_info(report):
+ attach_alsa(report)
+ recent_syslog(re.compile(r'pulseaudio\['))
+ attach_conffiles(report, 'pulseaudio')
diff --git a/debian/changelog b/debian/changelog
index a760c21..3f06532 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,9 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* debian/libpulse-dev.install: Install cmake files
* debian/pulseaudio-module-bluetooth.install: Updated
* debian/pulseaudio.install: Install module-switch-on-port-available
+ * debian/{pulseaudio.install,apport-hook.py}: Install apport hook
- -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 14:30:00 +0100
+ -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 14:43:35 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 6590600..dac03c3 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -41,6 +41,7 @@ usr/lib/pulse-*/modules/module-native-protocol-tcp.so
usr/lib/pulse-*/modules/module-native-protocol-unix.so
usr/lib/pulse-*/modules/module-udev-detect.so
usr/lib/pulse-*/modules/module-loopback.so
+usr/share/apport
usr/share/lintian/overrides/pulseaudio
usr/lib/pulse-*/modules/module-null-sink.so
usr/lib/pulse-*/modules/module-oss.so
diff --git a/debian/rules b/debian/rules
index 448b786..5d8ad77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,8 @@ common-install-arch::
$(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d
cp -a $(CURDIR)/debian/pulse-alsa.conf
$(CURDIR)/debian/tmp/usr/share/alsa
dh_installman -ppulseaudio --language=C
debian/tmp/usr/share/man/man5/default.pa.5
+ install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks
+ cp $(CURDIR)/debian/apport-hook.py
$(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py
common-configure-arch::
commit 32ed077aad463ab4c7474040dea94c33f9f12001
Author: Sjoerd Simons <[email protected]>
Date: Sat Nov 17 14:38:14 2012 +0100
debian/pulseaudio.install: Install module-switch-on-port-available
diff --git a/debian/changelog b/debian/changelog
index 106ac7e..a760c21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
displayed as an option
* debian/libpulse-dev.install: Install cmake files
* debian/pulseaudio-module-bluetooth.install: Updated
+ * debian/pulseaudio.install: Install module-switch-on-port-available
-- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 14:30:00 +0100
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 7485663..6590600 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -72,6 +72,7 @@ usr/lib/pulse-*/modules/module-filter-apply.so
usr/lib/pulse-*/modules/module-filter-heuristics.so
usr/lib/pulse-*/modules/module-null-source.so
usr/lib/pulse-*/modules/module-switch-on-connect.so
+usr/lib/pulse-*/modules/module-switch-on-port-available.so
usr/lib/pulse-*/modules/module-virtual-sink.so
usr/lib/pulse-*/modules/module-virtual-source.so
usr/lib/pulse-*/modules/module-switch-on-port-available.so
commit 22372319a7c1b4897a5757d6a5392bcf877d37fc
Author: Sjoerd Simons <[email protected]>
Date: Sat Nov 17 14:31:08 2012 +0100
debian/pulseaudio-module-bluetooth.install: Updated
diff --git a/debian/changelog b/debian/changelog
index 4c70576..106ac7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,9 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* debian/pulse-alsa.conf: set "show on" such that the default devices is
displayed as an option
* debian/libpulse-dev.install: Install cmake files
+ * debian/pulseaudio-module-bluetooth.install: Updated
- -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 14:28:29 +0100
+ -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 14:30:00 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/pulseaudio-module-bluetooth.install
b/debian/pulseaudio-module-bluetooth.install
index 3914ab0..3f208a3 100644
--- a/debian/pulseaudio-module-bluetooth.install
+++ b/debian/pulseaudio-module-bluetooth.install
@@ -1,7 +1,6 @@
usr/lib/pulse-*/modules/module-bluetooth-proximity.so
usr/lib/pulse-*/modules/module-bluetooth-device.so
usr/lib/pulse-*/modules/module-bluetooth-discover.so
-usr/lib/pulse-*/modules/libbluetooth-ipc.so
-usr/lib/pulse-*/modules/libbluetooth-sbc.so
+usr/lib/pulse-*/modules/module-bluetooth-policy.so
usr/lib/pulse-*/modules/libbluetooth-util.so
usr/lib/pulseaudio/pulse/proximity-helper
commit 79f6b95ec06389584399c10ae2248dddf2137d17
Author: Sjoerd Simons <[email protected]>
Date: Sat Nov 17 14:29:00 2012 +0100
debian/libpulse-dev.install: Install cmake files
diff --git a/debian/changelog b/debian/changelog
index 0a70ad3..4c70576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,9 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* debian/copyright: Updated
* debian/pulse-alsa.conf: set "show on" such that the default devices is
displayed as an option
+ * debian/libpulse-dev.install: Install cmake files
- -- Sjoerd Simons <[email protected]> Fri, 16 Nov 2012 21:55:46 +0100
+ -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 14:28:29 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/libpulse-dev.install b/debian/libpulse-dev.install
index 9ef44cf..a1bcccb 100644
--- a/debian/libpulse-dev.install
+++ b/debian/libpulse-dev.install
@@ -1,3 +1,4 @@
+usr/lib/*/cmake
usr/lib/*/libpulse.so
usr/lib/*/libpulse-simple.so
usr/lib/*/libpulse-mainloop-glib.so
--
pulseaudio packaging
_______________________________________________
pkg-pulseaudio-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
