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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-04 14:06:30 +0000 (Thu, 04 Nov 2010)
New Revision: 4400

Added:
   goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch
Modified:
   goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog
   goodies/branches/experimental/xfce4-mailwatch-plugin/debian/control
   goodies/branches/experimental/xfce4-mailwatch-plugin/debian/rules
Log:
* debian/patches:
  - 02_link-with-libxfcegui4, links against libxfcegui4 since xfce4-panel
    doesn't brings the flags anymore.

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog	2010-11-04 13:58:05 UTC (rev 4399)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog	2010-11-04 14:06:30 UTC (rev 4400)
@@ -1,3 +1,11 @@
+xfce4-mailwatch-plugin (1.1.0-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 02_link-with-libxfcegui4, links against libxfcegui4 since xfce4-panel
+      doesn't brings the flags anymore.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 14:35:22 +0100
+
 xfce4-mailwatch-plugin (1.1.0-2) unstable; urgency=low
 
   * debian/patches:

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/control	2010-11-04 13:58:05 UTC (rev 4399)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/control	2010-11-04 14:06:30 UTC (rev 4400)
@@ -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
 Standards-Version: 3.8.1
 Homepage: http://spuriousinterrupt.org/projects/mailwatch
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/xfce4-mailwatch-plugin/

Added: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/02_link-with-libxfcegui4.patch	2010-11-04 14:06:30 UTC (rev 4400)
@@ -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
+ 

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/rules	2010-11-04 13:58:05 UTC (rev 4399)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/rules	2010-11-04 14:06:30 UTC (rev 4400)
@@ -5,6 +5,9 @@
 
 LDFLAGS+=-Wl,-z,-defs -Wl,--as-needed
 
+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