pulseaudio: fixed dependencies, updated man path, updated footprint, keep startup script

2 files changed, 24 insertions, 34 deletions

diff --git a/pulseaudio/.footprint b/pulseaudio/.footprint
index 7fa5587fd..b0f213cf2 100644
--- a/pulseaudio/.footprint
+++ b/pulseaudio/.footprint
@@ -21,6 +21,7 @@ lrwxrwxrwx	root/root	usr/bin/parecord -> pacat
 -rwxr-xr-x	root/root	usr/bin/pasuspender
 -rwxr-xr-x	root/root	usr/bin/pulseaudio
 -rwxr-xr-x	root/root	usr/bin/qpaeq
+-rwxr-xr-x	root/root	usr/bin/start-pulseaudio-x11
 drwxr-xr-x	root/root	usr/etc/
 drwxr-xr-x	root/root	usr/etc/dbus-1/
 drwxr-xr-x	root/root	usr/etc/dbus-1/system.d/
@@ -84,9 +85,6 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 drwxr-xr-x	root/root	usr/lib/pulse-5.0/
 drwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/libalsa-util.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/libavahi-wrap.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/libbluez4-util.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/libbluez5-util.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/libcli.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/libprotocol-cli.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/libprotocol-http.so
@@ -99,12 +97,6 @@ drwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-alsa-source.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-always-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-augment-properties.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-bluetooth-discover.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-bluetooth-policy.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-bluez4-device.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-bluez4-discover.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-bluez5-device.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-bluez5-discover.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-card-restore.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-cli-protocol-tcp.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-cli-protocol-unix.so
@@ -137,7 +129,6 @@ drwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-pipe-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-pipe-source.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-position-event-sounds.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-raop-discover.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-raop-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-remap-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-remap-source.so
@@ -164,29 +155,27 @@ drwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-virtual-source.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-virtual-surround-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-volume-restore.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-zeroconf-discover.so
--rwxr-xr-x	root/root	usr/lib/pulse-5.0/modules/module-zeroconf-publish.so
 drwxr-xr-x	root/root	usr/lib/pulseaudio/
 -rwxr-xr-x	root/root	usr/lib/pulseaudio/libpulsecommon-5.0.la
 -rwxr-xr-x	root/root	usr/lib/pulseaudio/libpulsecommon-5.0.so
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/esdcompat.1.gz
--rw-r--r--	root/root	usr/man/man1/pacat.1.gz
--rw-r--r--	root/root	usr/man/man1/pacmd.1.gz
--rw-r--r--	root/root	usr/man/man1/pactl.1.gz
--rw-r--r--	root/root	usr/man/man1/padsp.1.gz
--rw-r--r--	root/root	usr/man/man1/paplay.1.gz
--rw-r--r--	root/root	usr/man/man1/pasuspender.1.gz
--rw-r--r--	root/root	usr/man/man1/pax11publish.1.gz
--rw-r--r--	root/root	usr/man/man1/pulseaudio.1.gz
--rw-r--r--	root/root	usr/man/man1/start-pulseaudio-kde.1.gz
-drwxr-xr-x	root/root	usr/man/man5/
--rw-r--r--	root/root	usr/man/man5/default.pa.5.gz
--rw-r--r--	root/root	usr/man/man5/pulse-cli-syntax.5.gz
--rw-r--r--	root/root	usr/man/man5/pulse-client.conf.5.gz
--rw-r--r--	root/root	usr/man/man5/pulse-daemon.conf.5.gz
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/esdcompat.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pacat.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pacmd.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pactl.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/padsp.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/paplay.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pasuspender.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pax11publish.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pulseaudio.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/start-pulseaudio-x11.1.gz
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/default.pa.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/pulse-cli-syntax.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/pulse-client.conf.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/pulse-daemon.conf.5.gz
 drwxr-xr-x	root/root	usr/share/pulseaudio/
 drwxr-xr-x	root/root	usr/share/pulseaudio/alsa-mixer/
 drwxr-xr-x	root/root	usr/share/pulseaudio/alsa-mixer/paths/
diff --git a/pulseaudio/Pkgfile b/pulseaudio/Pkgfile
index e3dd8bc1a..4290ff820 100644
--- a/pulseaudio/Pkgfile
+++ b/pulseaudio/Pkgfile
@@ -1,12 +1,12 @@
 # Description:	PulseAudio is a cross-platform, networked sound server
 # URL:		http://pulseaudio.org/
 # Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on:	libsndfile speex json-c orc tdb dbus
-# Optional:	libsamplerate bluez openssl sbc lirc pyqt4
+# Depends on:	libsndfile speex json-c orc tdb dbus intltool
+# Optional:	libsamplerate bluez sbc lirc pyqt4
 
 name=pulseaudio
 version=5.0
-release=2
+release=3
 source=(http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$version.tar.xz)
 
 build() {
@@ -15,7 +15,6 @@ build() {
 		--prefix=/usr \
 		--libexecdir=/usr/lib/pulseaudio/libexec \
 		--sysconfdir=/etc \
-		--mandir=/usr/man \
 		--localstatedir=/var \
 		--disable-nls \
 		--disable-rpath \
@@ -43,7 +42,9 @@ build() {
 	mv $PKG/etc/dbus-1 $PKG/usr/etc
 
 	rm -rf $PKG/etc/bash_completion.d
-	rm -f $PKG/usr/man/man1/start-pulseaudio-x11.1
+	rm -f $PKG/usr/share/man/man1/start-pulseaudio-kde.1
+
+	install -D -m755 src/start-pulseaudio-x11 $PKG/usr/bin/start-pulseaudio-x11
 
 	# If proximity helper was installed, remove setuid bit
 	# To use capabilities instead of the setuid bit, run: