r54601 - in /packages/unstable/libcanberra/debian: changelog control control.in rules
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Sun Oct 29 20:42:00 UTC 2017
Author: smcv
Date: Sun Oct 29 20:41:59 2017
New Revision: 54601
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54601
Log:
Switch from cdbs to dh
Modified:
packages/unstable/libcanberra/debian/changelog
packages/unstable/libcanberra/debian/control
packages/unstable/libcanberra/debian/control.in
packages/unstable/libcanberra/debian/rules
Modified: packages/unstable/libcanberra/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/changelog?rev=54601&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/changelog [utf-8] (original)
+++ packages/unstable/libcanberra/debian/changelog [utf-8] Sun Oct 29 20:41:59 2017
@@ -7,6 +7,7 @@
[ Simon McVittie ]
* Run gtkdocize to update build system (Closes: #876596)
* Set Rules-Requires-Root: no
+ * Switch from cdbs to dh
-- Simon McVittie <smcv at debian.org> Thu, 12 Oct 2017 01:04:41 +0100
Modified: packages/unstable/libcanberra/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/control?rev=54601&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/control [utf-8] (original)
+++ packages/unstable/libcanberra/debian/control [utf-8] Sun Oct 29 20:41:59 2017
@@ -8,7 +8,6 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 9.20160114~),
- cdbs (>= 0.4.93~),
dh-autoreconf,
gnome-pkg-tools,
m4,
@@ -26,6 +25,7 @@
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libcanberra/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libcanberra/
Homepage: http://0pointer.de/lennart/projects/libcanberra/
+Rules-Requires-Root: no
Package: libcanberra0
Architecture: any
Modified: packages/unstable/libcanberra/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/control.in?rev=54601&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/control.in [utf-8] (original)
+++ packages/unstable/libcanberra/debian/control.in [utf-8] Sun Oct 29 20:41:59 2017
@@ -4,7 +4,6 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 9.20160114~),
- cdbs (>= 0.4.93~),
dh-autoreconf,
gnome-pkg-tools,
m4,
Modified: packages/unstable/libcanberra/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcanberra/debian/rules?rev=54601&op=diff
==============================================================================
--- packages/unstable/libcanberra/debian/rules [utf-8] (original)
+++ packages/unstable/libcanberra/debian/rules [utf-8] Sun Oct 29 20:41:59 2017
@@ -1,30 +1,21 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-
-DEB_DH_AUTORECONF_ARGS = --as-needed
# Ensure at build time that the library has no dependencies on undefined
# symbols, and speed up loading.
DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
include /usr/share/dpkg/default.mk
+%:
+ dh $@ --with autoreconf,gnome
+
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-common-install-arch::
- find $(DEB_DESTDIR) -name "*.la" | xargs rm -f
-
-common-binary-post-install-arch:: list-missing
ifneq ($(DEB_HOST_ARCH_OS), hurd)
ENABLE_TDB=--enable-tdb
endif
-DEB_DH_AUTORECONF_ARGS = debian/autogen.sh
+override_dh_autoreconf:
+ dh_autoreconf debian/autogen.sh
DEB_CONFIGURE_EXTRA_FLAGS = \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
@@ -42,21 +33,31 @@
DEB_CONFIGURE_EXTRA_FLAGS += --disable-alsa --enable-oss
endif
+override_dh_auto_configure:
+ dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
+
DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0/modules
DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/$(DEB_HOST_MULTIARCH)/gtk-3.0/modules
DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/$(DEB_HOST_MULTIARCH)/libcanberra-0.30
-DEB_DH_MAKESHLIBS_ARGS_libcanberra0 += -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk0 += -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcanberra-gtk3-0 += -- -c4
-DEB_DH_STRIP_ARGS_libcanberra0 = --dbgsym-migration='libcanberra0-dbg (<< 0.30-3~)'
-DEB_DH_STRIP_ARGS_libcanberra-pulse = --dbgsym-migration='libcanberra-pulse-dbg (<< 0.30-3~)'
-DEB_DH_STRIP_ARGS_libcanberra-gstreamer = --dbgsym-migration='libcanberra-gstreamer-dbg (<< 0.30-3~)'
-DEB_DH_STRIP_ARGS_libcanberra-gtk0 = --dbgsym-migration='libcanberra-gtk0-dbg (<< 0.30-3~)'
-DEB_DH_STRIP_ARGS_libcanberra-gtk-module = --dbgsym-migration='libcanberra-gtk-module-dbg (<< 0.30-3~)'
-DEB_DH_STRIP_ARGS_libcanberra-gtk3-0 = --dbgsym-migration='libcanberra-gtk3-0-dbg (<< 0.30-3~)'
-DEB_DH_STRIP_ARGS_libcanberra-gtk3-module = --dbgsym-migration='libcanberra-gtk3-module-dbg (<< 0.30-3~)'
+override_dh_makeshlibs:
+ dh_makeshlibs -plibcanberra0 $(DEB_DH_MAKESHLIBS_ARGS_ALL) -- -c4
+ dh_makeshlibs -plibcanberra-gtk0 $(DEB_DH_MAKESHLIBS_ARGS_ALL) -- -c4
+ dh_makeshlibs -plibcanberra-gtk3-0 $(DEB_DH_MAKESHLIBS_ARGS_ALL) -- -c4
+ dh_makeshlibs --remaining-packages $(DEB_DH_MAKESHLIBS_ARGS_ALL)
-install/libcanberra-gtk3-module::
+override_dh_strip:
+ dh_strip -plibcanberra0 --dbgsym-migration='libcanberra0-dbg (<< 0.30-3~)'
+ dh_strip -plibcanberra-pulse --dbgsym-migration='libcanberra-pulse-dbg (<< 0.30-3~)'
+ dh_strip -plibcanberra-gstreamer --dbgsym-migration='libcanberra-gstreamer-dbg (<< 0.30-3~)'
+ dh_strip -plibcanberra-gtk0 --dbgsym-migration='libcanberra-gtk0-dbg (<< 0.30-3~)'
+ dh_strip -plibcanberra-gtk-module --dbgsym-migration='libcanberra-gtk-module-dbg (<< 0.30-3~)'
+ dh_strip -plibcanberra-gtk3-0 --dbgsym-migration='libcanberra-gtk3-0-dbg (<< 0.30-3~)'
+ dh_strip -plibcanberra-gtk3-module --dbgsym-migration='libcanberra-gtk3-module-dbg (<< 0.30-3~)'
+ dh_strip --remaining-packages
+
+override_dh_auto_install:
+ dh_auto_install
cp -a src/canberra-gtk-module.desktop \
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk3-module.desktop
+ find debian/tmp -name "*.la" | xargs rm -f
More information about the pkg-gnome-commits
mailing list