r2967 - in /unstable/evolution/debian: changelog control docs evolution.docs rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Jul 15 20:57:42 UTC 2016
Author: biebl
Date: Fri Jul 15 20:57:42 2016
New Revision: 2967
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2967
Log:
Convert from cdbs to dh.
Added:
unstable/evolution/debian/evolution.docs
- copied unchanged from r2966, unstable/evolution/debian/docs
Removed:
unstable/evolution/debian/docs
Modified:
unstable/evolution/debian/changelog
unstable/evolution/debian/control
unstable/evolution/debian/rules
Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=2967&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Fri Jul 15 20:57:42 2016
@@ -2,6 +2,7 @@
* New upstream release.
* Bump e-d-s Depends and Build-Depends to (>= 3.20.4).
+ * Convert from cdbs to dh.
-- Michael Biebl <biebl at debian.org> Fri, 15 Jul 2016 17:38:35 +0200
Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=2967&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Fri Jul 15 20:57:42 2016
@@ -12,7 +12,6 @@
Vcs-Svn: svn://anonscm.debian.org/pkg-evolution/unstable/evolution
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution
Build-Depends: debhelper (>= 9.20160114),
- cdbs (>= 0.4.90),
dh-autoreconf,
dpkg-dev (>= 1.16.1),
libchamplain-gtk-0.12-dev,
Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=2967&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Fri Jul 15 20:57:42 2016
@@ -1,44 +1,41 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/autoreconf.mk
-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/gnome-pkg-tools/1/rules/gnome-get-source.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-ELIBDIR := usr/lib/evolution
+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_DH_AUTORECONF_ARGS := --as-needed
-DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
-DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= $(DEB_VERSION)), libevolution (<< $(DEB_GNOME_NEXTVERSION))' --noscripts -X $(ELIBDIR)/modules
-DEB_DH_MAKESHLIBS_ARGS_evolution += -V
-DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
-DEB_DH_INSTALL_ARGS := --fail-missing -X.la
-DEB_DH_STRIP_ARGS := --dbgsym-migration='evolution (<< 3.18.5.1-2~)'
+%:
+ dh $@ --with autoreconf,gnome
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-# see https://bugzilla.gnome.org/show_bug.cgi?id=594473 for details
-export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
-include /usr/share/dpkg/buildflags.mk
+override_dh_gnome_clean:
+ dh_gnome_clean --no-control
+
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
DEB_REVISION := $(shell echo $(DEB_VERSION) | awk -F- '{ print $$NF }')
-DEB_CONFIGURE_EXTRA_FLAGS += \
- --with-openldap \
- --enable-nls \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --enable-plugins=all \
- --enable-pst-import \
- --enable-contact-maps \
- --disable-autoar \
- --with-sub-version=-$(DEB_REVISION)
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --libdir=\$${prefix}/lib \
+ --libexecdir=\$${prefix}/lib \
+ --with-openldap \
+ --enable-nls \
+ --enable-plugins=all \
+ --enable-pst-import \
+ --enable-contact-maps \
+ --disable-autoar \
+ --with-sub-version=-$(DEB_REVISION)
-clean::
- find -name '*.schemas' | xargs rm -f
+override_dh_install:
+ dh_install --fail-missing -X.la
-common-binary-post-install-arch:: list-missing
+override_dh_makeshlibs:
+ dh_makeshlibs -V'libevolution (>= $(DEB_VERSION)), libevolution (<< $(DEB_GNOME_NEXTVERSION))' -n
+
+override_dh_strip:
+ dh_strip --dbgsym-migration='evolution (<< 3.18.5.1-2~)'
More information about the pkg-evolution-commits
mailing list