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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-06 02:35:49 +0000 (Sat, 06 Nov 2010)
New Revision: 4486

Added:
   goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/03_link-against-libxfcegui4.patch
Modified:
   goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog
   goodies/branches/experimental/xfce4-wavelan-plugin/debian/control
Log:
* debian/control:
  - add build-dep on libxfcegui4-dev.
* debian/patches:
  - 03_link-against-libxfcegui4 added, link against libxfcegui4.

Modified: goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog	2010-11-06 02:29:19 UTC (rev 4485)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog	2010-11-06 02:35:49 UTC (rev 4486)
@@ -1,3 +1,12 @@
+xfce4-wavelan-plugin (0.5.5-4) UNRELEASED; urgency=low
+
+  * debian/control:
+    - add build-dep on libxfcegui4-dev.
+  * debian/patches:
+    - 03_link-against-libxfcegui4 added, link against libxfcegui4.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 03:35:31 +0100
+
 xfce4-wavelan-plugin (0.5.5-3) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/branches/experimental/xfce4-wavelan-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/control	2010-11-06 02:29:19 UTC (rev 4485)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/control	2010-11-06 02:35:49 UTC (rev 4486)
@@ -5,7 +5,8 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, 
  Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7), 
- xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl, intltool
+ xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl, intltool,
+ libxfcegui4-dev
 Standards-Version: 3.8.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-wavelan-plugin/

Added: goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/03_link-against-libxfcegui4.patch
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/03_link-against-libxfcegui4.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/03_link-against-libxfcegui4.patch	2010-11-06 02:35:49 UTC (rev 4486)
@@ -0,0 +1,43 @@
+commit d7f5b8bd8e2b1c5d8fc1e9db8e6f4c8364cdb2c4
+Author: Landry Breuil <landry at rhaalovely.net>
+Date:   Sun Aug 8 10:58:49 2010 +0200
+
+    Add libxfcegui4 cflags/libs checks to fix build with xfce4-panel 4.7.
+    Bug #6615.
+
+diff --git a/configure.in.in b/configure.in.in
+index a61f2ad..c95bac8 100644
+--- a/configure.in.in
++++ b/configure.in.in
+@@ -50,6 +50,7 @@ XDT_I18N([@LINGUAS@])
+ dnl configure the panel plugin
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.20])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ 
+ dnl Check for debugging support
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index a54e647..5e06216 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -11,7 +11,8 @@ plugin_PROGRAMS = xfce4-wavelan-plugin
+ #	libwavelan.la
+ 
+ xfce4_wavelan_plugin_LDFLAGS =							\
+-				@LIBXFCE4PANEL_LIBS@
++				@LIBXFCE4PANEL_LIBS@				\
++				@LIBXFCEGUI4L_LIBS@
+ 
+ xfce4_wavelan_plugin_SOURCES =							\
+ 	wavelan.c							\
+@@ -21,7 +22,8 @@ xfce4_wavelan_plugin_SOURCES =							\
+ 	wi_linux.c
+ 
+ xfce4_wavelan_plugin_CFLAGS =							\
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@							\
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ # .desktop file
+ #