r1307 - in /experimental/evolution-data-server/debian: changelog control patches/45_libcamel_providers_version.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Mon Aug 24 08:11:34 2009
New Revision: 1307

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1307
Log:
* New upstream beta release.
* debian/patches:
  45_libcamel_providers_version refreshed.
* debian/control:
  - update standards version to 3.8.3.

Modified:
    experimental/evolution-data-server/debian/changelog
    experimental/evolution-data-server/debian/control
    experimental/evolution-data-server/debian/patches/45_libcamel_providers_version.patch

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1307&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Mon Aug 24 08:11:34 2009
@@ -1,3 +1,13 @@
+evolution-data-server (2.27.91-1) UNRELEASED; urgency=low
+
+  * New upstream beta release.
+  * debian/patches:
+    45_libcamel_providers_version refreshed.
+  * debian/control:
+    - update standards version to 3.8.3.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 24 Aug 2009 08:20:53 +0200
+
 evolution-data-server (2.27.90-1) experimental; urgency=low
 
   * New upstream releaase candidate.

Modified: experimental/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/control?rev=1307&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/control (original)
+++ experimental/evolution-data-server/debian/control Mon Aug 24 08:11:34 2009
@@ -11,7 +11,7 @@
            Yves-Alexis Perez <corsac at debian.org>,
            Pedro Fragoso <ember at ubuntu.com>,
            Josselin Mouette <joss at debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Dm-Upload-Allowed: yes
 Homepage: http://www.gnome.org/projects/evolution/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution-data-server

Modified: experimental/evolution-data-server/debian/patches/45_libcamel_providers_version.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/45_libcamel_providers_version.patch?rev=1307&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/patches/45_libcamel_providers_version.patch (original)
+++ experimental/evolution-data-server/debian/patches/45_libcamel_providers_version.patch Mon Aug 24 08:11:34 2009
@@ -1,25 +1,26 @@
-diff -ruN evolution-data-server-2.22.0.orig/configure evolution-data-server-2.22.0/configure
---- evolution-data-server-2.22.0.orig/configure	2008-03-09 18:55:24.000000000 +0100
-+++ evolution-data-server-2.22.0/configure	2008-03-11 21:12:06.000000000 +0100
-@@ -31861,7 +31861,7 @@
- weatherdatadir="$privdatadir/weather"
+diff --git a/evolution-data-server-2.27.91/configure b/evolution-data-server-2.27.91/configure
+index c2668d6..299e2ff 100755
+--- a/evolution-data-server-2.27.91/configure
++++ b/evolution-data-server-2.27.91/configure
+@@ -24791,7 +24791,7 @@ if test $use_gweather = yes; then
+ 
+ fi
+ 
+-camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers
++camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCANEL_CURRENT} - ${LIBCAMEL_AGE}`
  
  
+ INTERFACE_VERSION="$BASE_VERSION"
+diff --git a/evolution-data-server-2.27.91/configure.ac b/evolution-data-server-2.27.91/configure.ac
+index c89caff..a9f324d 100644
+--- a/evolution-data-server-2.27.91/configure.ac
++++ b/evolution-data-server-2.27.91/configure.ac
+@@ -1586,7 +1586,7 @@ if test $use_gweather = yes; then
+ fi
+ 
+ dnl separate camel from e-d-s? or should it be under the same spot? same for now.
 -camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers
-+camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCAMEL_CURRENT} - ${LIBCAMEL_AGE}`
- 
- 
- 
-diff -ruN evolution-data-server-2.22.0.orig/configure.ac evolution-data-server-2.22.0/configure.
---- evolution-data-server-2.22.0.orig/configure.ac	2008-03-09 18:18:32.000000000 +0100
-+++ evolution-data-server-2.22.0/configure.ac	2008-03-11 21:13:10.000000000 +0100
-@@ -1519,7 +1519,8 @@
- AC_SUBST(weatherdatadir)
- 
- dnl separate camel from e-d-s?  or should it be under the same spot?  same for now.
--camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers
-+dnl add version to dir to avoid filename conflict between versions  
-+camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCAMEL_CURRENT} - ${LIBCAMEL_AGE}`
++camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCANEL_CURRENT} - ${LIBCAMEL_AGE}`
  AC_SUBST(camel_providerdir)
  
- dnl ************************
+ dnl IDL/Component Versioning