[Pkg-xfce-commits] r4494 - in goodies/branches/experimental/xfce4-weather-plugin.new/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-06 09:52:20 +0000 (Sat, 06 Nov 2010)
New Revision: 4494

Added:
   goodies/branches/experimental/xfce4-weather-plugin.new/debian/patches/series
   goodies/branches/experimental/xfce4-weather-plugin.new/debian/source/
Modified:
   goodies/branches/experimental/xfce4-weather-plugin.new/debian/changelog
   goodies/branches/experimental/xfce4-weather-plugin.new/debian/control
   goodies/branches/experimental/xfce4-weather-plugin.new/debian/rules
Log:
merge changes from previous attempt


Modified: goodies/branches/experimental/xfce4-weather-plugin.new/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin.new/debian/changelog	2010-11-06 09:48:41 UTC (rev 4493)
+++ goodies/branches/experimental/xfce4-weather-plugin.new/debian/changelog	2010-11-06 09:52:20 UTC (rev 4494)
@@ -1,3 +1,17 @@
+xfce4-weather-plugin (0.7.3-4) UNRELEASED; urgency=low
+
+  * debian/control:
+    - add build dep on libxfcegui4-dev.
+    - update standards version to 3.9.1.
+    - add build-dep on hardening-includes.
+  * 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.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 03:25:13 +0100
+
 xfce4-weather-plugin (0.7.3-3) unstable; urgency=low
 
   * debian/patches:

Modified: goodies/branches/experimental/xfce4-weather-plugin.new/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin.new/debian/control	2010-11-06 09:48:41 UTC (rev 4493)
+++ goodies/branches/experimental/xfce4-weather-plugin.new/debian/control	2010-11-06 09:52:20 UTC (rev 4494)
@@ -4,8 +4,9 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0), 
- xfce4-panel-dev, libxml2-dev, libxml-parser-perl, intltool
-Standards-Version: 3.8.4
+ xfce4-panel-dev, libxml2-dev, libxml-parser-perl, intltool, libxfcegui4-dev,
+ hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-weather-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-weather-plugin/

Added: goodies/branches/experimental/xfce4-weather-plugin.new/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin.new/debian/patches/series	                        (rev 0)
+++ goodies/branches/experimental/xfce4-weather-plugin.new/debian/patches/series	2010-11-06 09:52:20 UTC (rev 4494)
@@ -0,0 +1 @@
+01_support-ipv6-only-proxies.patch

Modified: goodies/branches/experimental/xfce4-weather-plugin.new/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin.new/debian/rules	2010-11-06 09:48:41 UTC (rev 4493)
+++ goodies/branches/experimental/xfce4-weather-plugin.new/debian/rules	2010-11-06 09:52:20 UTC (rev 4494)
@@ -1,14 +1,19 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 # It would be nice to add a cool CDBS variable here saying 
 # "do not include changelog, AUTHORS and README to dh_installdocs" 
 # (see below for the dirty hack)
 
 include /usr/share/cdbs/1/class/autotools.mk
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
+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)
+
 binary-post-install/xfce4-weather-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la