[Pkg-xfce-commits] r5310 - in goodies/trunk/xfce4-screenshooter: . debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-03 12:18:10 +0000 (Sun, 03 Apr 2011)
New Revision: 5310

Added:
   goodies/trunk/xfce4-screenshooter/debian/patches/
   goodies/trunk/xfce4-screenshooter/debian/source/
Modified:
   goodies/trunk/xfce4-screenshooter/
   goodies/trunk/xfce4-screenshooter/debian/changelog
   goodies/trunk/xfce4-screenshooter/debian/control
   goodies/trunk/xfce4-screenshooter/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-screenshooter
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /goodies/branches/experimental/xfce4-screenshooter:4704-5309

Modified: goodies/trunk/xfce4-screenshooter/debian/changelog
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/changelog	2011-04-03 12:08:35 UTC (rev 5309)
+++ goodies/trunk/xfce4-screenshooter/debian/changelog	2011-04-03 12:18:10 UTC (rev 5310)
@@ -1,3 +1,23 @@
+xfce4-screenshooter (1.7.9-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - add build-dep on libxfcegui4-dev and hardening-includes.
+    - add myself to Uploaders.
+    - update Standards-Version to 3.9.1.
+    - drop unused b-dep on libexo-0.3-dev.
+    - bump xfce4-panel-dev b-dep to (>= 4.8.0) to ensure that it's built
+      against the correct one.                                  Closes: #618274
+  * 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.
+  * Switch to 3.0 (quilt) source format.
+  * debian/patches:
+    - 01_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
+    - series: added.                                            closes: #615800
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 12 Dec 2010 12:31:24 +0100
+
 xfce4-screenshooter (1.7.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: goodies/trunk/xfce4-screenshooter/debian/control
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/control	2011-04-03 12:08:35 UTC (rev 5309)
+++ goodies/trunk/xfce4-screenshooter/debian/control	2011-04-03 12:18:10 UTC (rev 5310)
@@ -2,12 +2,12 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, 
- libexo-0.3-dev(>= 0.3.2), xfce4-panel-dev (>= 4.4.1), libxml-parser-perl, 
- libgtk2.0-dev, intltool, libcurl4-gnutls-dev, libxmlrpc-c3-dev,
- libsoup2.4-dev
-Standards-Version: 3.8.4
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
+ Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7), autotools-dev, cdbs, libxml-parser-perl,
+ xfce4-panel-dev (>= 4.8.0), libgtk2.0-dev, intltool, libcurl4-gnutls-dev,
+ libxmlrpc-c3-dev, libsoup2.4-dev, libxfcegui4-dev, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/applications/xfce4-screenshooter
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-screenshooter/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-screenshooter/

Modified: goodies/trunk/xfce4-screenshooter/debian/rules
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/rules	2011-04-03 12:08:35 UTC (rev 5309)
+++ goodies/trunk/xfce4-screenshooter/debian/rules	2011-04-03 12:18:10 UTC (rev 5310)
@@ -1,6 +1,13 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.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 CFLAGS LDFLAGS
+
 DEB_DH_SHLIBDEPS_ARGS_xfce4-screenshooter = -X debian/xfce4-screenshooter/usr/lib/xfce4-screenshooter/xfce4/panel-plugins/xfce4-screenshooter-plugin -- -dRecommends debian/xfce4-screenshooter/usr/lib/xfce4-screenshooter/xfce4/panel-plugins/xfce4-screenshooter-plugin -dDepends