[Pkg-xfce-commits] r6829 - goodies/trunk/xfce4-mount-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-17 18:56:27 +0000 (Tue, 17 Apr 2012)
New Revision: 6829

Modified:
   goodies/trunk/xfce4-mount-plugin/debian/changelog
   goodies/trunk/xfce4-mount-plugin/debian/control
   goodies/trunk/xfce4-mount-plugin/debian/rules
Log:
  - update debhelper build-dep to 9.
  - add build-dep on dpkg-dev.
  - drop cdbs build-dep.
  - drop build-dep on hardening-includes.
* debian/rules:
  - replace cdbs by dh and use --parallel.
  - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
  - pass --disable-static to configure.
  - use find to delete .la files
* debian/compat bumped to 9.

Modified: goodies/trunk/xfce4-mount-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mount-plugin/debian/changelog	2012-04-17 18:52:58 UTC (rev 6828)
+++ goodies/trunk/xfce4-mount-plugin/debian/changelog	2012-04-17 18:56:27 UTC (rev 6829)
@@ -4,6 +4,16 @@
   * debian/control:
     - add build-dep on intltool.
     - replace libxfcegui4 build-dep by libxfce4ui.
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-dev.
+    - drop cdbs build-dep.
+    - drop build-dep on hardening-includes.
+  * debian/rules:
+    - replace cdbs by dh and use --parallel.
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+    - pass --disable-static to configure.
+    - use find to delete .la files
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 17 Apr 2012 20:17:14 +0200
 

Modified: goodies/trunk/xfce4-mount-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-mount-plugin/debian/control	2012-04-17 18:52:58 UTC (rev 6828)
+++ goodies/trunk/xfce4-mount-plugin/debian/control	2012-04-17 18:56:27 UTC (rev 6829)
@@ -3,10 +3,9 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: autotools-dev, cdbs, debhelper (>= 7), libgtk2.0-dev, 
+Build-Depends: autotools-dev, debhelper (>= 9), libgtk2.0-dev, 
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libstartup-notification0-dev, 
- libxml-parser-perl, libxfcegui4-dev, hardening-includes, libxfce4ui-1-dev,
- intltool
+ libxml-parser-perl, libxfcegui4-dev, libxfce4ui-1-dev, intltool
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mount-plugin/

Modified: goodies/trunk/xfce4-mount-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-mount-plugin/debian/rules	2012-04-17 18:52:58 UTC (rev 6828)
+++ goodies/trunk/xfce4-mount-plugin/debian/rules	2012-04-17 18:56:27 UTC (rev 6829)
@@ -1,15 +1,14 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/hardening-includes/hardening.make
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
+%:
+		dh $@ --parallel
 
-binary-post-install/xfce4-mount-plugin::
-	-rm -rf debian/xfce4-mount-plugin/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/xfce4-mount-plugin/usr/lib/xfce4/panel-plugins/*.la
+override_dh_auto_configure:
+		dh_auto_configure -- --disable-static
+
+override_dh_auto_install:
+	dh_auto_install
+	find debian/xfce4-mount-plugin/usr/lib -name '*.la' -delete