[Pkg-xfce-commits] r5106 - goodies/trunk/xfce4-volumed/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-03-06 14:34:48 +0000 (Sun, 06 Mar 2011)
New Revision: 5106

Removed:
   goodies/trunk/xfce4-volumed/debian/patches/
Modified:
   goodies/trunk/xfce4-volumed/debian/changelog
   goodies/trunk/xfce4-volumed/debian/rules
Log:
drop patch, somehow included upstream (-O2 will be enforced for now)


Modified: goodies/trunk/xfce4-volumed/debian/changelog
===================================================================
--- goodies/trunk/xfce4-volumed/debian/changelog	2011-03-06 14:31:31 UTC (rev 5105)
+++ goodies/trunk/xfce4-volumed/debian/changelog	2011-03-06 14:34:48 UTC (rev 5106)
@@ -4,16 +4,11 @@
   * New upstream release.
   * debian/control:
     - add build-dep on hardening-includes.
-    - add build-dep on xfce4-dev-tools, libtool and intltool to run
-      xdt-autogen after applying patch touching configure.ac.
   * Switch to 3.0 (quilt) source format.
   * debian/rules:
     - pick {C,LD}FLAGS from dpkg-buildflags.
     - add -O1, -z,defs and --as-needed to LDFLAGS.
     - add hardening flags to {C,LD}FLAGS.
-    - run xdt-autogen before configure
-  * debian/patches:
-    - 01_fix-cflags-handing added, don't override CFLAGS completely
 
   [ Lionel Le Folgoc ]
   * debian/control:
@@ -25,7 +20,7 @@
     - update description                                            lp: #725986
   * Switch to 3.0 (quilt).
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Mar 2011 15:30:51 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Mar 2011 15:32:32 +0100
 
 xfce4-volumed (0.1.8-1) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-volumed/debian/rules
===================================================================
--- goodies/trunk/xfce4-volumed/debian/rules	2011-03-06 14:31:31 UTC (rev 5105)
+++ goodies/trunk/xfce4-volumed/debian/rules	2011-03-06 14:34:48 UTC (rev 5106)
@@ -6,9 +6,7 @@
 LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
 CFLAGS+=$(HARDENING_CFLAGS)
 
-override_dh_auto_configure:
-	NOCONFIGURE=1 xdt-autogen
-	dh_auto_configure
+export CFLAGS LDFLAGS
 
 %:
 	dh $@