[pulseaudio] 01/08: Revert "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 master
in repository pulseaudio.

commit cae42b8bb3f5ae377d295387339601b62d36ed52
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Aug 12 21:28:59 2016 -0400

    Revert "Split module-udev-detect into a separate package"
    
    This reverts commit 36a1011cfacedbbb80a637deb4a67853f990be3b.
---
 debian/changelog                       |  7 +++++++
 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, 20 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b664ad4..a8c75a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pulseaudio (9.0-2) UNRELEASED; urgency=medium
+
+  * Merge module-udev-detect back into main package.
+    Closes: #831518, #831355
+
+ -- Felipe Sateler <fsateler at debian.org>  Fri, 12 Aug 2016 21:28:51 -0400
+
 pulseaudio (9.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 32b63b0..0177bb4 100644
--- a/debian/control
+++ b/debian/control
@@ -52,11 +52,12 @@ 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, pulseaudio-module-udev
+Recommends: pulseaudio-module-x11, rtkit
 Suggests: pavumeter, pavucontrol, paman, paprefs
 Description: PulseAudio sound server
  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
@@ -123,21 +124,6 @@ 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
deleted file mode 100644
index 2c1ff6e..0000000
--- a/debian/pulseaudio-module-udev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index cf0f260..0000000
--- a/debian/pulseaudio-module-udev.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /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 52f61ff..48cb26d 100755
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -5,6 +5,7 @@ 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
@@ -40,6 +41,7 @@ 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 7f01bf3..e1f2ac6 100644
--- a/debian/pulseaudio.postinst
+++ b/debian/pulseaudio.postinst
@@ -16,6 +16,14 @@ 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
@@ -27,6 +35,7 @@ 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