[Pkg-xfce-commits] r4526 - in goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-07 09:48:42 +0000 (Sun, 07 Nov 2010)
New Revision: 4526

Added:
   goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/patches/02_link-with-libxfcegui4.patch
   goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/patches/series
   goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/source/
Modified:
   goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/changelog
   goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/control
   goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/rules
Log:
merge experimental changes


Modified: goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/changelog	2010-11-07 09:45:40 UTC (rev 4525)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/changelog	2010-11-07 09:48:42 UTC (rev 4526)
@@ -1,3 +1,21 @@
+xfce4-mailwatch-plugin (1.1.0-4) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 02_link-with-libxfcegui4, links against libxfcegui4 since xfce4-panel
+      doesn't brings the flags anymore.
+  * debian/control:
+    - add build-dep on xfce4-dev-tools, intltool and libtool in order to run
+      xdt-autogen after patching.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - run xdt-autogen after patching.
+    - pick {C,LD}FLAGS from dpkg-buildflags
+    - add hardening flags to {C,LD}FLAGS
+    - add -z,defs, -O1 and --as-needed to LDFLAGS.
+  * Switch to 3.0 (quilt) source format.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 15:16:29 +0100
+
 xfce4-mailwatch-plugin (1.1.0-3) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/control	2010-11-07 09:45:40 UTC (rev 4525)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/control	2010-11-07 09:48:42 UTC (rev 4526)
@@ -3,7 +3,10 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), libgtk2.0-dev, xfce4-panel-dev (>= 4.3.90.2-3), libgnutls-dev, libxml-parser-perl, libxfce4util-dev, libxfcegui4-dev
+Build-Depends: cdbs, debhelper (>= 7), libgtk2.0-dev, 
+ xfce4-panel-dev (>= 4.3.90.2-3), libgnutls-dev, libxml-parser-perl, 
+ libxfce4util-dev, libxfcegui4-dev, xfce4-dev-tools, intltool, libtool, 
+ autoconf, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://spuriousinterrupt.org/projects/mailwatch
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/

Copied: goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/patches/02_link-with-libxfcegui4.patch (from rev 4406, goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch)
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/patches/02_link-with-libxfcegui4.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/patches/02_link-with-libxfcegui4.patch	2010-11-07 09:48:42 UTC (rev 4526)
@@ -0,0 +1,29 @@
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 920e45d..a7f36d5 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -50,20 +50,22 @@ xfce4_mailwatch_plugin_CFLAGS = \
+ 	-I$(top_srcdir)/libmailwatch-core \
+ 	@GTHREAD_CFLAGS@ \
+ 	@LIBXFCE4PANEL_CFLAGS@ \
++	@LIBXFCEGUI4_CFLAGS@ \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLOCALEDIR=\"$(localedir)\"
+ 
+ xfce4_mailwatch_plugin_DEPENDENCIES = \
+ 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la
+ 
+-xfce4_mailwatch_plugin_LDFLAGS = \
++xfce4_mailwatch_plugin_LDADD = \
+ 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
+ 	@GTHREAD_LIBS@ \
+ 	@LIBXFCE4PANEL_LIBS@ \
++	@LIBXFCEGUI4_LIBS@ \
+ 	@GNUTLS_LIBS@
+ 
+ if HAVE_CYGWIN
+-  xfce4_mailwatch_plugin_LDFLAGS += \
++  xfce4_mailwatch_plugin_LDFLAGS = \
+ 	-no-undefined
+ endif
+ 

Copied: goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/patches/series (from rev 4406, goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/series)
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/patches/series	                        (rev 0)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/patches/series	2010-11-07 09:48:42 UTC (rev 4526)
@@ -0,0 +1,2 @@
+01_fix-cpu-usage.diff
+02_link-with-libxfcegui4.patch

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/rules	2010-11-07 09:45:40 UTC (rev 4525)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin.new/debian/rules	2010-11-07 09:48:42 UTC (rev 4526)
@@ -1,10 +1,16 @@
 #!/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
 
-LDFLAGS+=-Wl,-z,-defs -Wl,--as-needed
+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)
 
+post-patches::
+	NOCONFIGURE=1 xdt-autogen
+
 binary-post-install/xfce4-mailwatch-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la