r2177 - in /experimental/evolution/debian: changelog compat control rules

[jordi at users.alioth.debian.org]

Author: jordi
Date: Fri May 18 12:56:17 2012
New Revision: 2177

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2177
Log:
* Require e-d-s >= 3.4.
* Bump to debhelper compatibility v9.
* Replace hardening-includes.mk with buildflags.mk, and adjust rules
  to currently recommended practice.

Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/compat
    experimental/evolution/debian/control
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=2177&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Fri May 18 12:56:17 2012
@@ -13,13 +13,17 @@
   * Build-Depend on libchamplain-0.12-dev and enable the contacts map
     plugin again.
   * evo-addressbook-clean is gone, adjust .install file accordingly.
+  * Require e-d-s >= 3.4.
   * Format NEWS file just like lintian likes it.
   * Remove obsolete lintian overrides.
   * Replace manual dh_bugfiles call with a bump to cdbs (>= 0.4.90).
   * Update Standards-Version to 3.9.3, with no changes needed.
   * Replace evolution.gconf-defaults with equivalent
     evolution-common.gsettings-override file.
+  * Bump to debhelper compatibility v9.
   * Strip leading debian/tmp/ from .install files.
+  * Replace hardening-includes.mk with buildflags.mk, and adjust rules
+    to currently recommended practice.
 
  -- Jordi Mallach <jordi at debian.org>  Thu, 17 May 2012 23:05:13 +0200
 

Modified: experimental/evolution/debian/compat
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/compat?rev=2177&op=diff
==============================================================================
--- experimental/evolution/debian/compat (original)
+++ experimental/evolution/debian/compat Fri May 18 12:56:17 2012
@@ -1,1 +1,1 @@
-5
+9

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=2177&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Fri May 18 12:56:17 2012
@@ -15,11 +15,10 @@
 Homepage: http://projects.gnome.org/evolution/
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-evolution/unstable/evolution
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution
-Build-Depends: debhelper (>= 7.2.3~),
+Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.90),
                dh-autoreconf,
                dpkg-dev (>= 1.16.1),
-               hardening-includes,
                libglib2.0-dev (>= 2.30),
                libgtk-3-dev (>= 3.2.0),
                libgail-3-dev (>= 3.0.2),
@@ -78,8 +77,8 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-common (= ${source:Version}),
-         evolution-data-server (>= 3.2),
-         evolution-data-server (<< 3.3),
+         evolution-data-server (>= 3.4),
+         evolution-data-server (<< 3.5),
          gnome-icon-theme (>= 2.30.2.1),
          dbus,
          psmisc

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=2177&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Fri May 18 12:56:17 2012
@@ -8,7 +8,6 @@
 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
-include /usr/share/hardening-includes/hardening.make
 
 ELIBDIR := usr/lib/evolution/3.4
 
@@ -18,7 +17,8 @@
 DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+include /usr/share/dpkg/buildflags.mk
 
 DEB_REVISION := $(shell echo $(DEB_VERSION) | awk -F- '{ print $$NF }')