r1665 - in /unstable/evolution-data-server/debian: changelog patches/45_libcamel_providers_version.patch patches/series rules source/ source/format

[corsac at users.alioth.debian.org]

Author: corsac
Date: Tue Jun 22 06:30:53 2010
New Revision: 1665

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1665
Log:
  - 45_libcamel_providers_version refreshed.
* Switch to 3.0 (quilt) format.

Added:
    unstable/evolution-data-server/debian/patches/series
    unstable/evolution-data-server/debian/source/
    unstable/evolution-data-server/debian/source/format
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch
    unstable/evolution-data-server/debian/rules

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=1665&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Tue Jun 22 06:30:53 2010
@@ -10,11 +10,13 @@
     - 01_unitialized_key, 02_fix-warning-in_source_get_uri, 
       03_bump-soname-libedataserver dropped, included upstream.
     - 25_mute-debug-messages updated.
+    - 45_libcamel_providers_version refreshed.
   * debian/libcamel1.2-14.shlibs updated for 2.30.2.
   * debian/control:
     - bump debhelper build-dep to 7.2.3 for dh_bugfiles.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 21 Jun 2010 00:19:01 +0200
+  * Switch to 3.0 (quilt) format.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 22 Jun 2010 07:45:29 +0200
 
 evolution-data-server (2.30.1-5) unstable; urgency=low
 

Modified: unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch?rev=1665&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch (original)
+++ unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch Tue Jun 22 06:30:53 2010
@@ -1,21 +1,21 @@
-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
+diff --git a/configure b/configure
+index a1cd865..ac10dc5 100755
+--- a/configure
++++ b/configure
+@@ -18943,7 +18943,7 @@ if test "x$use_gweather" = "xyes"; then
  
  fi
  
 -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}`
++camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCAMEL_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
+diff --git a/configure.ac b/configure.ac
+index 9c3a099..c69e488 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1390,7 +1390,7 @@ if test "x$use_gweather" = "xyes"; then
  fi
  
  dnl separate camel from e-d-s? or should it be under the same spot? same for now.
@@ -23,4 +23,4 @@
 +camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCAMEL_CURRENT} - ${LIBCAMEL_AGE}`
  AC_SUBST(camel_providerdir)
  
- dnl IDL/Component Versioning
+ dnl ******************************

Added: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=1665&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (added)
+++ unstable/evolution-data-server/debian/patches/series Tue Jun 22 06:30:53 2010
@@ -1,0 +1,3 @@
+25_mute-debug-messages.patch
+45_libcamel_providers_version.patch
+65_evolution-color.patch

Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=1665&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules (original)
+++ unstable/evolution-data-server/debian/rules Tue Jun 22 06:30:53 2010
@@ -5,7 +5,6 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib

Added: unstable/evolution-data-server/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/source/format?rev=1665&op=file
==============================================================================
--- unstable/evolution-data-server/debian/source/format (added)
+++ unstable/evolution-data-server/debian/source/format Tue Jun 22 06:30:53 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)