r49202 - in /desktop/unstable/mutter/debian: changelog control control.in mutter.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jun 30 17:58:28 2016
New Revision: 49202

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

Modified:
    desktop/unstable/mutter/debian/changelog
    desktop/unstable/mutter/debian/control
    desktop/unstable/mutter/debian/control.in
    desktop/unstable/mutter/debian/mutter.install
    desktop/unstable/mutter/debian/rules

Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=49202&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog	[utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog	[utf-8] Thu Jun 30 17:58:28 2016
@@ -3,6 +3,7 @@
   * New upstream release.
   * Drop all patches which are now applied upstream.
   * Convert to multiarch.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 30 Jun 2016 00:36:26 +0200
 

Modified: desktop/unstable/mutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/control?rev=49202&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/control	[utf-8] (original)
+++ desktop/unstable/mutter/debian/control	[utf-8] Thu Jun 30 17:58:28 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>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.90),
-               debhelper (>= 9.20160114),
+Build-Depends: debhelper (>= 9.20160114),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                intltool (>= 0.41),

Modified: desktop/unstable/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/control.in?rev=49202&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/control.in	[utf-8] (original)
+++ desktop/unstable/mutter/debian/control.in	[utf-8] Thu Jun 30 17:58:28 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.90),
-               debhelper (>= 9.20160114),
+Build-Depends: debhelper (>= 9.20160114),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                intltool (>= 0.41),

Modified: desktop/unstable/mutter/debian/mutter.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/mutter.install?rev=49202&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/mutter.install	[utf-8] (original)
+++ desktop/unstable/mutter/debian/mutter.install	[utf-8] Thu Jun 30 17:58:28 2016
@@ -1,4 +1,4 @@
 usr/bin
-usr/lib/mutter/mutter-restart-helper
+usr/lib/*/mutter/mutter-restart-helper
 usr/lib/*/mutter/plugins
 usr/share/applications

Modified: desktop/unstable/mutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/rules?rev=49202&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/rules	[utf-8] (original)
+++ desktop/unstable/mutter/debian/rules	[utf-8] Thu Jun 30 17:58:28 2016
@@ -1,31 +1,36 @@
 #!/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-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_DH_AUTORECONF_ARGS = --as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
+%:
+	dh $@ --with autoreconf,gir,gnome
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--libdir="\$${prefix}/lib/$(DEB_HOST_MULTIARCH)" \
-	--enable-startup-notification=yes \
-	--enable-compile-warnings=yes
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-DEB_CONFIGURE_EXTRA_FLAGS +=  --enable-wayland  --enable-native-backend
+CONFFLAGS = \
+	--enable-wayland \
+	--enable-native-backend
 endif
 
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libexecdir="\$${libdir}/mutter"
+		--enable-startup-notification \
+		--enable-compile-warnings \
+		$(CONFFLAGS)
+
+
 DEB_DH_GIREPOSITORY_ARGS_ALL := /usr/lib/mutter
-DEB_DH_MAKESHLIBS_ARGS_libmutter0h = -V'libmutter0h (>= 3.19.0)'
 
-DEB_DH_STRIP_ARGS = --dbgsym-migration='mutter-dbg (<< 3.18.3-2~)'
+override_dh_install:
+	dh_install --list-missing
 
-LDFLAGS += -Wl,-O1 -Wl,--as-needed
-# This does not work with mutter; disabled, for now.
-# LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+override_dh_makeshlibs:
+	dh_makeshlibs -V'libmutter0h (>= 3.19.0)'
 
-common-binary-post-install-arch:: list-missing
+override_dh_strip:
+	dh_strip --dbgsym-migration='mutter-dbg (<< 3.18.3-2~)'
+