r51037 - in /desktop/unstable/gobject-introspection/debian: changelog control control.in gobject-introspection.docs rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Sep 21 17:06:41 UTC 2016


Author: biebl
Date: Wed Sep 21 17:06:41 2016
New Revision: 51037

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

Modified:
    desktop/unstable/gobject-introspection/debian/changelog
    desktop/unstable/gobject-introspection/debian/control
    desktop/unstable/gobject-introspection/debian/control.in
    desktop/unstable/gobject-introspection/debian/gobject-introspection.docs
    desktop/unstable/gobject-introspection/debian/rules

Modified: desktop/unstable/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/changelog?rev=51037&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/changelog	[utf-8] Wed Sep 21 17:06:41 2016
@@ -6,6 +6,7 @@
   [ Michael Biebl ]
   * New upstream release.
   * Bump libglib2.0-dev to (>= 2.50.0) as per configure.ac changes.
+  * Convert from cdbs to dh.
 
  -- Andreas Henriksson <andreas at fatal.se>  Tue, 13 Sep 2016 15:18:15 +0200
 

Modified: desktop/unstable/gobject-introspection/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/control?rev=51037&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/control	[utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/control	[utf-8] Wed Sep 21 17:06:41 2016
@@ -8,7 +8,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 8),
-               cdbs (>= 0.4.90~),
                dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
                python3-dev,

Modified: desktop/unstable/gobject-introspection/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/control.in?rev=51037&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/control.in	[utf-8] Wed Sep 21 17:06:41 2016
@@ -4,7 +4,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 8),
-               cdbs (>= 0.4.90~),
                dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
                python3-dev,

Modified: desktop/unstable/gobject-introspection/debian/gobject-introspection.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/gobject-introspection.docs?rev=51037&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/gobject-introspection.docs	[utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/gobject-introspection.docs	[utf-8] Wed Sep 21 17:06:41 2016
@@ -1 +1,4 @@
+AUTHORS
+NEWS
+README
 debian/policy.txt

Modified: desktop/unstable/gobject-introspection/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/rules?rev=51037&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/rules	[utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/rules	[utf-8] Wed Sep 21 17:06:41 2016
@@ -1,42 +1,38 @@
 #!/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/autoreconf.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) 
+MANPAGES := debian/dh_girepository.1
+$(MANPAGES): debian/dh_girepository
+	pod2man -c "gobject-introspection" -r "$(DEB_VERSION)" $< $@
 
-common-binary-post-install-arch:: list-missing
-list-missing: remove-unwanted-files
-remove-unwanted-files:
+%:
+	dh $@ --with autoreconf,gnome,python3
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+		--enable-gtk-doc \
+		--enable-doctool \
+		--with-python=python3
+
+override_dh_auto_build: $(MANPAGES)
+	dh_auto_build
+
+override_dh_shlibdeps:
+	dh_shlibdeps
+	sh debian/dh_girepository -pgir1.2-glib-2.0
+	sh debian/dh_girepository -pgir1.2-freedesktop
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V -- -c4
+
+override_dh_install:
 	find debian/tmp -name '*.la' -delete
 	find debian/tmp -name '*.pyc' -delete
 	find debian/tmp -name '*.pyo' -delete
+	dh_install --list-missing
 
-DEB_MAKE_ENVVARS += HOME=$(CURDIR)
-DEB_MAKE_CHECK_TARGET = check
-# To get how the tests failed in case of failures
-export VERBOSE=1
-
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --enable-doctool --with-python=python3
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
-
-binary-install/gobject-introspection::
-	dh_python3 -p$(cdbs_curpkg)
-
-build/gobject-introspection:: debian/dh_girepository.1
-debian/dh_girepository.1:: debian/dh_girepository
-	pod2man -c "gobject-introspection" -r "$(DEB_VERSION)" $< $@
-
-$(patsubst %,binary-predeb/%,$(DEB_ARCH_PACKAGES)) ::
-	debian/gobject-introspection/usr/bin/dh_girepository -p$(cdbs_curpkg)
-
-clean::
-	rm -rf $(CURDIR)/.cache
-	rm -f debian/dh_girepository.1
-	find . -name '*.pyc' -delete
-	# generated file not removed by make clean
-	rm -f giscanner/scannerlexer.c
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(MANPAGES)




More information about the pkg-gnome-commits mailing list