This is an automated email from the git hooks/post-receive script. themuso-guest pushed a commit to branch ubuntu in repository pulseaudio.
commit 2e57170667c5ffcb0133aaf9e0c2f1c9cb4e1474 Author: Luke Yelavich <[email protected]> Date: Mon Sep 21 11:45:41 2015 +1000 Whoops, forgot to merge rules properly --- debian/rules | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/debian/rules b/debian/rules index 20b1b84..a088780 100755 --- a/debian/rules +++ b/debian/rules @@ -18,18 +18,6 @@ ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1) DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez endif -<<<<<<< HEAD -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 - dh_translations - -======= ->>>>>>> origin/master common-install-arch:: find $(DEB_DESTDIR) -name "*.la" -delete mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d @@ -41,17 +29,6 @@ common-install-arch:: common-binary-post-install-arch:: list-missing -<<<<<<< HEAD -clean:: - rm -f debian/pulseaudio.install.kfreebsd-i386 - rm -f debian/pulseaudio.install.kfreebsd-amd64 - rm -f debian/pulseaudio.install.hurd-i386 - if test -f $(CURDIR)/debian/daemon.conf.in; then \ - mv $(CURDIR)/debian/daemon.conf.in $(CURDIR)/src/daemon/daemon.conf.in; \ - fi - -======= ->>>>>>> origin/master # 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
