[Pkg-xfce-commits] r5333 - in goodies/trunk/xfce4-weather-plugin: . debian debian/patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-03 13:26:16 +0000 (Sun, 03 Apr 2011)
New Revision: 5333

Added:
   goodies/trunk/xfce4-weather-plugin/debian/source/
Removed:
   goodies/trunk/xfce4-weather-plugin/debian/patches/01_support-ipv6-only-proxies.patch
Modified:
   goodies/trunk/xfce4-weather-plugin/
   goodies/trunk/xfce4-weather-plugin/debian/changelog
   goodies/trunk/xfce4-weather-plugin/debian/control
   goodies/trunk/xfce4-weather-plugin/debian/rules
Log:
merge experimental branch into trunk



Property changes on: goodies/trunk/xfce4-weather-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-weather-plugin:4494-5332
/goodies/branches/experimental/xfce4-weather-plugin.new:4493
/goodies/tags/xfce4-weather-plugin/0.7.3-3:4419-4492

Modified: goodies/trunk/xfce4-weather-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/changelog	2011-04-03 13:23:16 UTC (rev 5332)
+++ goodies/trunk/xfce4-weather-plugin/debian/changelog	2011-04-03 13:26:16 UTC (rev 5333)
@@ -1,3 +1,20 @@
+xfce4-weather-plugin (0.7.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * 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.
+  * debian/patches:
+    - 01_support-ipv6-only-proxies dropped, included upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Nov 2010 14:01:03 +0100
+
 xfce4-weather-plugin (0.7.3-3) unstable; urgency=low
 
   * debian/patches:

Modified: goodies/trunk/xfce4-weather-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/control	2011-04-03 13:23:16 UTC (rev 5332)
+++ goodies/trunk/xfce4-weather-plugin/debian/control	2011-04-03 13:26:16 UTC (rev 5333)
@@ -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/

Deleted: goodies/trunk/xfce4-weather-plugin/debian/patches/01_support-ipv6-only-proxies.patch
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/patches/01_support-ipv6-only-proxies.patch	2011-04-03 13:23:16 UTC (rev 5332)
+++ goodies/trunk/xfce4-weather-plugin/debian/patches/01_support-ipv6-only-proxies.patch	2011-04-03 13:26:16 UTC (rev 5333)
@@ -1,11 +0,0 @@
---- orig/xfce4-weather-plugin-0.7.3/panel-plugin/weather-http.c	2009-07-23 15:10:55.000000000 +0600
-+++ xfce4-weather-plugin-0.7.3/panel-plugin/weather-http.c	2010-05-03 00:47:53.090215530 +0600
-@@ -177,7 +177,7 @@
- #endif
- 
-   memset(&h, 0, sizeof(h));
--  h.ai_family = AF_INET;
-+  h.ai_family = AF_UNSPEC;
-   h.ai_socktype = SOCK_STREAM;
-   h.ai_protocol = IPPROTO_TCP;
-   

Modified: goodies/trunk/xfce4-weather-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/rules	2011-04-03 13:23:16 UTC (rev 5332)
+++ goodies/trunk/xfce4-weather-plugin/debian/rules	2011-04-03 13:26:16 UTC (rev 5333)
@@ -1,14 +1,21 @@
 #!/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)
+
+export CFLAGS LDFLAGS
+
 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