r49294 - in /desktop/unstable/gnome-session/debian: changelog control control.in gnome-session.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jul 13 13:12:20 2016
New Revision: 49294

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

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

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=49294&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog	[utf-8] Wed Jul 13 13:12:20 2016
@@ -5,6 +5,7 @@
   * Drop debian/patches/update-activation-environment-at-startup.patch, merged
     upstream.
   * Bump debhelper compatibility level to 9.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 12 Jul 2016 13:40:26 +0200
 

Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=49294&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control	[utf-8] Wed Jul 13 13:12:20 2016
@@ -8,8 +8,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Standards-Version: 3.9.7
-Build-Depends: cdbs (>= 0.4.41),
-               dh-autoreconf,
+Build-Depends: dh-autoreconf,
                debhelper (>= 9),
                gnome-pkg-tools (>= 0.13),
                gnome-common,

Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=49294&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control.in	[utf-8] Wed Jul 13 13:12:20 2016
@@ -4,8 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.9.7
-Build-Depends: cdbs (>= 0.4.41),
-               dh-autoreconf,
+Build-Depends: dh-autoreconf,
                debhelper (>= 9),
                gnome-pkg-tools (>= 0.13),
                gnome-common,

Added: desktop/unstable/gnome-session/debian/gnome-session.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session.docs?rev=49294&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session.docs	(added)
+++ desktop/unstable/gnome-session/debian/gnome-session.docs	[utf-8] Wed Jul 13 13:12:20 2016
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README

Modified: desktop/unstable/gnome-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/rules?rev=49294&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/rules	[utf-8] Wed Jul 13 13:12:20 2016
@@ -1,21 +1,21 @@
 #!/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_CONFIGURE_EXTRA_FLAGS += --localstatedir=/var/lib \
-                             --enable-ipv6
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+%:
+	dh $@ --with autoreconf,gnome
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-	DEB_CONFIGURE_EXTRA_FLAGS += --enable-systemd
+CONFFLAGS = --enable-systemd
 else
-	DEB_CONFIGURE_EXTRA_FLAGS += --disable-systemd
+CONFFLAGS = --disable-systemd
 endif
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--localstatedir=/var/lib \
+		--libexecdir=/usr/lib/gnome-session \
+		--enable-ipv6 \
+		$(CONFFLAGS)