[Pkg-xfce-commits] r4572 - in goodies/trunk/xfce4-volumed/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Thu Nov 18 05:22:37 UTC 2010
Author: corsac
Date: 2010-11-18 17:22:34 +0000 (Thu, 18 Nov 2010)
New Revision: 4572
Added:
goodies/trunk/xfce4-volumed/debian/patches/
goodies/trunk/xfce4-volumed/debian/patches/01_fix-cflags-handing.patch
goodies/trunk/xfce4-volumed/debian/patches/series
Modified:
goodies/trunk/xfce4-volumed/debian/changelog
goodies/trunk/xfce4-volumed/debian/control
goodies/trunk/xfce4-volumed/debian/rules
Log:
- add build-dep on xfce4-dev-tools, libtool and intltool to run
xdt-autogen after applying patch touching configure.ac.
- run xdt-autogen before configure
* debian/patches:
- 01_fix-cflags-handing added, don't override CFLAGS completely
Modified: goodies/trunk/xfce4-volumed/debian/changelog
===================================================================
--- goodies/trunk/xfce4-volumed/debian/changelog 2010-11-18 16:36:27 UTC (rev 4571)
+++ goodies/trunk/xfce4-volumed/debian/changelog 2010-11-18 17:22:34 UTC (rev 4572)
@@ -5,13 +5,18 @@
- bump standards version to 3.9.1.
- add build-dep on hardening-includes.
- add build-dep on libkeybinder-dev.
+ - 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
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 18 Nov 2010 17:35:52 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 18 Nov 2010 17:59:10 +0100
xfce4-volumed (0.1.8-1) unstable; urgency=low
Modified: goodies/trunk/xfce4-volumed/debian/control
===================================================================
--- goodies/trunk/xfce4-volumed/debian/control 2010-11-18 16:36:27 UTC (rev 4571)
+++ goodies/trunk/xfce4-volumed/debian/control 2010-11-18 17:22:34 UTC (rev 4572)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 7), libexo-0.3-dev(>= 0.3.2),
libxfcegui4-dev (>= 4.4.0), libxfconf-0-dev, libgstreamer0.10-dev,
libgstreamer-plugins-base0.10-dev, libxcb-keysyms1-dev, libnotify-dev,
- hardening-includes, libkeybinder-dev
+ hardening-includes, libkeybinder-dev, xfce4-dev-tools, libtool, intltool
Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/projects/applications/xfce4-volumed
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-volumed/
Added: goodies/trunk/xfce4-volumed/debian/patches/01_fix-cflags-handing.patch
===================================================================
--- goodies/trunk/xfce4-volumed/debian/patches/01_fix-cflags-handing.patch (rev 0)
+++ goodies/trunk/xfce4-volumed/debian/patches/01_fix-cflags-handing.patch 2010-11-18 17:22:34 UTC (rev 4572)
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 8650a79..32aab35 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,9 +57,9 @@ AM_CONDITIONAL(HAVE_LIBNOTIFY, [test "$HAVE_LIBNOTIFY" = "1"])
+
+
+ if test "x$enable_debug" = "xyes"; then
+- CFLAGS="-g"
++ CFLAGS="$CFLAGS -g"
+ else
+- CFLAGS="-O2 -DNDEBUG"
++ CFLAGS="$CFLAGS -O2 -DNDEBUG"
+ fi
+
+ AC_OUTPUT([
Added: goodies/trunk/xfce4-volumed/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-volumed/debian/patches/series (rev 0)
+++ goodies/trunk/xfce4-volumed/debian/patches/series 2010-11-18 17:22:34 UTC (rev 4572)
@@ -0,0 +1 @@
+01_fix-cflags-handing.patch
Modified: goodies/trunk/xfce4-volumed/debian/rules
===================================================================
--- goodies/trunk/xfce4-volumed/debian/rules 2010-11-18 16:36:27 UTC (rev 4571)
+++ goodies/trunk/xfce4-volumed/debian/rules 2010-11-18 17:22:34 UTC (rev 4572)
@@ -6,5 +6,9 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
CFLAGS+=$(HARDENING_CFLAGS)
+override_dh_auto_configure:
+ NOCONFIGURE=1 xdt-autogen
+ dh_auto_configure
+
%:
dh $@
More information about the Pkg-xfce-commits
mailing list