r50720 - in /desktop/unstable/aisleriot/debian: changelog compat control control.in docs rules

[ah at users.alioth.debian.org]

Author: ah
Date: Mon Sep 19 13:51:28 2016
New Revision: 50720

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50720
Log:
* Convert from cdbs to dh.
* Bump dh compat to 10 (automatic dh-autoreconf)

Added:
    desktop/unstable/aisleriot/debian/docs
Modified:
    desktop/unstable/aisleriot/debian/changelog
    desktop/unstable/aisleriot/debian/compat
    desktop/unstable/aisleriot/debian/control
    desktop/unstable/aisleriot/debian/control.in
    desktop/unstable/aisleriot/debian/rules

Modified: desktop/unstable/aisleriot/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/changelog?rev=50720&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/changelog	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/changelog	[utf-8] Mon Sep 19 13:51:28 2016
@@ -1,3 +1,10 @@
+aisleriot (1:3.20.2-2) UNRELEASED; urgency=medium
+
+  * Convert from cdbs to dh.
+  * Bump dh compat to 10 (automatic dh-autoreconf)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 14 Sep 2016 18:32:11 +0200
+
 aisleriot (1:3.20.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/aisleriot/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/compat?rev=50720&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/compat	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/compat	[utf-8] Mon Sep 19 13:51:28 2016
@@ -1 +1 @@
-9
+10

Modified: desktop/unstable/aisleriot/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/control?rev=50720&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/control	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/control	[utf-8] Mon Sep 19 13:51: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>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                desktop-file-utils,
                gnome-pkg-tools (>= 0.6),

Modified: desktop/unstable/aisleriot/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/control.in?rev=50720&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/control.in	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/control.in	[utf-8] Mon Sep 19 13:51:28 2016
@@ -3,9 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
-               debhelper (>= 9),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 10),
                desktop-file-utils,
                gnome-pkg-tools (>= 0.6),
                lsb-release,

Added: desktop/unstable/aisleriot/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/docs?rev=50720&op=file
==============================================================================
--- desktop/unstable/aisleriot/debian/docs	(added)
+++ desktop/unstable/aisleriot/debian/docs	[utf-8] Mon Sep 19 13:51:28 2016
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+TODO

Modified: desktop/unstable/aisleriot/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/rules?rev=50720&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/rules	[utf-8] (original)
+++ desktop/unstable/aisleriot/debian/rules	[utf-8] Mon Sep 19 13:51:28 2016
@@ -3,22 +3,28 @@
 
 export CONFIG_SHELL=/bin/bash
 
-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_CONFIGURE_EXTRA_FLAGS := --bindir=\$${prefix}/games \
-                --bindir=\$${prefix}/games \
-		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1
+
+%:
+	dh $@ --with gnome
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--bindir=\$${prefix}/games \
 		--with-pysol-card-theme-path=/usr/share/games/pysol
 
-DEB_MAKE_EXTRA_ARGS += GZIP_FLAGS="-9n"
-DEB_DH_FIXPERMS_ARGS_ALL := -X/usr/games/sol
-DEB_DH_MAKESHLIBS_ARGS_aisleriot := --no-act
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1"
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-DEB_DH_AUTORECONF_ARGS = --as-needed
+override_dh_auto_build:
+	dh_auto_build -- GZIP_FLAGS="-9n"
+
+override_dh_fixperms:
+	dh_fixperms -X/usr/games/sol
+
+override_dh_makeshlibs:
+	dh_makeshlibs -p aisleriot --no-act
+	dh_makeshlibs --remaining-packages
+