[Pkg-xfce-commits] r5283 - in goodies/trunk/xfce4-linelight-plugin: . debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-02 20:57:40 +0000 (Sat, 02 Apr 2011)
New Revision: 5283

Added:
   goodies/trunk/xfce4-linelight-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-linelight-plugin/
   goodies/trunk/xfce4-linelight-plugin/debian/
   goodies/trunk/xfce4-linelight-plugin/debian/changelog
   goodies/trunk/xfce4-linelight-plugin/debian/control
   goodies/trunk/xfce4-linelight-plugin/debian/rules
   goodies/trunk/xfce4-linelight-plugin/debian/watch
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-linelight-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-linelight-plugin:4344-5282
/goodies/tags/xfce4-linelight-plugin/0.1.6-2:3282-4343


Property changes on: goodies/trunk/xfce4-linelight-plugin/debian
___________________________________________________________________
Added: MergeWithUpstream
   + 1

Modified: goodies/trunk/xfce4-linelight-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-linelight-plugin/debian/changelog	2011-04-02 19:51:37 UTC (rev 5282)
+++ goodies/trunk/xfce4-linelight-plugin/debian/changelog	2011-04-02 20:57:40 UTC (rev 5283)
@@ -1,14 +1,28 @@
-xfce4-linelight-plugin (0.1.6-3) UNRELEASED; urgency=low
+xfce4-linelight-plugin (0.1.7-1) experimental; urgency=low
 
   [ Yves-Alexis Perez ]
+  * New upstream release.
   * debian/control:
-    - switch to xfce section.
-  * debian/watch edited to track Xfce archive reorganisation.
+    - add build-dep on libxfcegui4-dev now that xfce4-panel-dev doesn't pull
+      it anymore.
+    - update standards version to 3.9.1.
+  * Switch to 3.0 (quilt) source format.
+  * debian/watch updated.
 
+  [ Lionel Le Folgoc ]
+  * debian/control:
+    - add myself to Uploaders.
+    - add build-dep on hardening-includes.
+    - drop libthunar-vfs-1-dev b-dep, plugin ported to gio.
+  * debian/rules:
+    - call dpkg-buildflags.
+    - add --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+
   [ Evgeni Golov ]
   * Fix Vcs-* fields, they were missing 'trunk' in the path.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 03 Aug 2009 18:30:09 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 15:01:29 +0100
 
 xfce4-linelight-plugin (0.1.6-2) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-linelight-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-linelight-plugin/debian/control	2011-04-02 19:51:37 UTC (rev 5282)
+++ goodies/trunk/xfce4-linelight-plugin/debian/control	2011-04-02 20:57:40 UTC (rev 5283)
@@ -2,9 +2,11 @@
 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.0.13), xfce4-panel-dev, libxml-parser-perl, libthunar-vfs-1-dev
-Standards-Version: 3.8.1
+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.0.13), xfce4-panel-dev, libxml-parser-perl, 
+ libxfcegui4-dev, hardening-includes
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-linelight-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-linelight-plugin/
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-linelight-plugin/

Modified: goodies/trunk/xfce4-linelight-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-linelight-plugin/debian/rules	2011-04-02 19:51:37 UTC (rev 5282)
+++ goodies/trunk/xfce4-linelight-plugin/debian/rules	2011-04-02 20:57:40 UTC (rev 5283)
@@ -1,4 +1,13 @@
 #!/usr/bin/make -f
-LDFLAGS +=-Wl,-z,-defs -Wl,--as-needed
+
+include /usr/share/hardening-includes/hardening.make
+
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
+
+export CFLAGS LDFLAGS
+
 %:
 	dh $@

Modified: goodies/trunk/xfce4-linelight-plugin/debian/watch
===================================================================
--- goodies/trunk/xfce4-linelight-plugin/debian/watch	2011-04-02 19:51:37 UTC (rev 5282)
+++ goodies/trunk/xfce4-linelight-plugin/debian/watch	2011-04-02 20:57:40 UTC (rev 5283)
@@ -1,3 +1,3 @@
 version=3
-http://archive.xfce.org/src/panel-plugins/xfce4-linelight-plugin/([\d\.]+)/ \
+http://svn.ganymede.ch/private/trunk/xfce4-linelight-plugin/releases/ \
 	xfce4-linelight-plugin-([\d\.]+)\.tar\.(?:gz|bz2)