r1913 - in /unstable/evolution/debian: changelog control patches/03_use-libchamplain-0.8.patch patches/series

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Thu Apr 14 09:06:30 UTC 2011 

Author: corsac
Date: Thu Apr 14 09:06:21 2011
New Revision: 1913

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1913
Log:
* debian/control:
  - build-dep against newer libchamplain.                     closes: #622655

Added:
    unstable/evolution/debian/patches/03_use-libchamplain-0.8.patch
Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/control
    unstable/evolution/debian/patches/series

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1913&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Thu Apr 14 09:06:21 2011
@@ -1,3 +1,10 @@
+evolution (2.32.2-3) UNRELEASED; urgency=low
+
+  * debian/control:
+    - build-dep against newer libchamplain.                     closes: #622655
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 14 Apr 2011 09:50:26 +0200
+
 evolution (2.32.2-2) unstable; urgency=low
 
   * debian/patches:

Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=1913&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Thu Apr 14 09:06:21 2011
@@ -70,8 +70,8 @@
                libgtkimageview-dev (>= 1.6),
                gnome-pkg-tools,
                libclutter-gtk-0.10-dev (>= 0.10),
-               libchamplain-0.4-dev,
-               libchamplain-gtk-0.4-dev,
+               libchamplain-0.8-dev,
+               libchamplain-gtk-0.8-dev,
                libgeoclue-dev
 
 Package: evolution

Added: unstable/evolution/debian/patches/03_use-libchamplain-0.8.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/03_use-libchamplain-0.8.patch?rev=1913&op=file
==============================================================================
--- unstable/evolution/debian/patches/03_use-libchamplain-0.8.patch (added)
+++ unstable/evolution/debian/patches/03_use-libchamplain-0.8.patch Thu Apr 14 09:06:21 2011
@@ -1,0 +1,89 @@
+Index: evolution-2.32.2/configure
+===================================================================
+--- evolution-2.32.2.orig/configure	2011-04-14 10:26:39.547571254 +0200
++++ evolution-2.32.2/configure	2011-04-14 10:31:47.436650895 +0200
+@@ -3337,7 +3337,7 @@
+ 	GWEATHER="gweather"
+ 	gweather_minimum_version="2.25.3"
+ 
+-	champlain_minimum_version="0.4"
++	champlain_minimum_version="0.8"
+ 	gtkimageview_minimum_version="1.6"
+ 	libnotify_minimum_version="0.3.0"
+ 
+@@ -20421,6 +20421,75 @@
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHAMPLAIN" >&5
++$as_echo_n "checking for CHAMPLAIN... " >&6; }
++
++if test -n "$CHAMPLAIN_CFLAGS"; then
++    pkg_cv_CHAMPLAIN_CFLAGS="$CHAMPLAIN_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.8 >= \$champlain_minimum_version\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.8 >= $champlain_minimum_version") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_CHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "champlain-gtk-0.8 >= $champlain_minimum_version" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++if test -n "$CHAMPLAIN_LIBS"; then
++    pkg_cv_CHAMPLAIN_LIBS="$CHAMPLAIN_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.8 >= \$champlain_minimum_version\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.8 >= $champlain_minimum_version") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_CHAMPLAIN_LIBS=`$PKG_CONFIG --libs "champlain-gtk-0.8 >= $champlain_minimum_version" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "champlain-gtk-0.8 >= $champlain_minimum_version" 2>&1`
++        else
++	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "champlain-gtk-0.8 >= $champlain_minimum_version" 2>&1`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$CHAMPLAIN_PKG_ERRORS" >&5
++
++	have_champlain=no
++elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++	have_champlain=no
++else
++	CHAMPLAIN_CFLAGS=$pkg_cv_CHAMPLAIN_CFLAGS
++	CHAMPLAIN_LIBS=$pkg_cv_CHAMPLAIN_LIBS
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++	have_champlain=yes
++fi
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHAMPLAIN" >&5
+ $as_echo_n "checking for CHAMPLAIN... " >&6; }
+ 
+ if test -n "$CHAMPLAIN_CFLAGS"; then

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=1913&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series (original)
+++ unstable/evolution/debian/patches/series Thu Apr 14 09:06:21 2011
@@ -1,2 +1,3 @@
 01_let-nss-search-for-nssckbi.patch
 02_remove-disable-deprecated-from-configure.patch
+03_use-libchamplain-0.8.patch

More information about the pkg-evolution-commits mailing list