[Pkg-xfce-commits] r6160 - goodies/trunk/xfce4-mailwatch-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-24 16:43:24 +0000 (Mon, 24 Oct 2011)
New Revision: 6160

Added:
   goodies/trunk/xfce4-mailwatch-plugin/debian/docs
Modified:
   goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
   goodies/trunk/xfce4-mailwatch-plugin/debian/compat
   goodies/trunk/xfce4-mailwatch-plugin/debian/control
   goodies/trunk/xfce4-mailwatch-plugin/debian/rules
Log:
* debian/rules:
  - switch to dh tiny rules.
  - use hardening support from dh 9 and dpkg-dev 1.16.1
* debian/compat bumped to 9.
* debian/control:
  - drop cdbs build-dep
  - update debhelper build-dep for hardening support.
  - add dpkg-dev (>= 1.16.1) build-dep for hardening support.
* debian/docs added to track documentation to install.

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	2011-10-24 16:32:56 UTC (rev 6159)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	2011-10-24 16:43:24 UTC (rev 6160)
@@ -3,6 +3,15 @@
   * debian/patches:
     - 04_fix-format-string-errors added, fix some string format errors leading
       to a FTBFS when building with -Werror=format-security.    closes: #646497
+  * debian/rules:
+    - switch to dh tiny rules.
+    - use hardening support from dh 9 and dpkg-dev 1.16.1
+  * debian/compat bumped to 9.
+  * debian/control:
+    - drop cdbs build-dep
+    - update debhelper build-dep for hardening support.
+    - add dpkg-dev (>= 1.16.1) build-dep for hardening support.
+  * debian/docs added to track documentation to install.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 24 Oct 2011 18:12:37 +0200
 

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/compat	2011-10-24 16:32:56 UTC (rev 6159)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/compat	2011-10-24 16:43:24 UTC (rev 6160)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/control	2011-10-24 16:32:56 UTC (rev 6159)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/control	2011-10-24 16:43:24 UTC (rev 6160)
@@ -5,10 +5,10 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), libgtk2.0-dev, 
+Build-Depends: debhelper (>= 8.9.4), libgtk2.0-dev, dpkg-dev (>= 1.16.1),
  xfce4-panel-dev (>= 4.8), libgnutls-dev, libxml-parser-perl, 
  libxfce4util-dev, libxfcegui4-dev, xfce4-dev-tools, intltool, libtool, 
- autoconf, hardening-includes
+ autoconf
 Standards-Version: 3.9.2
 Homepage: http://spuriousinterrupt.org/projects/mailwatch
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/

Added: goodies/trunk/xfce4-mailwatch-plugin/debian/docs
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/docs	                        (rev 0)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/docs	2011-10-24 16:43:24 UTC (rev 6160)
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+TODO

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/rules	2011-10-24 16:32:56 UTC (rev 6159)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/rules	2011-10-24 16:43:24 UTC (rev 6160)
@@ -1,24 +1,15 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
+%:
+	dh $@
 
-export CFLAGS LDFLAGS
-
-post-patches::
+override_dh_auto_configure:
 	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure
 
-clean::
-	rm -f $$(find -name 'Makefile.in*')
-	rm -f INSTALL aclocal.m4 compile config.h.in configure depcomp install-sh
-	rm -f intltool-extract.in intltool-merge.in intltool-update.in ltmain.sh
-	rm -f missing mkinstalldirs
-
-binary-post-install/xfce4-mailwatch-plugin::
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+override_dh_install:
+	-rm -rf debian/`dh_listpackages`/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.a
+	-rm -rf debian/`dh_listpackages`/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.la
+	dh_install --fail-missing