This is an automated email from the git hooks/post-receive script. fsateler pushed a commit to branch master in repository pulseaudio.
commit a3cc14ff4600297a1a242e14b105ffc34c6bc8a1 Author: Felipe Sateler <[email protected]> Date: Thu Jun 11 00:25:28 2015 -0300 Use dh-exec instead of manual .install mangling --- debian/control | 1 + debian/pulseaudio.install | 20 +++++++++++--------- debian/rules | 13 ------------- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/debian/control b/debian/control index 327ee1f..f53c5b0 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9), cdbs (>= 0.4.93), check, dh-autoreconf, + dh-exec, intltool, libasound2-dev (>= 1.0.24) [linux-any], libasyncns-dev, diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install old mode 100644 new mode 100755 index 7c9e2d2..2690cf8 --- a/debian/pulseaudio.install +++ b/debian/pulseaudio.install @@ -1,13 +1,15 @@ +#!/usr/bin/dh-exec + etc/bash_completion.d/* etc/pulse/default.pa etc/pulse/system.pa etc/pulse/daemon.conf etc/dbus-1/system.d/pulseaudio-system.conf etc/xdg/autostart/pulseaudio.desktop -lib/udev/rules.d/90-pulseaudio.rules +[linux-any] lib/udev/rules.d/90-pulseaudio.rules usr/bin/pulseaudio usr/bin/start-pulseaudio-x11 -usr/lib/pulse-*/modules/libalsa-util.so +[linux-any] usr/lib/pulse-*/modules/libalsa-util.so usr/lib/pulse-*/modules/libcli.so usr/lib/pulse-*/modules/libprotocol-cli.so usr/lib/pulse-*/modules/libprotocol-http.so @@ -15,8 +17,8 @@ usr/lib/pulse-*/modules/libprotocol-native.so usr/lib/pulse-*/modules/libprotocol-simple.so usr/lib/pulse-*/modules/librtp.so usr/lib/pulse-*/modules/libwebrtc-util.so -usr/lib/pulse-*/modules/module-alsa-sink.so -usr/lib/pulse-*/modules/module-alsa-source.so +[linux-any] usr/lib/pulse-*/modules/module-alsa-sink.so +[linux-any] usr/lib/pulse-*/modules/module-alsa-source.so usr/lib/pulse-*/modules/module-always-sink.so usr/lib/pulse-*/modules/module-console-kit.so usr/lib/pulse-*/modules/module-device-restore.so @@ -35,7 +37,7 @@ usr/lib/pulse-*/modules/module-http-protocol-unix.so usr/lib/pulse-*/modules/module-intended-roles.so usr/lib/pulse-*/modules/module-ladspa-sink.so usr/lib/pulse-*/modules/module-match.so -usr/lib/pulse-*/modules/module-mmkbd-evdev.so +[linux-any] usr/lib/pulse-*/modules/module-mmkbd-evdev.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 @@ -57,7 +59,7 @@ usr/lib/pulse-*/modules/module-sine.so usr/lib/pulse-*/modules/module-tunnel-*.so usr/lib/pulse-*/modules/module-suspend-on-idle.so usr/lib/pulse-*/modules/module-volume-restore.so -usr/lib/pulse-*/modules/module-alsa-card.so +[linux-any] usr/lib/pulse-*/modules/module-alsa-card.so usr/lib/pulse-*/modules/module-augment-properties.so usr/lib/pulse-*/modules/module-card-restore.so usr/lib/pulse-*/modules/module-role-cork.so @@ -76,10 +78,10 @@ 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-systemd-login.so +[linux-any] usr/lib/pulse-*/modules/module-systemd-login.so usr/share/locale -usr/share/pulseaudio/alsa-mixer +[linux-any] usr/share/pulseaudio/alsa-mixer usr/lib/*/libpulsecore-*.so usr/lib -usr/share/alsa +[linux-any] usr/share/alsa usr/share/apport usr/share/zsh diff --git a/debian/rules b/debian/rules index 9be766f..cc7a51c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,14 +18,6 @@ ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1) DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez endif -common-build-arch:: - grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \ - debian/pulseaudio.install > debian/pulseaudio.install.kfreebsd-i386 - grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \ - debian/pulseaudio.install > debian/pulseaudio.install.kfreebsd-amd64 - grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \ - debian/pulseaudio.install > debian/pulseaudio.install.hurd-i386 - common-install-arch:: find $(DEB_DESTDIR) -name "*.la" -delete mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d @@ -38,11 +30,6 @@ common-install-arch:: common-binary-post-install-arch:: list-missing -clean:: - rm -f debian/pulseaudio.install.kfreebsd-i386 - rm -f debian/pulseaudio.install.kfreebsd-amd64 - rm -f debian/pulseaudio.install.hurd-i386 - # Libs should be in the multi-arch path, but the modules should be in the # normal directory as pulseaudio is foreign DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 --disable-hal-compat \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git _______________________________________________ pkg-pulseaudio-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
