r49139 - in /desktop/unstable/evince/debian: changelog control control.in evince.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jun 23 22:33:59 2016
New Revision: 49139

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

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

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=49139&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Thu Jun 23 22:33:59 2016
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Refresh patches, drop those which have been applied upstream.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 23 Jun 2016 23:57:22 +0200
 

Modified: desktop/unstable/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control?rev=49139&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control	[utf-8] (original)
+++ desktop/unstable/evince/debian/control	[utf-8] Thu Jun 23 22:33:59 2016
@@ -9,7 +9,6 @@
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: adwaita-icon-theme,
                autotools-dev,
-               cdbs (>= 0.4.90),
                debhelper (>= 9.20160114~),
                dh-apparmor,
                dh-autoreconf,

Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=49139&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in	[utf-8] (original)
+++ desktop/unstable/evince/debian/control.in	[utf-8] Thu Jun 23 22:33:59 2016
@@ -5,7 +5,6 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: adwaita-icon-theme,
                autotools-dev,
-               cdbs (>= 0.4.90),
                debhelper (>= 9.20160114~),
                dh-apparmor,
                dh-autoreconf,

Added: desktop/unstable/evince/debian/evince.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/evince.docs?rev=49139&op=file
==============================================================================
--- desktop/unstable/evince/debian/evince.docs	(added)
+++ desktop/unstable/evince/debian/evince.docs	[utf-8] Thu Jun 23 22:33:59 2016
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+TODO

Modified: desktop/unstable/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/rules?rev=49139&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules	[utf-8] (original)
+++ desktop/unstable/evince/debian/rules	[utf-8] Thu Jun 23 22:33:59 2016
@@ -1,42 +1,46 @@
 #!/usr/bin/make -f
+
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/dpkg/buildflags.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-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
-
-export DEB_DH_AUTORECONF_ARGS = --as-needed
-
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-include /usr/share/dpkg/buildflags.mk
 
 # Mozilla plugins shouldn't be installed in multi-arch path
 export BROWSER_PLUGIN_DIR = /usr/lib/mozilla/plugins
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir="\$${prefix}/lib/$(DEB_HOST_MULTIARCH)" \
-                             --libexecdir=/usr/lib/evince \
-                             --enable-djvu \
-                             --enable-dvi \
-                             --enable-xps \
-                             --enable-comics \
-                             --enable-introspection \
-                             --enable-gtk-doc \
-                             --enable-libgnome-desktop
+%:
+	dh $@ --with autoreconf,gir,gnome
 
-DEB_DH_MAKESHLIBS_ARGS += -X /usr/lib/nautilus/ \
-                          -X /usr/lib/$(DEB_HOST_MULTIARCH)/evince/ \
-                          -V -- -c4
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-DEB_DH_SHLIBDEPS_ARGS += -X /usr/lib/nautilus/
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libexecdir=/usr/lib/evince \
+		--enable-djvu \
+		--enable-dvi \
+		--enable-xps \
+		--enable-comics \
+		--enable-introspection \
+		--enable-gtk-doc \
+		--enable-libgnome-desktop
 
-DEB_DH_STRIP_ARGS_ALL = --dbgsym-migration='evince-dbg (<< 3.20.0-2~)'
+override_dh_makeshlibs:
+	dh_makeshlibs \
+		-X /usr/lib/nautilus/ \
+		-X /usr/lib/$(DEB_HOST_MULTIARCH)/evince/ \
+		-V -- -c4
 
-install/evince::
+override_dh_shlibdeps:
+	dh_shlibdeps -X /usr/lib/nautilus/
+
+override_dh_strip:
+	dh_strip --dbgsym-migration='evince-dbg (<< 3.20.0-2~)'
+
+override_dh_install:
+	dh_install
 	install -m 0644 -D debian/apparmor-profile debian/evince/etc/apparmor.d/usr.bin.evince
 	install -m 0644 -D debian/apparmor-profile.abstraction debian/evince/etc/apparmor.d/abstractions/evince
 	install -m 0644 -D debian/evince.apport debian/evince/usr/share/apport/package-hooks/source_evince.py