r52383 - in /desktop/experimental/clutter-1.0/debian: changelog clutter-1.0-tests.install compat control control.in rules

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Thu May 4 21:29:54 UTC 2017


Author: jbicha-guest
Date: Thu May  4 21:29:53 2017
New Revision: 52383

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

* Bump debhelper compat to 10

Modified:
    desktop/experimental/clutter-1.0/debian/changelog
    desktop/experimental/clutter-1.0/debian/clutter-1.0-tests.install
    desktop/experimental/clutter-1.0/debian/compat
    desktop/experimental/clutter-1.0/debian/control
    desktop/experimental/clutter-1.0/debian/control.in
    desktop/experimental/clutter-1.0/debian/rules

Modified: desktop/experimental/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/changelog?rev=52383&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/changelog	[utf-8] Thu May  4 21:29:53 2017
@@ -1,3 +1,10 @@
+clutter-1.0 (1.26.0+dfsg-4) UNRELEASED; urgency=medium
+
+  * Convert from cdbs to dh
+  * Bump debhelper compat to 10
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Thu, 04 May 2017 17:27:12 -0400
+
 clutter-1.0 (1.26.0+dfsg-3) unstable; urgency=medium
 
   * Remove broken /usr/share/doc/libclutter-1.0-doc/html-cally symlink.

Modified: desktop/experimental/clutter-1.0/debian/clutter-1.0-tests.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/clutter-1.0-tests.install?rev=52383&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/clutter-1.0-tests.install	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/clutter-1.0-tests.install	[utf-8] Thu May  4 21:29:53 2017
@@ -1,2 +1,2 @@
 usr/share/installed-tests
-usr/lib/clutter-1.0/installed-tests
+usr/lib/*/installed-tests/clutter

Modified: desktop/experimental/clutter-1.0/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/compat?rev=52383&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/compat	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/compat	[utf-8] Thu May  4 21:29:53 2017
@@ -1 +1 @@
-9
+10

Modified: desktop/experimental/clutter-1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/control?rev=52383&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/control	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/control	[utf-8] Thu May  4 21:29:53 2017
@@ -7,9 +7,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
-Build-Depends: debhelper (>= 9),
-               cdbs (>= 0.4.93~),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 10),
                autopoint,
                gnome-pkg-tools,
                libgl1-mesa-dev (>= 7.1~rc3-1~),

Modified: desktop/experimental/clutter-1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/control.in?rev=52383&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/control.in	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/control.in	[utf-8] Thu May  4 21:29:53 2017
@@ -3,9 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@, Rico Tzschichholz <ricotz at ubuntu.com>
-Build-Depends: debhelper (>= 9),
-               cdbs (>= 0.4.93~),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 10),
                autopoint,
                gnome-pkg-tools,
                libgl1-mesa-dev (>= 7.1~rc3-1~),
@@ -22,7 +20,9 @@
                libxcomposite-dev (>= 1:0.4),
                libxi-dev,
                gtk-doc-tools (>= 1.20),
+               xauth <!nocheck>,
                xsltproc,
+               xvfb <!nocheck>,
                libgirepository1.0-dev (>= 1.35.8),
                gobject-introspection (>= 1.39.0),
                libatk1.0-dev (>= 2.5.3),

Modified: desktop/experimental/clutter-1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/rules?rev=52383&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/rules	[utf-8] Thu May  4 21:29:53 2017
@@ -1,36 +1,51 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/autoreconf.mk
-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/gnome-pkg-tools/1/rules/gnome-get-source.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE = clutter
 
-LDFLAGS += -Wl,-O1 -Wl,--as-needed
-DEB_COMPRESS_EXCLUDE += .c
-DEB_DH_MAKESHLIBS_ARGS_libclutter-1.0-0 += -V -- -c4
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-	--enable-x11-backend=yes \
-	--enable-gdk-backend=yes \
-	--enable-egl-backend=yes \
-	--enable-gtk-doc \
-	--disable-docs \
-	--enable-installed-tests \
-	--enable-introspection=yes
-DEB_DBG_PACKAGE_libclutter-1.0-0 := libclutter-1.0-dbg
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-	DEB_CONFIGURE_EXTRA_FLAGS += \
+	CONFFLAGS += \
 		--enable-wayland-backend=yes \
 		--enable-wayland-compositor=yes \
 		--enable-evdev-input=yes
 endif
 
-common-binary-predeb-arch:: list-missing
+%:
+	dh $@ --with gir,gnome
+
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-x11-backend=yes \
+		--enable-gdk-backend=yes \
+		--enable-egl-backend=yes \
+		--enable-gtk-doc \
+		--disable-docs \
+		--enable-installed-tests \
+		--enable-introspection=yes \
+		$(CONFFLAGS)
+
+override_dh_install:
+	find debian -name '*.la' -delete
+	dh_install --fail-missing
+
+override_dh_compress:
+	dh_compress -X.c
+
+override_dh_gnome:
+	dh_gnome --no-gnome-versions
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V -- -c4
+
+override_dh_auto_test:
+	-xvfb-run dh_auto_test
 
 get-orig-source get-packaged-orig-source:
 	uscan --verbose --force-download \




More information about the pkg-gnome-commits mailing list