[pulseaudio] 04/08: Merge pulseaudio-module-x11 back into main package. Split is not very useful, as main pulseaudio package already depends on X libs. Therefore, only 56Kb are added to the main package. Closes: #833011

[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 0f72f7e0638d3e16557142129812b253eccd2bc7
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Aug 12 21:59:34 2016 -0400

    Merge pulseaudio-module-x11 back into main package. Split is not very useful, as main pulseaudio package already depends on X libs. Therefore, only 56Kb are added to the main package. Closes: #833011
---
 debian/changelog                     |  7 ++++++-
 debian/control                       | 20 +++-----------------
 debian/pulseaudio-module-x11.install |  1 -
 debian/pulseaudio.install            |  1 +
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39821d5..928ab8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,13 @@ pulseaudio (9.0-2) UNRELEASED; urgency=medium
   * Demote udev Depends to Suggests.
     Turns out libudev does not error out when udev is not available,
     instead it just does nothing.
+  * Merge pulseaudio-module-x11 back into main package.
+    Split is not very useful, as main pulseaudio package
+    already depends on X libs. Therefore, only 56Kb are added
+    to the main package.
+    Closes: #833011
 
- -- Felipe Sateler <fsateler at debian.org>  Fri, 12 Aug 2016 21:28:51 -0400
+ -- Felipe Sateler <fsateler at debian.org>  Fri, 12 Aug 2016 21:57:56 -0400
 
 pulseaudio (9.0-1.1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index a782b11..e01a973 100644
--- a/debian/control
+++ b/debian/control
@@ -55,9 +55,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
   libasound2-plugins [linux-any],
   libpulse0 (= ${binary:Version}),
   pulseaudio-utils
-Breaks: pulseaudio-module-udev (<< 9.0-2), libltdl3 (<< 1.5.24-1), avahi-daemon (<< 0.6.31-3)
-Replaces: pulseaudio-module-udev (<< 9.0-2)
-Recommends: pulseaudio-module-x11, rtkit
+Breaks: pulseaudio-module-udev (<< 9.0-2), pulseaudio-module-x11 (<< 9.0-2), libltdl3 (<< 1.5.24-1), avahi-daemon (<< 0.6.31-3)
+Replaces: pulseaudio-module-udev (<< 9.0-2), pulseaudio-module-x11 (<< 9.0-2)
+Recommends: rtkit
 Suggests: udev [linux-any], pavumeter, pavucontrol, paman, paprefs
 Description: PulseAudio sound server
  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
@@ -201,20 +201,6 @@ Description: Bluetooth module for PulseAudio sound server
  .
  The module is called module-bluetooth
 
-Package: pulseaudio-module-x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio-utils
-Description: X11 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 publish itself as the default sound
- server to the X11 root window automatically upon startup. There is also a
- module to playback a sound file in place of the X11 bell beep.
- .
- The modules are called module-x11-publish and module-x11-bell.
-
 Package: libpulse0
 Section: libs
 Architecture: any
diff --git a/debian/pulseaudio-module-x11.install b/debian/pulseaudio-module-x11.install
deleted file mode 100644
index 2d721b1..0000000
--- a/debian/pulseaudio-module-x11.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/pulse-*/modules/module-x11*.so
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 48cb26d..6fa9b4d 100755
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -78,6 +78,7 @@ 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
 usr/lib/pulse-*/modules/module-virtual-surround-sink.so
+usr/lib/pulse-*/modules/module-x11*.so
 [linux-any] usr/lib/pulse-*/modules/module-systemd-login.so
 [linux-any] usr/lib/systemd/user/pulseaudio.*
 usr/share/bash-completion/completions/*

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