r49218 - in /desktop/unstable/gnome-shell/debian: changelog control.in gnome-shell.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Jul  1 09:12:16 2016
New Revision: 49218

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

Added:
    desktop/unstable/gnome-shell/debian/gnome-shell.docs
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/control.in
    desktop/unstable/gnome-shell/debian/rules

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=49218&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Fri Jul  1 09:12:16 2016
@@ -8,6 +8,7 @@
   * Refresh patches.
   * Update dh_girepository to look for the mutter typelib file in multiarch
     paths. Bump mutter dependencies accordingly.
+  * Convert from cdbs to dh.
 
   [ Jeremy Bicha ]
   * 0001-background-free-MetaBackground-explicitly.patch:

Modified: desktop/unstable/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/control.in?rev=49218&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/control.in	[utf-8] Fri Jul  1 09:12:16 2016
@@ -4,7 +4,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: autotools-dev,
-               cdbs,
                debhelper (>= 9.20160114~),
                dh-autoreconf,
                gnome-control-center-dev (>= 1:3.4),

Added: desktop/unstable/gnome-shell/debian/gnome-shell.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/gnome-shell.docs?rev=49218&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/gnome-shell.docs	(added)
+++ desktop/unstable/gnome-shell/debian/gnome-shell.docs	[utf-8] Fri Jul  1 09:12:16 2016
@@ -0,0 +1,2 @@
+NEWS
+README

Modified: desktop/unstable/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/rules?rev=49218&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/rules	[utf-8] Fri Jul  1 09:12:16 2016
@@ -1,40 +1,47 @@
 #!/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/autotools.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_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
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
-	DEB_DH_GENCONTROL_ARGS += -- -Vicon-theme:Depends=adwaita-icon-theme-full
+%:
+	dh $@ --with autoreconf,gir,gnome
+
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+CONFFLAGS = \
+	--enable-networkmanager \
+	--enable-systemd
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-compile-warnings=yes
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=/usr/lib \
+		--libexecdir="\$${libdir}/gnome-shell" \
+		--enable-compile-warnings \
+		$(CONFFLAGS)
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-	DEB_CONFIGURE_EXTRA_FLAGS += --enable-networkmanager --enable-systemd
-endif
+override_dh_install:
+	find debian/tmp -name '*.la' -delete
+	dh_install --list-missing
 
-DEB_DH_MAKESHLIBS_ARGS_gnome-shell = -Xlibgnome-shell
+override_dh_makeshlibs:
+	dh_makeshlibs -Xlibgnome-shell
 
-$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
-	dh_girepository -p$(cdbs_curpkg) \
+override_dh_girepository:
+	dh_girepository \
 		-l src:src/gvc \
 		-p /usr/lib/$(DEB_HOST_MULTIARCH)/mutter \
 		/usr/lib/gnome-shell
-	find debian/$(cdbs_curpkg) -name '*.la' -exec rm -f '{}' ';'
 
-DEB_DH_STRIP_ARGS = --dbgsym-migration='gnome-shell-dbg (<< 3.20.2-2~)'
+override_dh_strip:
+	dh_strip --dbgsym-migration='gnome-shell-dbg (<< 3.20.2-2~)'
 
-# List any files which are not installed
-common-binary-post-install-arch:: list-missing
+ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
+override_dh_gencontrol:
+	dh_gencontrol -- -Vicon-theme:Depends=adwaita-icon-theme-full
+endif