[Pkg-xfce-commits] r5285 - in goodies/trunk/xfce4-mailwatch-plugin: . debian debian/patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sat Apr 2 09:18:56 UTC 2011 

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

Added:
   goodies/trunk/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch
   goodies/trunk/xfce4-mailwatch-plugin/debian/patches/03_fix-implicit-dso-linking.patch
   goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series
   goodies/trunk/xfce4-mailwatch-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-mailwatch-plugin/
   goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
   goodies/trunk/xfce4-mailwatch-plugin/debian/control
   goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_fix-cpu-usage.diff
   goodies/trunk/xfce4-mailwatch-plugin/debian/patches/02_mbox-interval.diff
   goodies/trunk/xfce4-mailwatch-plugin/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-mailwatch-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-mailwatch-plugin:4528-5284
/goodies/branches/experimental/xfce4-mailwatch-plugin.new:4524-4527
/goodies/tags/xfce4-mailwatch-plugin/1.1.0-3:4419-4523

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	2011-04-02 21:02:24 UTC (rev 5284)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	2011-04-02 21:18:50 UTC (rev 5285)
@@ -1,3 +1,30 @@
+xfce4-mailwatch-plugin (1.1.0-4) UNRELEASED; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * 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.
+
+  [ Lionel Le Folgoc ]
+  * debian/rules: clean up autogenerated files changed by xdt-autogen.
+  * debian/control: add myself to Uploaders.
+  * debian/patches:
+    - 03_fix-implicit-dso-linking.patch: add missing -lgcrypt, fixes FTBFS with
+      binutils-gold.                                            closes: #615798
+    - series: refreshed.
+
+ -- 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/trunk/xfce4-mailwatch-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/control	2011-04-02 21:02:24 UTC (rev 5284)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/control	2011-04-02 21:18:50 UTC (rev 5285)
@@ -2,8 +2,13 @@
 Section: xfce
 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
+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>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
+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/

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_fix-cpu-usage.diff
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_fix-cpu-usage.diff	2011-04-02 21:02:24 UTC (rev 5284)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_fix-cpu-usage.diff	2011-04-02 21:18:50 UTC (rev 5285)
@@ -1,3 +1,8 @@
+Description: fix high CPU usage
+Author: Brian Tarricone <brian at tarricone.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523312
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=4494
+Applied-Upstream: 1.1.1, http://git.xfce.org/panel-plugins/xfce4-mailwatch-plugin/commit/?id=491acb38de89ab845d6a80f23c36d3df8da70421
 diff --git a/libmailwatch-core/mailwatch-net-conn.c b/libmailwatch-core/mailwatch-net-conn.c
 index 9264376..0f88678 100644
 --- a/libmailwatch-core/mailwatch-net-conn.c

Copied: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch (from rev 5284, goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch)
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch	                        (rev 0)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch	2011-04-02 21:18:50 UTC (rev 5285)
@@ -0,0 +1,32 @@
+Description: link against libxfcegui4
+Author: Yves-Alexis Perez <corsac at debian.org>
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6608
+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
+ 

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/02_mbox-interval.diff
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/02_mbox-interval.diff	2011-04-02 21:02:24 UTC (rev 5284)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/02_mbox-interval.diff	2011-04-02 21:18:50 UTC (rev 5285)
@@ -1,3 +1,7 @@
+Description: fix mbox refresh interval
+Author: Stefan Ott <stefan at ott.net>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572342
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6947
 --- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-mailbox-mbox.c	2008-09-11 06:31:50.000000000 +0200
 +++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-mbox.c	2010-10-06 05:39:15.452009578 +0200
 @@ -341,6 +341,8 @@

Copied: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/03_fix-implicit-dso-linking.patch (from rev 5284, goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/03_fix-implicit-dso-linking.patch)
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/03_fix-implicit-dso-linking.patch	                        (rev 0)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/03_fix-implicit-dso-linking.patch	2011-04-02 21:18:50 UTC (rev 5285)
@@ -0,0 +1,38 @@
+Description: Link against libgcrypt
+Origin: other, http://bugzilla.xfce.org/attachment.cgi?id=3271
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6969
+--- xfce4-mailwatch-plugin-1.1.0.orig/configure.ac
++++ xfce4-mailwatch-plugin-1.1.0/configure.ac
+@@ -81,7 +81,9 @@ dnl check for gnutls support
+ XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl],
+ 	[gnutls support for secure IMAP/POP3 connections], [yes])
+ if test "x$GNUTLS_FOUND" = "xyes"; then
+-	AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled])
++	AM_PATH_LIBGCRYPT([1.4.2], [AC_DEFINE([HAVE_SSL_SUPPORT], [1],
++                                [Define if SSL support is enabled])],
++                               [GNUTLS_FOUND = "no"])
+ fi
+ AM_CONDITIONAL([HAVE_SSL_SUPPORT], [test "x$GNUTLS_FOUND" = "xyes"])
+ 
+--- xfce4-mailwatch-plugin-1.1.0.orig/panel-plugin/Makefile.am
++++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am
+@@ -36,7 +36,8 @@ libmailwatch_la_LIBADD = \
+ 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
+ 	@GTHREAD_LIBS@ \
+ 	@XFCE4_PANEL_LIBS@ \
+-	@GNUTLS_LIBS@
++	@GNUTLS_LIBS@ \
++	@LIBGCRYPT_LIBS@
+ 
+ else
+ 
+@@ -62,7 +63,8 @@ xfce4_mailwatch_plugin_LDADD = \
+ 	@GTHREAD_LIBS@ \
+ 	@LIBXFCE4PANEL_LIBS@ \
+ 	@LIBXFCEGUI4_LIBS@ \
+-	@GNUTLS_LIBS@
++	@GNUTLS_LIBS@ \
++	@LIBGCRYPT_LIBS@
+ 
+ if HAVE_CYGWIN
+   xfce4_mailwatch_plugin_LDFLAGS = \

Copied: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series (from rev 5284, goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/series)
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series	2011-04-02 21:18:50 UTC (rev 5285)
@@ -0,0 +1,4 @@
+01_fix-cpu-usage.diff
+02_mbox-interval.diff
+02_link-with-libxfcegui4.patch
+03_fix-implicit-dso-linking.patch

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/rules	2011-04-02 21:02:24 UTC (rev 5284)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/rules	2011-04-02 21:18:50 UTC (rev 5285)
@@ -1,10 +1,24 @@
 #!/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)
 
+export CFLAGS LDFLAGS
+
+post-patches::
+	NOCONFIGURE=1 xdt-autogen
+
+clean::
+	rm -f $$(find -name 'Makefile.in*')
+	rm -f INSTALL aclocal.m4 compile 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-mailwatch-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la

More information about the Pkg-xfce-commits mailing list