r49262 - in /desktop/unstable/libxklavier/debian: changelog control control.in libxklavier16.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jul  3 16:23:13 2016
New Revision: 49262

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

Added:
    desktop/unstable/libxklavier/debian/libxklavier16.docs
Modified:
    desktop/unstable/libxklavier/debian/changelog
    desktop/unstable/libxklavier/debian/control
    desktop/unstable/libxklavier/debian/control.in
    desktop/unstable/libxklavier/debian/rules

Modified: desktop/unstable/libxklavier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/changelog?rev=49262&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libxklavier/debian/changelog	[utf-8] Sun Jul  3 16:23:13 2016
@@ -12,6 +12,7 @@
   * Run upstream autogen.sh on dh_autoreconf.
   * Convert to multiarch. (Closes: #812958)
   * Bump Standards-Version to 3.9.8.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 22 Jun 2013 17:52:30 +0200
 

Modified: desktop/unstable/libxklavier/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/control?rev=49262&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/control	[utf-8] (original)
+++ desktop/unstable/libxklavier/debian/control	[utf-8] Sun Jul  3 16:23:13 2016
@@ -6,9 +6,8 @@
 Priority: optional
 Section: libs
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gtk-doc-tools (>= 1.0),
                libglib2.0-dev (>= 2.16.0),

Modified: desktop/unstable/libxklavier/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/control.in?rev=49262&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/control.in	[utf-8] (original)
+++ desktop/unstable/libxklavier/debian/control.in	[utf-8] Sun Jul  3 16:23:13 2016
@@ -3,8 +3,7 @@
 Section: libs
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gtk-doc-tools (>= 1.0),
                libglib2.0-dev (>= 2.16.0),

Added: desktop/unstable/libxklavier/debian/libxklavier16.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/libxklavier16.docs?rev=49262&op=file
==============================================================================
--- desktop/unstable/libxklavier/debian/libxklavier16.docs	(added)
+++ desktop/unstable/libxklavier/debian/libxklavier16.docs	[utf-8] Sun Jul  3 16:23:13 2016
@@ -0,0 +1,4 @@
+AUTHORS
+CREDITS
+NEWS
+README

Modified: desktop/unstable/libxklavier/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/rules?rev=49262&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/rules	[utf-8] (original)
+++ desktop/unstable/libxklavier/debian/rules	[utf-8] Sun Jul  3 16:23:13 2016
@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.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 = "NOCONFIGURE=true ./autogen.sh"
+%:
+	dh $@ --with autoreconf,gir,gnome
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-                             --with-xkb-base=/usr/share/X11/xkb \
-                             --with-xkb-bin-base=/usr/bin \
-                             --enable-gtk-doc
+override_dh_autoreconf:
+	NOCONFIGURE=true dh_autoreconf ./autogen.sh
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--with-xkb-base=/usr/share/X11/xkb \
+		--with-xkb-bin-base=/usr/bin \
+		--enable-gtk-doc
+
+override_dh_gnome:
+	dh_gnome --no-gnome-versions