r2952 - in /unstable/evolution-data-server/debian: changelog control evolution-data-server.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Jul 15 13:04:44 2016
New Revision: 2952

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

Added:
    unstable/evolution-data-server/debian/evolution-data-server.docs
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/control
    unstable/evolution-data-server/debian/rules

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=2952&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog	(original)
+++ unstable/evolution-data-server/debian/changelog	Fri Jul 15 13:04:44 2016
@@ -4,6 +4,7 @@
   * Drop Build-Depends on chrpath and stop calling chrpath in debian/rules.
     The shared libraries no longer embed any RPATH so this is not needed
     anymore.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 07 Jun 2016 19:28:42 +0200
 

Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=2952&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control	(original)
+++ unstable/evolution-data-server/debian/control	Fri Jul 15 13:04:44 2016
@@ -12,7 +12,6 @@
 Vcs-Svn: svn://anonscm.debian.org/pkg-evolution/unstable/evolution-data-server
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution-data-server
 Build-Depends: debhelper (>= 9.20160114~),
-               cdbs (>= 0.4.90),
                dh-autoreconf,
                dpkg-dev (>= 1.16.1),
                libtool,

Added: unstable/evolution-data-server/debian/evolution-data-server.docs
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/evolution-data-server.docs?rev=2952&op=file
==============================================================================
--- unstable/evolution-data-server/debian/evolution-data-server.docs	(added)
+++ unstable/evolution-data-server/debian/evolution-data-server.docs	Fri Jul 15 13:04:44 2016
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO

Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=2952&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules	(original)
+++ unstable/evolution-data-server/debian/rules	Fri Jul 15 13:04:44 2016
@@ -1,70 +1,57 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/buildvars.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/gnome.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/gnome-get-source.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 
-DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib
-DEB_DH_AUTORECONF_ARGS = --as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+# see https://bugzilla.gnome.org/show_bug.cgi?id=594473 for details
+export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-LIBCAMEL := $(shell grep '^Package: libcamel-' debian/control | awk '{ print $$2 }')
+%:
+	dh $@ --with autoreconf,gir,gnome
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V
-DEB_DH_MAKESHLIBS_ARGS_$(LIBCAMEL) = -V'$(LIBCAMEL) (>= $(DEB_GNOME_VERSION)), $(LIBCAMEL) (<< $(DEB_GNOME_NEXTVERSION))'
+override_dh_gnome_clean:
+	dh_gnome_clean --no-control
 
-DEB_DH_INSTALL_ARGS = --fail-missing -X.la
-
-# We can't add -- -c4 above as libcamel will get "-V -- -c4 -V'...'" because
-# it gets $(_ALL) first and then $(_libcamel). So use the env variable.
-export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
-# see https://bugzilla.gnome.org/show_bug.cgi?id=594473 for details
-export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-DEB_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
 ifeq ($(DEB_HOST_ARCH_OS),$(filter $(DEB_HOST_ARCH_OS),linux kfreebsd))
-	DEB_CONFIGURE_EXTRA_FLAGS += --with-phonenumber=/usr
+CONFFLAGS = --with-phonenumber=/usr
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--sysconfdir=/etc \
-	--libexecdir=\$${prefix}/lib/evolution \
-	--with-openldap \
-	--with-krb5=/usr \
-	--with-libdb=/usr \
-	--enable-gtk \
-	--enable-gtk-doc \
-	--enable-goa \
-	--enable-google \
-	--enable-vala-bindings \
-	--disable-uoa \
-	$(NULL)
-
-DEB_DH_MAKESHLIBS_ARGS_evolution-data-server += -Xusr/lib/evolution-data-server/
-DEB_FIXPERMS_EXCLUDE_evolution-data-server += usr/lib/evolution/camel-lock-helper*
-
-DEB_DH_STRIP_ARGS_ALL = --dbgsym-migration='evolution-data-server-dbg (<< 3.20.2-2~)'
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=\$${prefix}/lib/ \
+		--libexecdir=\$${prefix}/lib/evolution \
+		--with-openldap \
+		--with-krb5=/usr \
+		--with-libdb=/usr \
+		--enable-gtk \
+		--enable-gtk-doc \
+		--enable-goa \
+		--enable-google \
+		--enable-vala-bindings \
+		--disable-uoa \
+		$(CONFFLAGS)
 
 # don't configure with --libdir, but move the files manually, because
 # /usr/lib/evolution-data-server must not change.
-common-install-impl::
+override_dh_install:
 	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 	mv debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.so.* debian/tmp/usr/lib/girepository-1.0 \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	mv debian/tmp/usr/lib/pkgconfig/lib* debian/tmp/usr/lib/pkgconfig/camel* \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
-	
-
-binary-install/evolution-data-server::
+	dh_install --fail-missing -X.la
 	chgrp mail $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper*
 	chmod g+s $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper*
-	rm $(CURDIR)/debian/tmp/usr/lib/evolution-data-server/*/*.la
-	rm $(CURDIR)/debian/tmp/usr/lib/*.la
+
+override_dh_fixperms:
+	dh_fixperms -X/usr/lib/evolution/camel-lock-helper*
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V -X/usr/lib/evolution-data-server/ -- -c4
+
+override_dh_strip:
+	dh_strip --dbgsym-migration='evolution-data-server-dbg (<< 3.20.2-2~)'