[Pkg-xfce-commits] r5287 - in goodies/trunk/xfce4-messenger-plugin: . debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-02 21:23:46 +0000 (Sat, 02 Apr 2011)
New Revision: 5287

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


Property changes on: goodies/trunk/xfce4-messenger-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-messenger-plugin:4344-5286
/goodies/tags/xfce4-messenger-plugin/0.1.0-4:3327-4343

Modified: goodies/trunk/xfce4-messenger-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-messenger-plugin/debian/changelog	2011-04-02 21:21:05 UTC (rev 5286)
+++ goodies/trunk/xfce4-messenger-plugin/debian/changelog	2011-04-02 21:23:46 UTC (rev 5287)
@@ -1,11 +1,29 @@
 xfce4-messenger-plugin (0.1.0-5) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
+  * debian/patches:
+    - 01_link-with-libxfcegui4 added, link against libxfcegui4 now that
+      xfce4-panel-dev doesn't bring the flags.
+  * debian/rules:
+    - run xdt-autogen after applying patches touching Makefile.am
+    - pick {C,LD}FLAGS from dpkg-buildflags
+    - add hardening flags to {C,LD}FLAGS
+    - add -z,defs, -O1 and --as-needed to LDFLAGS.
   * debian/control:
+    - add build-dep on xfce4-dev-tools, intltool and libtool to run
+      xdt-autogen after applying patches.
+    - add build-dep on hardening-includes
+    - update standards version to 3.9.1.
     - switch to xfce section.
   * debian/watch edited to track Xfce archive reorganisation.
+  * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 03 Aug 2009 18:30:32 +0200
+  [ Lionel Le Folgoc ]
+  * debian/rules: clean up autogenerated files changed by xdt-autogen.
+  * debian/control: add myself to Uploaders.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 15:24:54 +0100
+
 xfce4-messenger-plugin (0.1.0-4) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/trunk/xfce4-messenger-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-messenger-plugin/debian/control	2011-04-02 21:21:05 UTC (rev 5286)
+++ goodies/trunk/xfce4-messenger-plugin/debian/control	2011-04-02 21:23:46 UTC (rev 5287)
@@ -3,10 +3,12 @@
 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>
+ Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7), cdbs, xfce4-panel-dev (>= 4.3.90.2-3),
- libdbus-1-dev, libdbus-glib-1-dev, libxt-dev, autotools-dev
-Standards-Version: 3.8.2
+ libdbus-1-dev, libdbus-glib-1-dev, libxt-dev, autotools-dev, libxfcegui4-dev,
+ xfce4-dev-tools, libtool, intltool, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-messenger-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-messenger-plugin/

Modified: goodies/trunk/xfce4-messenger-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-messenger-plugin/debian/rules	2011-04-02 21:21:05 UTC (rev 5286)
+++ goodies/trunk/xfce4-messenger-plugin/debian/rules	2011-04-02 21:23:46 UTC (rev 5287)
@@ -2,6 +2,23 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS)
+
+export CFLAGS LDFLAGS
+
+post-patches::
+	NOCONFIGURE=1 xdt-autogen
+
+clean::
+	rm -f $$(find -name 'Makefile.in*')
+	rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh
+	rm -f intltool-extract.in intltool-merge.in intltool-update.in ltmain.sh
+	rm -f missing mkinstalldirs
+
 binary-post-install/xfce4-messenger-plugin::
 	cp -r scripts/ debian/`dh_listpackages`/usr/share/doc/`dh_listpackages`/
 	-rm -rf debian/`dh_listpackages`/usr/share/doc/`dh_listpackages`/scripts/Makefile*