r29603 - in /packages/unstable/eog-plugins/debian: changelog control control.in patches/ patches/01_libchamplain_0.12.patch patches/series

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Tue Sep 6 20:10:46 UTC 2011


Author: bigon
Date: Tue Sep  6 20:10:45 2011
New Revision: 29603

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29603
Log:
* debian/patches/01_libchamplain_0.12.patch: Build with libchamplain-0.12
* debian/control.in: Bump libchamplain build-dependencies

Added:
    packages/unstable/eog-plugins/debian/patches/
    packages/unstable/eog-plugins/debian/patches/01_libchamplain_0.12.patch
    packages/unstable/eog-plugins/debian/patches/series
Modified:
    packages/unstable/eog-plugins/debian/changelog
    packages/unstable/eog-plugins/debian/control
    packages/unstable/eog-plugins/debian/control.in

Modified: packages/unstable/eog-plugins/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/changelog?rev=29603&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/changelog [utf-8] (original)
+++ packages/unstable/eog-plugins/debian/changelog [utf-8] Tue Sep  6 20:10:45 2011
@@ -1,3 +1,10 @@
+eog-plugins (3.0.0-3) UNRELEASED; urgency=low
+
+  * debian/patches/01_libchamplain_0.12.patch: Build with libchamplain-0.12
+  * debian/control.in: Bump libchamplain build-dependencies
+
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 06 Sep 2011 22:08:28 +0200
+
 eog-plugins (3.0.0-2) unstable; urgency=low
 
   * debian/control.in:

Modified: packages/unstable/eog-plugins/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/control?rev=29603&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/control [utf-8] (original)
+++ packages/unstable/eog-plugins/debian/control [utf-8] Tue Sep  6 20:10:45 2011
@@ -14,8 +14,8 @@
                python-dev (>= 2.6.6-3~),
                postr,
                libgdata-dev (>= 0.6),
-               libchamplain-0.10-dev (>= 0.9.0),
-               libchamplain-gtk-0.10-dev (>= 0.9.0),
+               libchamplain-0.12-dev,
+               libchamplain-gtk-0.12-dev,
                libclutter-gtk-1.0-dev (>= 0.90),
                libexif-dev (>= 0.6.16)
 Standards-Version: 3.9.2
@@ -37,12 +37,12 @@
  eog-plugins contain a set of plugins for eog, Eye of GNOME.
  .
  The following plugins are included:
+  * Slideshow Shuffle: Shuffles images in slideshow mode
+  * Send By Mail: Sends an image attached to a new mail
+  * Map: Display the geolocation of the image on a map
+  * Python Console: Python console for Eye of GNOME
+  * Flickr Uploader: Upload your pictures to Flickr
+  * Exif display: Displays camera settings and histogram
   * Zoom to fit image width: Zoom to fit image width
-  * Flickr Uploader: Upload your pictures to Flickr
-  * Slideshow Shuffle: Shuffles images in slideshow mode
   * PicasaWeb Uploader: Upload your pictures to PicasaWeb
-  * Exif display: Displays camera settings and histogram
-  * Map: Display the geolocation of the image on a map
-  * Send By Mail: Sends an image attached to a new mail
-  * Python Console: Python console for Eye of GNOME
  

Modified: packages/unstable/eog-plugins/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/control.in?rev=29603&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/control.in [utf-8] (original)
+++ packages/unstable/eog-plugins/debian/control.in [utf-8] Tue Sep  6 20:10:45 2011
@@ -14,8 +14,8 @@
                python-dev (>= 2.6.6-3~),
                postr,
                libgdata-dev (>= 0.6),
-               libchamplain-0.10-dev (>= 0.9.0),
-               libchamplain-gtk-0.10-dev (>= 0.9.0),
+               libchamplain-0.12-dev,
+               libchamplain-gtk-0.12-dev,
                libclutter-gtk-1.0-dev (>= 0.90),
                libexif-dev (>= 0.6.16)
 Standards-Version: 3.9.2

Added: packages/unstable/eog-plugins/debian/patches/01_libchamplain_0.12.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/patches/01_libchamplain_0.12.patch?rev=29603&op=file
==============================================================================
--- packages/unstable/eog-plugins/debian/patches/01_libchamplain_0.12.patch (added)
+++ packages/unstable/eog-plugins/debian/patches/01_libchamplain_0.12.patch [utf-8] Tue Sep  6 20:10:45 2011
@@ -1,0 +1,85 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -261,8 +261,8 @@
+ then
+ 	
+ 	PKG_CHECK_MODULES(CHAMPLAIN,
+-		[ champlain-0.10 >= 0.9.0,
+-		  champlain-gtk-0.10 >= 0.9.0,
++		[ champlain-0.12,
++		  champlain-gtk-0.12,
+ 		  clutter-gtk-1.0 >= 0.90,
+ 		  libexif >= 0.6.16 ],
+ 		[],[have_libchamplain=no])
+--- a/configure
++++ b/configure
+@@ -14559,19 +14559,19 @@
+     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-0.10 >= 0.9.0,
+-		  champlain-gtk-0.10 >= 0.9.0,
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.12,
++		  champlain-gtk-0.12,
+ 		  clutter-gtk-1.0 >= 0.90,
+ 		  libexif >= 0.6.16 \""; } >&5
+-  ($PKG_CONFIG --exists --print-errors " champlain-0.10 >= 0.9.0,
+-		  champlain-gtk-0.10 >= 0.9.0,
++  ($PKG_CONFIG --exists --print-errors " champlain-0.12,
++		  champlain-gtk-0.12,
+ 		  clutter-gtk-1.0 >= 0.90,
+ 		  libexif >= 0.6.16 ") 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-0.10 >= 0.9.0,
+-		  champlain-gtk-0.10 >= 0.9.0,
++  pkg_cv_CHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags " champlain-0.12,
++		  champlain-gtk-0.12,
+ 		  clutter-gtk-1.0 >= 0.90,
+ 		  libexif >= 0.6.16 " 2>/dev/null`
+ else
+@@ -14584,19 +14584,19 @@
+     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-0.10 >= 0.9.0,
+-		  champlain-gtk-0.10 >= 0.9.0,
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.12,
++		  champlain-gtk-0.12,
+ 		  clutter-gtk-1.0 >= 0.90,
+ 		  libexif >= 0.6.16 \""; } >&5
+-  ($PKG_CONFIG --exists --print-errors " champlain-0.10 >= 0.9.0,
+-		  champlain-gtk-0.10 >= 0.9.0,
++  ($PKG_CONFIG --exists --print-errors " champlain-0.12,
++		  champlain-gtk-0.12,
+ 		  clutter-gtk-1.0 >= 0.90,
+ 		  libexif >= 0.6.16 ") 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-0.10 >= 0.9.0,
+-		  champlain-gtk-0.10 >= 0.9.0,
++  pkg_cv_CHAMPLAIN_LIBS=`$PKG_CONFIG --libs " champlain-0.12,
++		  champlain-gtk-0.12,
+ 		  clutter-gtk-1.0 >= 0.90,
+ 		  libexif >= 0.6.16 " 2>/dev/null`
+ else
+@@ -14618,13 +14618,13 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " champlain-0.10 >= 0.9.0,
+-		  champlain-gtk-0.10 >= 0.9.0,
++	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " champlain-0.12,
++		  champlain-gtk-0.12,
+ 		  clutter-gtk-1.0 >= 0.90,
+ 		  libexif >= 0.6.16 " 2>&1`
+         else
+-	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors " champlain-0.10 >= 0.9.0,
+-		  champlain-gtk-0.10 >= 0.9.0,
++	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors " champlain-0.12,
++		  champlain-gtk-0.12,
+ 		  clutter-gtk-1.0 >= 0.90,
+ 		  libexif >= 0.6.16 " 2>&1`
+         fi

Added: packages/unstable/eog-plugins/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/patches/series?rev=29603&op=file
==============================================================================
--- packages/unstable/eog-plugins/debian/patches/series (added)
+++ packages/unstable/eog-plugins/debian/patches/series [utf-8] Tue Sep  6 20:10:45 2011
@@ -1,0 +1,1 @@
+01_libchamplain_0.12.patch




More information about the pkg-gnome-commits mailing list