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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-04 09:37:14 +0000 (Thu, 04 Nov 2010)
New Revision: 4380

Added:
   goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/02_fix-libtool.patch
Modified:
   goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog
   goodies/branches/experimental/xfce4-diskperf-plugin/debian/control
   goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/01_fix-linking-libxfcegui4.patch
   goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/series
   goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules
Log:
  - add build-dep on xfce4-dev-tools because of the patch 
    touching configure.in.
  - 02_fix-libtool added, fix an error with libtool calling inside
    autoreconf.
* debian/rules:
  - run xdt-autogen after patching.

Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog	2010-11-04 09:29:22 UTC (rev 4379)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog	2010-11-04 09:37:14 UTC (rev 4380)
@@ -4,11 +4,17 @@
     - add build-dep on libxfcegui4-dev now that it's gone from
       xfce4-panel-dev dependencies.
     - update standards version to 3.9.1.
+    - add build-dep on xfce4-dev-tools because of the patch 
+      touching configure.in.
   * debian/patches:
     - 01_fix-linking-libxfcegui4 added, fix linking with libxfcegui4.
+    - 02_fix-libtool added, fix an error with libtool calling inside
+      autoreconf.
   * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - run xdt-autogen after patching.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 03 Nov 2010 22:02:29 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 03 Nov 2010 22:40:53 +0100
 
 xfce4-diskperf-plugin (2.2.0-3) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/control	2010-11-04 09:29:22 UTC (rev 4379)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/control	2010-11-04 09:37:14 UTC (rev 4380)
@@ -4,7 +4,8 @@
 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>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7), xfce4-panel-dev, 
- libxml2-dev, libxml-parser-perl, libxfcegui4-dev
+ libxml2-dev, libxml-parser-perl, libxfcegui4-dev, xfce4-dev-tools, intltool,
+ libtool
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-diskperf-plugin/

Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/01_fix-linking-libxfcegui4.patch
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/01_fix-linking-libxfcegui4.patch	2010-11-04 09:29:22 UTC (rev 4379)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/01_fix-linking-libxfcegui4.patch	2010-11-04 09:37:14 UTC (rev 4380)
@@ -6,10 +6,10 @@
     compilation with xfce4-panel 4.7. (Bug #6609)
     Still needs to be converted to libxfce4ui though..
 
-diff --git a/configure.in.in b/configure.in.in
+diff --git a/configure.in b/configure.in
 index 6ea6bfb..8bbcf55 100644
---- a/configure.in.in
-+++ b/configure.in.in
+--- a/configure.in
++++ b/configure.in
 @@ -52,6 +52,7 @@ dnl ***********************************
  dnl *** Check for required packages ***
  dnl ***********************************

Added: goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/02_fix-libtool.patch
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/02_fix-libtool.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/02_fix-libtool.patch	2010-11-04 09:37:14 UTC (rev 4380)
@@ -0,0 +1,21 @@
+commit 2f7d6e565e9ce842a160cfdc9f0688222bdad560
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Sun Feb 22 10:43:52 2009 +0000
+
+    	* Call AC_PROG_LIBTOOL inside autoconf script
+    
+    
+    (Old svn revision: 6750)
+
+diff --git a/configure.in b/configure.in
+index bc57a34..8155ab9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -35,6 +35,7 @@ dnl ********************************
+ AC_PROG_CC()
+ AC_PROG_LD()
+ AC_PROG_INSTALL()
++AC_PROG_LIBTOOL()
+ AC_PROG_INTLTOOL()
+ 
+ dnl **********************************

Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/series	2010-11-04 09:29:22 UTC (rev 4379)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/series	2010-11-04 09:37:14 UTC (rev 4380)
@@ -1 +1,2 @@
 01_fix-linking-libxfcegui4.patch
+02_fix-libtool.patch

Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules	2010-11-04 09:29:22 UTC (rev 4379)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules	2010-11-04 09:37:14 UTC (rev 4380)
@@ -2,6 +2,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+post-patches::
+	NOCONFIGURE=1 xdt-autogen
+
 binary-post-install/xfce4-diskperf-plugin::
 	-rm -rf debian/xfce4-diskperf-plugin/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/xfce4-diskperf-plugin/usr/lib/xfce4/panel-plugins/*.la