r3046 - in /unstable/evolution-rss/debian: changelog control rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Sep 22 14:53:12 2016
New Revision: 3046

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

Modified:
    unstable/evolution-rss/debian/changelog
    unstable/evolution-rss/debian/control
    unstable/evolution-rss/debian/rules

Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=3046&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog	(original)
+++ unstable/evolution-rss/debian/changelog	Thu Sep 22 14:53:12 2016
@@ -1,7 +1,11 @@
 evolution-rss (0.3.95-6) UNRELEASED; urgency=medium
 
+  [ Jeremy Bicha ]
   * Add git_evolution322.patch and git_disable_webkit.patch:
     - Backport patches that add evolution 3.22 compatibility
+
+  [ Michael Biebl ]
+  * Convert from cdbs to dh.
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Sat, 20 Aug 2016 01:43:34 -0400
 

Modified: unstable/evolution-rss/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/control?rev=3046&op=diff
==============================================================================
--- unstable/evolution-rss/debian/control	(original)
+++ unstable/evolution-rss/debian/control	Thu Sep 22 14:53:12 2016
@@ -8,7 +8,6 @@
                dpkg-dev (>= 1.14.16),
                autotools-dev,
                dh-autoreconf,
-               cdbs,
                intltool,
                evolution-dev (>= 3.16),
                evolution-data-server-dev (>= 3.16),

Modified: unstable/evolution-rss/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/rules?rev=3046&op=diff
==============================================================================
--- unstable/evolution-rss/debian/rules	(original)
+++ unstable/evolution-rss/debian/rules	Thu Sep 22 14:53:12 2016
@@ -1,28 +1,28 @@
 #! /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
 
 EDS_VERSION = $(shell pkg-config --modversion evolution-data-server-1.2  | awk -F'.' '{print $$1 "." $$2}')
 EDS_NEXTVERSION = $(shell pkg-config --modversion evolution-data-server-1.2  | awk -F'.' '{print $$1 "." $$2+1}')
 EVO_VERSION = $(shell pkg-config --modversion evolution-shell-3.0  | awk -F'.' '{print $$1 "." $$2}')
 EVO_NEXTVERSION = $(shell pkg-config --modversion evolution-shell-3.0  | awk -F'.' '{print $$1 "." $$2+1}')
 
-DEB_DH_GENCONTROL_ARGS_ALL = -- -Veds:Version=$(EDS_VERSION) -Veds:NextVersion=$(EDS_NEXTVERSION) \
-                                -Vevo:Version=$(EVO_VERSION) -Vevo:NextVersion=$(EVO_NEXTVERSION)
+%:
+	dh $@ --with autoreconf
 
-DEB_DH_MAKESHLIBS_ARGS=-Xevolution
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-webkit \
+		--disable-gecko \
+		--with-primary-render=webkit
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-       --enable-webkit \
-       --disable-gecko \
-       --with-primary-render=webkit
+override_dh_install:
+	dh_install
+	rm -rf debian/evolution-rss/usr/share/applications
+	find debian/evolution-rss -name \*.la -delete
 
-binary-post-install/evolution-rss::
-	rm -f debian/evolution-rss/usr/lib/evolution/plugins/*.la
-	rm -f debian/evolution-rss/usr/lib/evolution/modules/*.la
-	rm -rf debian/evolution-rss/usr/share/applications
+override_dh_makeshlibs:
+	dh_makeshlibs -Xevolution
 
-common-binary-post-install-arch:: list-missing
+override_dh_gencontrol:
+	dh_gencontrol -- \
+		-Veds:Version=$(EDS_VERSION) -Veds:NextVersion=$(EDS_NEXTVERSION) \
+		-Vevo:Version=$(EVO_VERSION) -Vevo:NextVersion=$(EVO_NEXTVERSION)