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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-12-05 16:01:54 +0000 (Sun, 05 Dec 2010)
New Revision: 4633

Removed:
   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/patches/series
Log:
drop patch included upstream


Modified: goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog	2010-12-05 16:00:18 UTC (rev 4632)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog	2010-12-05 16:01:54 UTC (rev 4633)
@@ -6,7 +6,6 @@
     - add build-dep on xfce4-dev-tools and libtool.
   * debian/patches:
     - 01_fix-tooltips-gtk2.16 dropped, included upstream.
-    - 03_link-against-libxfcegui4 added, link against libxfcegui4.
   * debian/rules:
     - run xdt-autogen after applying patches touching
       configure.in/Makefile.am.
@@ -15,7 +14,7 @@
     - add hardening flags to {C,LD}FLAGS.
   * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Dec 2010 16:59:22 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Dec 2010 17:01:02 +0100
 
 xfce4-wavelan-plugin (0.5.5-3) unstable; urgency=low
 

Deleted: 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	2010-12-05 16:00:18 UTC (rev 4632)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/03_link-against-libxfcegui4.patch	2010-12-05 16:01:54 UTC (rev 4633)
@@ -1,43 +0,0 @@
-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 b/configure.in
-index a61f2ad..c95bac8 100644
---- a/configure.in
-+++ b/configure.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@				\
-+				@LIBXFCEGUI4_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
- #

Modified: goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/series	2010-12-05 16:00:18 UTC (rev 4632)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/series	2010-12-05 16:01:54 UTC (rev 4633)
@@ -1,2 +1 @@
 02_fix-ftbfs-kfreebsd.patch
-03_link-against-libxfcegui4.patch