r49194 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jun 29 21:52:45 2016
New Revision: 49194

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

Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/control
    desktop/unstable/epiphany-browser/debian/control.in
    desktop/unstable/epiphany-browser/debian/rules

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=49194&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog	[utf-8] Wed Jun 29 21:52:45 2016
@@ -8,6 +8,7 @@
     package, not ephiphany-browser-data. This is less space efficient as we
     store multiple copies for every architecture in the Debian archive, but
     users typically expect to find the documentation in the main package.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 28 Jun 2016 23:37:42 +0200
 

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=49194&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control	[utf-8] Wed Jun 29 21:52:45 2016
@@ -8,7 +8,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9),
-               cdbs (>= 0.4.90),
                dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
                pkg-config,

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=49194&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in	[utf-8] Wed Jun 29 21:52:45 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 (>= 0.4.90),
                dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
                pkg-config,

Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=49194&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/rules	[utf-8] Wed Jun 29 21:52:45 2016
@@ -1,30 +1,27 @@
 #!/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
 
 GNOME_MODULE := epiphany
 
-LDFLAGS += -Wl,-O1 -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
 
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-DEB_DH_INSTALL_ARGS := --list-missing
+%:
+	dh "$@" --with autoreconf,gnome
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/lib/epiphany-browser \
 		--with-distributor-name=$(shell lsb_release -is)
 
-binary-post-install/epiphany-browser::
+override_dh_install:
+	dh_install --list-missing
 	cd debian/epiphany-browser/usr/bin \
 		&& mv epiphany-browser.sh epiphany-browser
-
-binary-post-install/epiphany-browser-data::
 	sed -e s/@PACKAGEVERSION@/$(DEB_VERSION)/ \
 	    -e s/@DISTROID@/`lsb_release -is`/ \
 	    -e s/@DISTROVERSION@/`lsb_release -rs`/ \
 	    debian/branding.conf.in > debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf
+
+override_dh_auto_test: