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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-12-13 20:41:39 +0000 (Mon, 13 Dec 2010)
New Revision: 4720

Added:
   goodies/branches/experimental/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch
Modified:
   goodies/branches/experimental/xfce4-clipman-plugin/debian/changelog
   goodies/branches/experimental/xfce4-clipman-plugin/debian/control
   goodies/branches/experimental/xfce4-clipman-plugin/debian/patches/series
Log:
* 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.

Modified: goodies/branches/experimental/xfce4-clipman-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-clipman-plugin/debian/changelog	2010-12-12 19:28:46 UTC (rev 4719)
+++ goodies/branches/experimental/xfce4-clipman-plugin/debian/changelog	2010-12-13 20:41:39 UTC (rev 4720)
@@ -1,5 +1,6 @@
 xfce4-clipman-plugin (2:1.1.3-4) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * debian/control:
     - add build-dep on libxfcegui4-dev.
     - update standards version to 3.9.1.
@@ -12,6 +13,12 @@
     - add hardening flags to {C,LD}FLAGS
   * Switch to 3.0 (quilt) source format.
 
+  [ Lionel Le Folgoc ]
+  * 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>  Sun, 17 Oct 2010 16:20:05 +0200
 
 xfce4-clipman-plugin (2:1.1.3-3) unstable; urgency=low

Modified: goodies/branches/experimental/xfce4-clipman-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-clipman-plugin/debian/control	2010-12-12 19:28:46 UTC (rev 4719)
+++ goodies/branches/experimental/xfce4-clipman-plugin/debian/control	2010-12-13 20:41:39 UTC (rev 4720)
@@ -6,7 +6,7 @@
  Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0.50~), 
  xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl, intltool,
- libx11-dev, pkg-config, libgtk2.0-dev, libexo-0.3-dev, 
+ libx11-dev, pkg-config, libgtk2.0-dev, libexo-1-dev, 
  libxfconf-0-dev (>= 4.6.0), libglade2-dev, libunique-dev, libxfcegui4-dev,
  hardening-includes
 Standards-Version: 3.9.1

Added: goodies/branches/experimental/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch
===================================================================
--- goodies/branches/experimental/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch	2010-12-13 20:41:39 UTC (rev 4720)
@@ -0,0 +1,69 @@
+Description: Fix build with exo 0.5.x
+Origin: backport, http://bugzilla.xfce.org/attachment.cgi?id=3201
+--- xfce4-clipman-plugin-1.1.3.orig/configure
++++ xfce4-clipman-plugin-1.1.3/configure
+@@ -12435,26 +12435,26 @@ $as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&
+   fi
+ 
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-0.3 >= 0.3.0" >&5
+-$as_echo_n "checking for exo-0.3 >= 0.3.0... " >&6; }
+-  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
+-    EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-1 >= 0.5.0" >&5
++$as_echo_n "checking for exo-1 >= 0.5.0... " >&6; }
++  if $PKG_CONFIG "--atleast-version=0.5.0" "exo-1" >/dev/null 2>&1; then
++    EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_VERSION" >&5
+ $as_echo "$EXO_VERSION" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_CFLAGS" >&5
+ $as_echo_n "checking EXO_CFLAGS... " >&6; }
+-    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
++    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_CFLAGS" >&5
+ $as_echo "$EXO_CFLAGS" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_LIBS" >&5
+ $as_echo_n "checking EXO_LIBS... " >&6; }
+-    EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
++    EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_LIBS" >&5
+ $as_echo "$EXO_LIBS" >&6; }
+ 
+-    EXO_REQUIRED_VERSION=0.3.0
++    EXO_REQUIRED_VERSION=0.5.0
+ 
+ 
+ 
+@@ -12462,15 +12462,15 @@ $as_echo "$EXO_LIBS" >&6; }
+ 
+ 
+ 
+-  elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
+-    xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
++  elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
++    xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
+ $as_echo "found, but $xdt_cv_version" >&6; }
+ 
+ 
+-      echo "*** The required package exo-0.3 was found on your system,"
++      echo "*** The required package exo-1 was found on your system,"
+       echo "*** but the installed version ($xdt_cv_version) is too old."
+-      echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
++      echo "*** Please upgrade exo-1 to atleast version 0.5.0, or adjust"
+       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+       echo "*** the new version of the package in a nonstandard prefix so"
+       echo "*** pkg-config is able to find it."
+@@ -12481,8 +12481,8 @@ $as_echo "found, but $xdt_cv_version" >&
+ $as_echo "not found" >&6; }
+ 
+ 
+-      echo "*** The required package exo-0.3 was not found on your system."
+-      echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
++      echo "*** The required package exo-1 was not found on your system."
++      echo "*** Please install exo-1 (atleast version 0.5.0) or adjust"
+       echo "*** the PKG_CONFIG_PATH environment variable if you"
+       echo "*** installed the package in a nonstandard prefix so that"
+       echo "*** pkg-config is able to find it."

Modified: goodies/branches/experimental/xfce4-clipman-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-clipman-plugin/debian/patches/series	2010-12-12 19:28:46 UTC (rev 4719)
+++ goodies/branches/experimental/xfce4-clipman-plugin/debian/patches/series	2010-12-13 20:41:39 UTC (rev 4720)
@@ -1 +1,2 @@
 0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
+02_use-exo-1.patch