[Pkg-xfce-commits] r5295 - in goodies/trunk/xfce4-notes-plugin: . debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-02 21:52:18 +0000 (Sat, 02 Apr 2011)
New Revision: 5295

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


Property changes on: goodies/trunk/xfce4-notes-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-notes-plugin:4344-5294
/goodies/tags/xfce4-notes-plugin/1.7.6-1:3942-4343

Modified: goodies/trunk/xfce4-notes-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-notes-plugin/debian/changelog	2011-04-02 21:41:06 UTC (rev 5294)
+++ goodies/trunk/xfce4-notes-plugin/debian/changelog	2011-04-02 21:52:18 UTC (rev 5295)
@@ -1,6 +1,19 @@
+xfce4-notes-plugin (1.7.7-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - update standards version to 3.9.1.
+  * 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.
+    - ignore /usr/lib/xfce4/panel-plugins is dh_makeshlibs. 
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 15:14:45 +0100
+
 xfce4-notes-plugin (1.7.6-1) unstable; urgency=low
 
-  [ Lionel Le Folgoc ]
   * New upstream release.
   * Drop thunar-vfs support removed upstream:
     - debian/control: do not build-dep on libthunar-vfs-dev
@@ -9,11 +22,6 @@
   * debian/xfce4-notes.install: updated to include theme files.
   * debian/control: adding myself to uploaders.
 
-  [ Yves-Alexis Perez ]
-  * debian/control:
-    - update standards version to 3.8.4.
-  * debian/source/format created with "3.0 (quilt)".
-
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Fri, 23 Apr 2010 00:52:09 +0200
 
 xfce4-notes-plugin (1.7.2-2) unstable; urgency=low

Modified: goodies/trunk/xfce4-notes-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-notes-plugin/debian/control	2011-04-02 21:41:06 UTC (rev 5294)
+++ goodies/trunk/xfce4-notes-plugin/debian/control	2011-04-02 21:52:18 UTC (rev 5295)
@@ -5,10 +5,10 @@
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0.50~),
  xfce4-panel-dev (>= 4.4.1), libxml2-dev, libxml-parser-perl, intltool,
  libx11-dev, pkg-config, libgtk2.0-dev, libxfcegui4-dev, libxfconf-0-dev,
- libunique-dev
+ libunique-dev, hardening-includes
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-notes-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-notes-plugin/

Modified: goodies/trunk/xfce4-notes-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-notes-plugin/debian/rules	2011-04-02 21:41:06 UTC (rev 5294)
+++ goodies/trunk/xfce4-notes-plugin/debian/rules	2011-04-02 21:52:18 UTC (rev 5295)
@@ -1,11 +1,20 @@
 #!/usr/bin/make -f
+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
+
 override_dh_install:
 	-rm -rf debian/tmp/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/tmp/usr/lib/xfce4/panel-plugins/*.la
 	dh_install --fail-missing
 
+override_dh_makeshlibs:
+	dh_makeshlibs -n -X /usr/lib/xfce4/panel-plugins
+
 %:
 	dh $@