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

Evgeni Golov evgeni at alioth.debian.org
Tue Oct 18 02:04:33 UTC 2011


Author: evgeni
Date: 2011-10-18 14:04:33 +0000 (Tue, 18 Oct 2011)
New Revision: 6135

Added:
   goodies/trunk/xfce4-indicator-plugin/debian/patches/search-for-indicator-0.4-pc.patch
Modified:
   goodies/trunk/xfce4-indicator-plugin/debian/changelog
   goodies/trunk/xfce4-indicator-plugin/debian/control
   goodies/trunk/xfce4-indicator-plugin/debian/patches/series
Log:
prepare for indicator-0.4


Modified: goodies/trunk/xfce4-indicator-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/changelog	2011-10-17 18:13:35 UTC (rev 6134)
+++ goodies/trunk/xfce4-indicator-plugin/debian/changelog	2011-10-18 14:04:33 UTC (rev 6135)
@@ -1,3 +1,11 @@
+xfce4-indicator-plugin (0.3.1-3) UNRELEASED; urgency=low
+
+  * Add search-for-indicator-0.4-pc.patch from Ubuntu,
+    libindicator-dev moved the .pc file.
+  * Build-Depend on libindicator-dev (>=0.3.90)
+
+ -- Evgeni Golov <evgeni at debian.org>  Tue, 18 Oct 2011 16:00:22 +0200
+
 xfce4-indicator-plugin (0.3.1-2) unstable; urgency=low
 
   * Add fix_menu_position.patch and 

Modified: goodies/trunk/xfce4-indicator-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/control	2011-10-17 18:13:35 UTC (rev 6134)
+++ goodies/trunk/xfce4-indicator-plugin/debian/control	2011-10-18 14:04:33 UTC (rev 6135)
@@ -5,7 +5,7 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Evgeni Golov <evgeni at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev (>= 4.8.0),
- libindicator-dev (>=0.3.0), intltool, hardening-includes
+ libindicator-dev (>=0.3.90), intltool, hardening-includes
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/

Added: goodies/trunk/xfce4-indicator-plugin/debian/patches/search-for-indicator-0.4-pc.patch
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/search-for-indicator-0.4-pc.patch	                        (rev 0)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/search-for-indicator-0.4-pc.patch	2011-10-18 14:04:33 UTC (rev 6135)
@@ -0,0 +1,97 @@
+Search for the renamed libindicator .pc file
+
+--- xfce4-indicator-plugin-0.2.1.orig/configure.in
++++ xfce4-indicator-plugin-0.2.1/configure.in
+@@ -69,7 +69,7 @@ dnl ***********************************
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2])
+-XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.3.0])
++XDT_CHECK_PACKAGE([INDICATOR], [indicator-0.4], [0.3.0])
+ 
+ dnl ***********************************
+ dnl *** Check for debugging support ***
+@@ -79,8 +79,8 @@ XDT_FEATURE_DEBUG()
+ dnl ***********************
+ dnl *** Indicator info ***
+ dnl ***********************
+-INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
+-INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
++INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
++INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
+ 
+ AC_SUBST(INDICATORDIR)
+ AC_SUBST(INDICATORICONSDIR)
+--- xfce4-indicator-plugin-0.2.1.orig/configure
++++ xfce4-indicator-plugin-0.2.1/configure
+@@ -13245,22 +13245,22 @@ $as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&
+   fi
+ 
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for indicator >= 0.3.0" >&5
+-$as_echo_n "checking for indicator >= 0.3.0... " >&6; }
+-  if $PKG_CONFIG "--atleast-version=0.3.0" "indicator" >/dev/null 2>&1; then
+-    INDICATOR_VERSION=`$PKG_CONFIG --modversion "indicator"`
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for indicator-0.4 >= 0.3.0" >&5
++$as_echo_n "checking for indicator-0.4 >= 0.3.0... " >&6; }
++  if $PKG_CONFIG "--atleast-version=0.3.0" "indicator-0.4" >/dev/null 2>&1; then
++    INDICATOR_VERSION=`$PKG_CONFIG --modversion "indicator-0.4"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INDICATOR_VERSION" >&5
+ $as_echo "$INDICATOR_VERSION" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking INDICATOR_CFLAGS" >&5
+ $as_echo_n "checking INDICATOR_CFLAGS... " >&6; }
+-    INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "indicator"`
++    INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "indicator-0.4"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INDICATOR_CFLAGS" >&5
+ $as_echo "$INDICATOR_CFLAGS" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking INDICATOR_LIBS" >&5
+ $as_echo_n "checking INDICATOR_LIBS... " >&6; }
+-    INDICATOR_LIBS=`$PKG_CONFIG --libs "indicator"`
++    INDICATOR_LIBS=`$PKG_CONFIG --libs "indicator-0.4"`
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INDICATOR_LIBS" >&5
+ $as_echo "$INDICATOR_LIBS" >&6; }
+ 
+@@ -13272,15 +13272,15 @@ $as_echo "$INDICATOR_LIBS" >&6; }
+ 
+ 
+ 
+-  elif $PKG_CONFIG --exists "indicator" >/dev/null 2>&1; then
+-    xdt_cv_version=`$PKG_CONFIG --modversion "indicator"`
++  elif $PKG_CONFIG --exists "indicator-0.4" >/dev/null 2>&1; then
++    xdt_cv_version=`$PKG_CONFIG --modversion "indicator-0.4"`
+     { $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 indicator was found on your system,"
++      echo "*** The required package indicator-0.4 was found on your system,"
+       echo "*** but the installed version ($xdt_cv_version) is too old."
+-      echo "*** Please upgrade indicator to atleast version 0.3.0, or adjust"
++      echo "*** Please upgrade indicator-0.4 to atleast version 0.3.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."
+@@ -13291,8 +13291,8 @@ $as_echo "found, but $xdt_cv_version" >&
+ $as_echo "not found" >&6; }
+ 
+ 
+-      echo "*** The required package indicator was not found on your system."
+-      echo "*** Please install indicator (atleast version 0.3.0) or adjust"
++      echo "*** The required package indicator-0.4 was not found on your system."
++      echo "*** Please install indicator-0.4 (atleast version 0.3.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."
+@@ -13390,8 +13390,8 @@ $as_echo "minimum" >&6; }
+   fi
+ 
+ 
+-INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
+-INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
++INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
++INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
+ 
+ 
+ 

Modified: goodies/trunk/xfce4-indicator-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/series	2011-10-17 18:13:35 UTC (rev 6134)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/series	2011-10-18 14:04:33 UTC (rev 6135)
@@ -1,3 +1,4 @@
 fix_menu_position.patch
 attach_button_to_menu_right_at_the_beginning.patch
 potfiles.patch
+search-for-indicator-0.4-pc.patch




More information about the Pkg-xfce-commits mailing list