This is an automated email from the git hooks/post-receive script. fsateler pushed a commit to branch master in repository pulseaudio.
commit 0f9ef8d4666d1298d3caeda52202d94989250499 Author: Felipe Sateler <[email protected]> Date: Fri Aug 12 21:28:04 2016 -0400 Switch from CDBS to short-form dh --- debian/control | 1 - debian/pulseaudio-module-gconf.install | 2 +- debian/rules | 52 ++++++++++++++++++++-------------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/debian/control b/debian/control index 1dbc9c1..c8fb111 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Sjoerd Simons <[email protected]>, Balint Reczey <[email protected]>, Felipe Sateler <[email protected]> Build-Depends: debhelper (>= 9.20141010), - cdbs (>= 0.4.93), check, dh-autoreconf, dh-exec, diff --git a/debian/pulseaudio-module-gconf.install b/debian/pulseaudio-module-gconf.install index d3f6edf..96bf2b4 100644 --- a/debian/pulseaudio-module-gconf.install +++ b/debian/pulseaudio-module-gconf.install @@ -1,2 +1,2 @@ -usr/lib/pulseaudio/pulse/gconf-helper +usr/lib/*/pulse/gconf-helper usr/lib/pulse-*/modules/module-gconf.so diff --git a/debian/rules b/debian/rules index 4211237..5a0a5df 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,10 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/rules/autoreconf.mk +DPKG_EXPORT_BUILDFLAGS = 1 + +DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed + +include /usr/share/dpkg/default.mk export AUTOPOINT=intltoolize --automake --copy @@ -11,22 +12,11 @@ export AUTOPOINT=intltoolize --automake --copy export XDG_RUNTIME_DIR = $(CURDIR)/debian/tmp/tmp/xdgruntimedir export CK_TIMEOUT_MULTIPLIER = 0 -common-install-arch:: - find $(DEB_DESTDIR) -name "*.la" -delete - mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d - cp -a $(CURDIR)/debian/pulse.conf \ - $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d - cp -a $(CURDIR)/debian/pulse-alsa.conf $(CURDIR)/debian/tmp/usr/share/alsa - install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks - cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py - -common-binary-post-install-arch:: list-missing - # 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 \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ - --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules \ + --with-module-dir=\$${prefix}/lib/pulse-$(DEB_VERSION_UPSTREAM)/modules \ --with-zsh-completion-dir=\$${datadir}/zsh/vendor-completions \ --with-bash-completion-dir=\$${datadir}/bash-completion/completions \ --with-systemduserunitdir=\$${prefix}/lib/systemd/user \ @@ -37,14 +27,32 @@ ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1) DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez5 endif +%: + dh $@ --with autoreconf + + +override_dh_auto_configure: + dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) -DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules \ - --exclude=usr/lib/$(DEB_HOST_MULTIARCH)/pulseaudio +override_dh_auto_install: + dh_auto_install + find debian/tmp -name "*.la" -delete + mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d + cp -a $(CURDIR)/debian/pulse.conf \ + $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d + cp -a $(CURDIR)/debian/pulse-alsa.conf $(CURDIR)/debian/tmp/usr/share/alsa + install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks + cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py -DEB_DH_SHLIBDEPS_ARGS_ALL = -- -Sdebian/pulseaudio +override_dh_makeshlibs: + dh_makeshlibs --exclude=usr/lib/pulse-$(DEB_VERSION_UPSTREAM)/modules \ + --exclude=usr/lib/$(DEB_HOST_MULTIARCH)/pulseaudio -LDFLAGS += -Wl,--no-as-needed +override_dh_shlibdeps: + dh_shlibdeps --libpackage=pulseaudio -DEB_DH_INSTALL_SOURCEDIR = $(CURDIR)/debian/tmp +override_dh_install: + dh_install --list-missing -DEB_MAKE_CHECK_TARGET = check VERBOSE=1 +override_dh_installdocs: + dh_installdocs -A NEWS README -- 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
