r50188 - in /desktop/unstable/gdk-pixbuf/debian: changelog control control.in libgdk-pixbuf2.0-0.docs rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Sep 7 16:00:19 UTC 2016 

Author: biebl
Date: Wed Sep  7 16:00:19 2016
New Revision: 50188

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50188
Log:
Convert from cdbs to dh.

Added:
    desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.docs
Modified:
    desktop/unstable/gdk-pixbuf/debian/changelog
    desktop/unstable/gdk-pixbuf/debian/control
    desktop/unstable/gdk-pixbuf/debian/control.in
    desktop/unstable/gdk-pixbuf/debian/rules

Modified: desktop/unstable/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/changelog?rev=50188&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/changelog	[utf-8] Wed Sep  7 16:00:19 2016
@@ -5,6 +5,7 @@
     dropped.
   * Use dh-exec for substituting multiarch paths in libgdk-pixbuf2.0-0.install
     and libgdk-pixbuf2.0-dev.links.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 03 Sep 2016 20:05:02 +0200
 

Modified: desktop/unstable/gdk-pixbuf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/control?rev=50188&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/control	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/control	[utf-8] Wed Sep  7 16:00:19 2016
@@ -7,8 +7,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.93),
-               debhelper (>= 9.20160114),
+Build-Depends: debhelper (>= 9.20160114),
                dh-autoreconf,
                dh-exec,
                gnome-pkg-tools (>= 0.10),

Modified: desktop/unstable/gdk-pixbuf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/control.in?rev=50188&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/control.in	[utf-8] Wed Sep  7 16:00:19 2016
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.93),
-               debhelper (>= 9.20160114),
+Build-Depends: debhelper (>= 9.20160114),
                dh-autoreconf,
                dh-exec,
                gnome-pkg-tools (>= 0.10),

Added: desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.docs?rev=50188&op=file
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.docs	(added)
+++ desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.docs	[utf-8] Wed Sep  7 16:00:19 2016
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README

Modified: desktop/unstable/gdk-pixbuf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/rules?rev=50188&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/rules	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/rules	[utf-8] Wed Sep  7 16:00:19 2016
@@ -1,24 +1,39 @@
 #!/usr/bin/make -f 
 
-export AUTOPOINT = true
-
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_MAKE_CHECK_TARGET = check VERBOSE=1
-DEB_CONFIGURE_EXTRA_FLAGS := --with-x11 \
-                             --enable-introspection \
-                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+%:
+	dh $@ --with autoreconf,gir,gnome
 
-DEB_DH_MAKESHLIBS_ARGS_libgdk-pixbuf2.0-0 += --add-udeb=libgdk-pixbuf2.0-0-udeb -X "/usr/lib/$(DEB_HOST_MULTIARCH)/gdk-pixbuf-2.0" -V -- -c4
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--with-x11 \
+		--enable-introspection
 
-DEB_DH_STRIP_ARGS = --dbgsym-migration='libgdk-pixbuf2.0-0-dbg (<< 2.34.0-1~)'
+# temporary directory for the minimal MIME cache generation
+mimedir := debian/build-mime
+mimexml := /usr/share/mime/packages/freedesktop.org.xml
 
-common-binary-fixup-arch::
+infiles := \
+	libgdk-pixbuf2.0-0.triggers \
+	libgdk-pixbuf2.0-0.postinst \
+	libgdk-pixbuf2.0-0.postrm
+
+override_dh_install:
+	dh_install
+	# process .in files
+	set -e; for file in $(infiles); do \
+		sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
+			debian/$${file}.in > debian/$$file; \
+	done
+	# generate a minimal MIME cache for the udeb
+	mkdir -p $(mimedir)/packages
+	[ -f $(mimexml) ]
+	xsltproc -nonet debian/keep-png-only.xsl $(mimexml) \
+		> $(mimedir)/packages/png.freedesktop.org.xml
+	update-mime-database $(mimedir)
+	install -m 0644 -D $(mimedir)/mime.cache debian/libgdk-pixbuf2.0-0-udeb/usr/share/mime/mime.cache
+	# generate a loaders cache for the udeb
 	mkdir -p debian/libgdk-pixbuf2.0-0-udeb/usr/lib/$(DEB_HOST_MULTIARCH)/gdk-pixbuf-2.0/2.10.0
 	LD_LIBRARY_PATH=debian/libgdk-pixbuf2.0-0-udeb/usr/lib:$(LD_LIBRARY_PATH) \
 		debian/libgdk-pixbuf2.0-0/usr/lib/$(DEB_HOST_MULTIARCH)/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
@@ -27,22 +42,15 @@
 		> debian/libgdk-pixbuf2.0-0-udeb/usr/lib/$(DEB_HOST_MULTIARCH)/gdk-pixbuf-2.0/2.10.0/loaders.cache
 	chmod 0644 debian/libgdk-pixbuf2.0-0-udeb/usr/lib/$(DEB_HOST_MULTIARCH)/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
-binary-install/libgdk-pixbuf2.0-0::
-	set -e; for file in postinst postrm triggers; do \
-		sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
-		    debian/$(cdbs_curpkg).$$file.in \
-		    > debian/$(cdbs_curpkg).$$file ; \
+override_dh_strip:
+	dh_strip --dbgsym-migration='libgdk-pixbuf2.0-0-dbg (<< 2.34.0-1~)'
+
+override_dh_makeshlibs:
+	dh_makeshlibs --add-udeb=libgdk-pixbuf2.0-0-udeb -X "/usr/lib/$(DEB_HOST_MULTIARCH)/gdk-pixbuf-2.0" -V -- -c4
+
+override_dh_clean:
+	dh_clean
+	set -e; for file in $(infiles); do \
+		rm -f debian/$$file; \
 	done
-
-# temporary directory for the minimal MIME cache generation
-mimedir = debian/build-mime
-mimexml = /usr/share/mime/packages/freedesktop.org.xml
-
-binary-install/libgdk-pixbuf2.0-0-udeb::
-	# generate a minimal MIME cache for the udeb
-	mkdir -p $(mimedir)/packages
-	[ -f $(mimexml) ]
-	xsltproc -nonet debian/keep-png-only.xsl $(mimexml) \
-		> $(mimedir)/packages/png.freedesktop.org.xml
-	update-mime-database $(mimedir)
-	dh_install -plibgdk-pixbuf2.0-0-udeb $(mimedir)/mime.cache usr/share/mime
+	rm -rf $(mimedir)

More information about the pkg-gnome-commits mailing list