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

Sat Apr 2 09:31:11 UTC 2011

Author: mrpouit-guest
Date: 2011-04-02 21:31:04 +0000 (Sat, 02 Apr 2011)
New Revision: 5291

Added:
   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
   goodies/trunk/xfce4-mpc-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-mpc-plugin/
   goodies/trunk/xfce4-mpc-plugin/debian/changelog
   goodies/trunk/xfce4-mpc-plugin/debian/control
   goodies/trunk/xfce4-mpc-plugin/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-mpc-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-mpc-plugin:4344-5290
/goodies/tags/xfce4-mpc-plugin/0.3.5-1:4106-4343

Modified: goodies/trunk/xfce4-mpc-plugin/debian/changelog
===================================================================

--- goodies/trunk/xfce4-mpc-plugin/debian/changelog	2011-04-02 21:28:17 UTC (rev 5290)
+++ goodies/trunk/xfce4-mpc-plugin/debian/changelog	2011-04-02 21:31:04 UTC (rev 5291)
@@ -1,10 +1,28 @@
 xfce4-mpc-plugin (0.3.5-2) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
+  * debian/patches:
+    - 01_link-with-libxfcegui4 added, link against libxfcegui4-dev now that
+      xfce4-panel won't do it.
+  * Switch to 3.0 (quilt) source format.
   * debian/control:
-    - switch section to xfce.
+    - add build-dep on libxfcegui4-dev.
+    - add build-dep on xfce4-dev-tools and libtool to run xdt-autogen after
+      patching.
+    - update standards version to 3.9.1.
+  * debian/rules:
+    - run xdt-autogen after applying patches touching Makefile.am and
+      configure.in.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 30 May 2010 18:35:57 +0200
+  [ Lionel Le Folgoc ]
+  * debian/rules: clean up autogenerated files changed by xdt-autogen.
+  * Port to exo 0.5.x:
+    - debian/patches/02_use-exo-1.patch: added.
+    - debian/patches/series: refreshed.
+    - debian/control: change libexo-0.3-dev b-dep to libexo-1-dev.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 12:45:44 +0100
+
 xfce4-mpc-plugin (0.3.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: goodies/trunk/xfce4-mpc-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/control	2011-04-02 21:28:17 UTC (rev 5290)
+++ goodies/trunk/xfce4-mpc-plugin/debian/control	2011-04-02 21:31:04 UTC (rev 5291)
@@ -5,9 +5,9 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, 
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), xfce4-panel-dev, libexo-0.3-dev, 
- libxml-parser-perl, intltool
-Standards-Version: 3.8.4
+Build-Depends: cdbs, debhelper (>= 7), xfce4-panel-dev, libexo-1-dev, 
+ libxml-parser-perl, intltool, libxfcegui4-dev, xfce4-dev-tools, libtool
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mpc-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-mpc-plugin/

Copied: goodies/trunk/xfce4-mpc-plugin/debian/patches/01_link-with-libxfcegui4.patch (from rev 5290, goodies/branches/experimental/xfce4-mpc-plugin/debian/patches/01_link-with-libxfcegui4.patch)
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/patches/01_link-with-libxfcegui4.patch	                        (rev 0)
+++ goodies/trunk/xfce4-mpc-plugin/debian/patches/01_link-with-libxfcegui4.patch	2011-04-02 21:31:04 UTC (rev 5291)
@@ -0,0 +1,32 @@
+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@
+ 
+ 

Copied: goodies/trunk/xfce4-mpc-plugin/debian/patches/02_use-exo-1.patch (from rev 5290, goodies/branches/experimental/xfce4-mpc-plugin/debian/patches/02_use-exo-1.patch)
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/patches/02_use-exo-1.patch	                        (rev 0)
+++ goodies/trunk/xfce4-mpc-plugin/debian/patches/02_use-exo-1.patch	2011-04-02 21:31:04 UTC (rev 5291)
@@ -0,0 +1,13 @@
+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,

Copied: goodies/trunk/xfce4-mpc-plugin/debian/patches/series (from rev 5290, goodies/branches/experimental/xfce4-mpc-plugin/debian/patches/series)
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-mpc-plugin/debian/patches/series	2011-04-02 21:31:04 UTC (rev 5291)
@@ -0,0 +1,2 @@
+01_link-with-libxfcegui4.patch
+02_use-exo-1.patch

Modified: goodies/trunk/xfce4-mpc-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/rules	2011-04-02 21:28:17 UTC (rev 5290)
+++ goodies/trunk/xfce4-mpc-plugin/debian/rules	2011-04-02 21:31:04 UTC (rev 5291)
@@ -1,6 +1,14 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+post-patches::
+	NOCONFIGURE=1 xdt-autogen
+
+clean::
+	rm -f $$(find -name 'Makefile.in*')
+	rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh
+	rm -f intltool-extract.in intltool-merge.in intltool-update.in
+	rm -f missing mkinstalldirs
+
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-libmpd


