[pulseaudio] 01/02: Split module-udev-detect into a separate package

[Felipe Sateler]

This is an automated email from the git hooks/post-receive script.

fsateler pushed a commit to branch debian/experimental
in repository pulseaudio.

commit 36a1011cfacedbbb80a637deb4a67853f990be3b
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Apr 21 23:31:33 2016 -0300

    Split module-udev-detect into a separate package
    
    This allows smaller install size in containers, where udev is not used
---
 debian/changelog                       |  6 ++++++
 debian/control                         | 18 ++++++++++++++++--
 debian/pulseaudio-module-udev.install  |  2 ++
 debian/pulseaudio-module-udev.postinst | 33 +++++++++++++++++++++++++++++++++
 debian/pulseaudio.install              |  2 --
 debian/pulseaudio.postinst             |  9 ---------
 6 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 592a10e..a8e87d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pulseaudio (8.0-3) UNRELEASED; urgency=medium
+
+  * Split module-udev-detect into a separate package
+
+ -- Felipe Sateler <fsateler at debian.org>  Mon, 18 Apr 2016 20:11:27 -0300
+
 pulseaudio (8.0-2) unstable; urgency=medium
 
   * Add patch from upstream to switch back to HDMI when port is back.
diff --git a/debian/control b/debian/control
index 7a54513..87f7880 100644
--- a/debian/control
+++ b/debian/control
@@ -52,12 +52,11 @@ Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
   lsb-base (>= 3.2-13),
-  udev (>= 143) [linux-any],
   libasound2-plugins [linux-any],
   libpulse0 (= ${binary:Version}),
   pulseaudio-utils
 Breaks: libltdl3 (<< 1.5.24-1), avahi-daemon (<< 0.6.31-3)
-Recommends: pulseaudio-module-x11, rtkit
+Recommends: pulseaudio-module-x11, rtkit, pulseaudio-module-udev
 Suggests: pavumeter, pavucontrol, paman, paprefs
 Description: PulseAudio sound server
  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
@@ -124,6 +123,21 @@ Description: PulseAudio ESD compatibility layer
  many useful applications. It enables a PulseAudio sound server to
  fully replace ESD.
 
+Package: pulseaudio-module-udev
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>= 143)
+Breaks: pulseaudio (<< 8.0-3)
+Replaces: pulseaudio (<< 8.0-3)
+Description: Udev module for 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
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This module enables PulseAudio to discover available sinks and sources via
+ udev.
+ .
+ The module is called module-udev-detect.
+
 Package: pulseaudio-module-zeroconf
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, avahi-daemon
diff --git a/debian/pulseaudio-module-udev.install b/debian/pulseaudio-module-udev.install
new file mode 100644
index 0000000..2c1ff6e
--- /dev/null
+++ b/debian/pulseaudio-module-udev.install
@@ -0,0 +1,2 @@
+lib/udev/rules.d/90-pulseaudio.rules
+usr/lib/pulse-*/modules/module-udev-detect.so
diff --git a/debian/pulseaudio-module-udev.postinst b/debian/pulseaudio-module-udev.postinst
new file mode 100644
index 0000000..cf0f260
--- /dev/null
+++ b/debian/pulseaudio-module-udev.postinst
@@ -0,0 +1,33 @@
+#! /bin/sh
+# postinst script for pulseaudio
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+trigger_udev() {
+	if ! which udevadm >/dev/null 2>&1 ; then
+		return 0;
+	fi
+	udevadm control --reload-rules || true
+	udevadm trigger --subsystem-match=sound --action=change || true
+}
+
+case "$1" in
+  configure)
+    trigger_udev
+  ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 48cb26d..52f61ff 100755
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -5,7 +5,6 @@ etc/pulse/system.pa
 etc/pulse/daemon.conf
 etc/dbus-1/system.d/pulseaudio-system.conf
 etc/xdg/autostart/pulseaudio.desktop
-[linux-any] lib/udev/rules.d/90-pulseaudio.rules
 usr/bin/pulseaudio
 usr/bin/start-pulseaudio-x11
 usr/lib/*/pulseaudio/libpulsecore-*.so
@@ -41,7 +40,6 @@ usr/lib/pulse-*/modules/module-match.so
 usr/lib/pulse-*/modules/module-native-protocol-fd.so
 usr/lib/pulse-*/modules/module-native-protocol-tcp.so
 usr/lib/pulse-*/modules/module-native-protocol-unix.so
-[linux-any] usr/lib/pulse-*/modules/module-udev-detect.so
 usr/lib/pulse-*/modules/module-loopback.so
 usr/lib/pulse-*/modules/module-null-sink.so
 usr/lib/pulse-*/modules/module-oss.so
diff --git a/debian/pulseaudio.postinst b/debian/pulseaudio.postinst
index e1f2ac6..7f01bf3 100644
--- a/debian/pulseaudio.postinst
+++ b/debian/pulseaudio.postinst
@@ -16,14 +16,6 @@ set -e
 
 PULSEAUDIO=/usr/bin/pulseaudio
 
-trigger_udev() {
-	if ! which udevadm >/dev/null 2>&1 ; then
-		return 0;
-	fi
-	udevadm control --reload-rules || true
-	udevadm trigger --subsystem-match=sound --action=change || true
-}
-
 case "$1" in
   configure)
     if ! getent passwd pulse >/dev/null; then
@@ -35,7 +27,6 @@ case "$1" in
     if ! getent group pulse-access >/dev/null; then
       addgroup --quiet --system pulse-access
     fi
-    trigger_udev
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git