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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-29 06:18:09 +0000 (Fri, 29 Apr 2011)
New Revision: 5716

Removed:
   goodies/trunk/xfce4-mpc-plugin/debian/patches/01_link-with-libxfcegui4.patch
   goodies/trunk/xfce4-mpc-plugin/debian/patches/02_use-exo-1.patch
   goodies/trunk/xfce4-mpc-plugin/debian/patches/series
Modified:
   goodies/trunk/xfce4-mpc-plugin/debian/changelog
Log:
* debian/patches:
  - 01_link-with-libxfcegui4, 02_use-exo-1 dropped, included upstream.

Modified: goodies/trunk/xfce4-mpc-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/changelog	2011-04-29 06:16:56 UTC (rev 5715)
+++ goodies/trunk/xfce4-mpc-plugin/debian/changelog	2011-04-29 06:18:09 UTC (rev 5716)
@@ -1,9 +1,12 @@
 xfce4-mpc-plugin (0.3.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - 01_link-with-libxfcegui4, 02_use-exo-1 dropped, included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 08:12:18 +0200
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 08:17:39 +0200
+
 xfce4-mpc-plugin (0.3.5-2) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Deleted: goodies/trunk/xfce4-mpc-plugin/debian/patches/01_link-with-libxfcegui4.patch
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/patches/01_link-with-libxfcegui4.patch	2011-04-29 06:16:56 UTC (rev 5715)
+++ goodies/trunk/xfce4-mpc-plugin/debian/patches/01_link-with-libxfcegui4.patch	2011-04-29 06:18:09 UTC (rev 5716)
@@ -1,32 +0,0 @@
-Description: fix build against xfce4-panel by linking to libxfcegui4
-Author: Yves-Alexis Perez <corsac at debian.org>
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6962
-diff --git a/configure.ac b/configure.ac
-index 7b9e80e..d128afb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,6 +35,7 @@ AC_HEADER_STDC
- 
- dnl configure the panel plugin
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4])
- XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1])
- 
- dnl check for libmpd presence
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index d81a4c9..8139f28 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -4,10 +4,12 @@ plugin_PROGRAMS = xfce4-mpc-plugin
- xfce4_mpc_plugin_CFLAGS =						\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
- 	@EXO_CFLAGS@							\
-+	@LIBXFCEGUI4_CFLAGS@							\
- 	@LIBXFCE4PANEL_CFLAGS@
- 
- xfce4_mpc_plugin_LDADD =						\
- 	@EXO_LIBS@							\
-+	@LIBXFCEGUI4_LIBS@							\
- 	@LIBXFCE4PANEL_LIBS@
- 
- 

Deleted: goodies/trunk/xfce4-mpc-plugin/debian/patches/02_use-exo-1.patch
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/patches/02_use-exo-1.patch	2011-04-29 06:16:56 UTC (rev 5715)
+++ goodies/trunk/xfce4-mpc-plugin/debian/patches/02_use-exo-1.patch	2011-04-29 06:18:09 UTC (rev 5716)
@@ -1,13 +0,0 @@
-Description: Fix build with exo 0.5.x
-Origin: backport, http://git.xfce.org/panel-plugins/xfce4-mpc-plugin/commit/?id=b3a3084ffe72cbd4e576c282c666365c792718b0
---- xfce4-mpc-plugin-0.3.5.orig/configure.ac
-+++ xfce4-mpc-plugin-0.3.5/configure.ac
-@@ -41,7 +41,7 @@ AC_HEADER_STDC
- dnl configure the panel plugin
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
- XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4])
--XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1])
-+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
- 
- dnl check for libmpd presence
- AC_ARG_WITH(libmpd,

Deleted: goodies/trunk/xfce4-mpc-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/patches/series	2011-04-29 06:16:56 UTC (rev 5715)
+++ goodies/trunk/xfce4-mpc-plugin/debian/patches/series	2011-04-29 06:18:09 UTC (rev 5716)
@@ -1,2 +0,0 @@
-01_link-with-libxfcegui4.patch
-02_use-exo-1.patch