[Pkg-xfce-commits] r5279 - in goodies/trunk/xfce4-indicator-plugin: . debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-02 19:42:26 +0000 (Sat, 02 Apr 2011)
New Revision: 5279

Removed:
   goodies/trunk/xfce4-indicator-plugin/debian/patches/
Modified:
   goodies/trunk/xfce4-indicator-plugin/
   goodies/trunk/xfce4-indicator-plugin/debian/changelog
   goodies/trunk/xfce4-indicator-plugin/debian/control
   goodies/trunk/xfce4-indicator-plugin/debian/copyright
   goodies/trunk/xfce4-indicator-plugin/debian/rules
   goodies/trunk/xfce4-indicator-plugin/debian/watch
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-indicator-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-indicator-plugin:4344-5276
/goodies/tags/xfce4-indicator-plugin/0.0.1-2:4124-4343

Modified: goodies/trunk/xfce4-indicator-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/changelog	2011-04-02 19:41:50 UTC (rev 5278)
+++ goodies/trunk/xfce4-indicator-plugin/debian/changelog	2011-04-02 19:42:26 UTC (rev 5279)
@@ -1,3 +1,28 @@
+xfce4-indicator-plugin (0.2.0-1) experimental; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/control:
+    - add build-dep on hardening-includes
+    - update standards version to 3.9.1.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags
+    - add -O1, --as-needed and -z,defs to LDFLAGS
+    - add hardening flags to {C,LD}FLAGS
+  * debian/watch updated.
+  * debian/patches:
+    - 01_libindicator0.3.0_compat dropped, included upstream.
+    - 02_menu_on_no-indicators as well. 
+    - 03_skip_pofiles_in_patches removed, now useless. 
+
+  [ Evgeni Golov ]
+  * debian/copyright:
+    - Update years.
+    - Add Yves-Alexis.
+    - Fix upstream URL.
+
+ -- Evgeni Golov <evgeni at debian.org>  Sun, 27 Feb 2011 14:44:16 +0100
+
 xfce4-indicator-plugin (0.0.1-2) unstable; urgency=low
 
   * debian/control:

Modified: goodies/trunk/xfce4-indicator-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/control	2011-04-02 19:41:50 UTC (rev 5278)
+++ goodies/trunk/xfce4-indicator-plugin/debian/control	2011-04-02 19:42:26 UTC (rev 5279)
@@ -5,9 +5,9 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, 
  Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev, libindicator-dev (>=0.3.0),
- intltool
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev, 
+ libindicator-dev (>=0.3.0), intltool, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/

Modified: goodies/trunk/xfce4-indicator-plugin/debian/copyright
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/copyright	2011-04-02 19:41:50 UTC (rev 5278)
+++ goodies/trunk/xfce4-indicator-plugin/debian/copyright	2011-04-02 19:42:26 UTC (rev 5279)
@@ -1,14 +1,15 @@
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
 Name: xfce4-indicator-plugin
 Maintainer: Mark Trompell <mark at foresightlinux.org>
-Source: http://goodies.xfce.org/releases/xfce4-indicator-plugin/
+Source: http://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/
 
 Files: *
-Copyright: 2009 Mark Trompell <mark at foresightlinux.org>
+Copyright: 2009-2010 Mark Trompell <mark at foresightlinux.org>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2009-2010 Evgeni Golov <evgeni at debian.org>
+Copyright: 2009-2011 Evgeni Golov <evgeni at debian.org>
+Copyright: 2010-2011 Yves-Alexis Perez <corsac at debian.org>
 License: GPL-2+
 
 License: GPL-2+

Modified: goodies/trunk/xfce4-indicator-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/rules	2011-04-02 19:41:50 UTC (rev 5278)
+++ goodies/trunk/xfce4-indicator-plugin/debian/rules	2011-04-02 19:42:26 UTC (rev 5279)
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/hardening-includes/hardening.make
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+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
+
 %:
 	dh  $@

Modified: goodies/trunk/xfce4-indicator-plugin/debian/watch
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/watch	2011-04-02 19:41:50 UTC (rev 5278)
+++ goodies/trunk/xfce4-indicator-plugin/debian/watch	2011-04-02 19:42:26 UTC (rev 5279)
@@ -1,2 +1,3 @@
 version=3
-http://goodies.xfce.org/releases/xfce4-indicator-plugin/ xfce4-indicator-plugin-([\d\.]+)\.tar\.bz2
+http://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/([\d\.]+)/ \
+	xfce4-indicator-plugin-([\d\.]+)\.tar\.(?:gz|bz2)