r50931 - in /desktop/unstable/gjs/debian: changelog control control.in gjs.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Sep 20 21:04:02 2016
New Revision: 50931

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

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

Modified: desktop/unstable/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/changelog?rev=50931&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gjs/debian/changelog	[utf-8] Tue Sep 20 21:04:02 2016
@@ -1,6 +1,7 @@
 gjs (1.46.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 20 Sep 2016 22:33:41 +0200
 

Modified: desktop/unstable/gjs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/control?rev=50931&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/control	[utf-8] (original)
+++ desktop/unstable/gjs/debian/control	[utf-8] Tue Sep 20 21:04:02 2016
@@ -8,7 +8,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9),
-               cdbs,
                gnome-common,
                gnome-pkg-tools,
                autotools-dev,

Modified: desktop/unstable/gjs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/control.in?rev=50931&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gjs/debian/control.in	[utf-8] Tue Sep 20 21:04:02 2016
@@ -4,7 +4,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 9),
-               cdbs,
                gnome-common,
                gnome-pkg-tools,
                autotools-dev,

Added: desktop/unstable/gjs/debian/gjs.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/gjs.docs?rev=50931&op=file
==============================================================================
--- desktop/unstable/gjs/debian/gjs.docs	(added)
+++ desktop/unstable/gjs/debian/gjs.docs	[utf-8] Tue Sep 20 21:04:02 2016
@@ -0,0 +1,2 @@
+NEWS
+README

Modified: desktop/unstable/gjs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/rules?rev=50931&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/rules	[utf-8] (original)
+++ desktop/unstable/gjs/debian/rules	[utf-8] Tue Sep 20 21:04:02 2016
@@ -1,25 +1,31 @@
 #!/usr/bin/make -f
 
-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/rules/autoreconf.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-# configure flags
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-installed-tests \
-                             --with-xvfb-tests \
-                             --with-dbus-tests
 
 # Use recursive variables since this variable must not be expanded until 
 # files have been installed.
 LIBMOZJS = $(shell objdump -p debian/tmp/usr/lib/libgjs.so | awk '$$1=="NEEDED" && $$2~/^libmozjs/ { print $$2 }' | sed s/\\.so\\./-/ )
-DEB_DH_MAKESHLIBS_ARGS_libgjs0e = -Xusr/lib/gjs-1.0/ -V'libgjs0e (>= $(DEB_UPSTREAM_VERSION)), libgjs0-$(LIBMOZJS)' -- -c4
 
-DEB_MAKE_CHECK_TARGET := check || ( for f in test_user_data/logs/*.log; do echo "==== $$f ===="; cat $$f; done; exit 0 )
+%:
+	dh $@ --with autoreconf,gnome
 
-DEB_DH_INSTALL_ARGS := --fail-missing -X.la
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=\$${prefix}/lib \
+		--libexecdir=\$${prefix}/lib/gjs \
+		--enable-installed-tests \
+		--with-xvfb-tests \
+		--with-dbus-tests
 
-install/libgjs0e::
-	echo gjs:Provides=libgjs0-$(LIBMOZJS) >> debian/$(cdbs_curpkg).substvars
+override_dh_install:
+	dh_install --fail-missing -X.la
+
+override_dh_auto_test:
+	dh_auto_test || true
+
+override_dh_makeshlibs:
+	dh_makeshlibs -Xusr/lib/gjs-1.0/ -V'libgjs0e (>= $(DEB_UPSTREAM_VERSION)), libgjs0-$(LIBMOZJS)' -- -c4
+
+override_dh_gencontrol:
+	echo gjs:Provides=libgjs0-$(LIBMOZJS) >> debian/libgjs0e.substvars
+	dh_gencontrol