r1606 - in /unstable/evolution-data-server/debian: ./ lintian/ patches/

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Mon May 17 08:20:05 UTC 2010 

Author: corsac
Date: Mon May 17 08:19:59 2010
New Revision: 1606

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1606
Log:
try to fix messed up merge

Removed:
    unstable/evolution-data-server/debian/libexchange-storage1.2-3.install
    unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install
    unstable/evolution-data-server/debian/lintian/libexchange-storage1.2-3
Modified:
    unstable/evolution-data-server/debian/control
    unstable/evolution-data-server/debian/evolution-data-server-common.install
    unstable/evolution-data-server/debian/evolution-data-server.install
    unstable/evolution-data-server/debian/libcamel1.2-dev.install
    unstable/evolution-data-server/debian/libebackend1.2-dev.install
    unstable/evolution-data-server/debian/libebook1.2-dev.install
    unstable/evolution-data-server/debian/libecal1.2-dev.install
    unstable/evolution-data-server/debian/libedata-book1.2-dev.install
    unstable/evolution-data-server/debian/libedata-cal1.2-dev.install
    unstable/evolution-data-server/debian/libedataserver1.2-dev.install
    unstable/evolution-data-server/debian/libedataserverui1.2-dev.install
    unstable/evolution-data-server/debian/libegroupwise1.2-dev.install
    unstable/evolution-data-server/debian/libgdata-google1.2-dev.install
    unstable/evolution-data-server/debian/libgdata1.2-dev.install
    unstable/evolution-data-server/debian/patches/01_unitialized_key.patch
    unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch
    unstable/evolution-data-server/debian/rules

Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Mon May 17 08:19:59 2010
@@ -29,11 +29,21 @@
                libkrb5-dev,
                libldap2-dev,
                libglib2.0-dev (>= 2.16.1),
-               libbonobo2-dev (>= 2.20.3),
-               liborbit2-dev (>= 1:2.9.8),
-               libglade2-dev,
-               libgnomeui-dev,
-               libicu-dev
+               libxml2-dev,
+               libgconf2-dev,
+               libnss3-dev,
+               libgtk2.0-dev (>= 2.18.0),
+               libgnome2-dev,
+               libsoup2.4-dev,
+               libgnome-keyring-dev (>= 2.20.1),
+               gtk-doc-tools,
+               libsqlite3-dev (>= 3.6),
+               chrpath,
+               libgweather-dev (>= 2.24.5),
+               libical-dev,
+               libicu-dev,
+               libdbus-glib-1-dev (>= 0.6),
+               gperf
 
 Package: evolution-data-server
 Architecture: any
@@ -303,35 +313,6 @@
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.
 
-Package: libexchange-storage1.2-3
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Client library for accessing Exchange server through webdav
- This package is a client library to access Exchange servers 
- through webdav.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
-Package: libexchange-storage1.2-dev
-Section: libdevel
-Architecture: any
-Depends: libexchange-storage1.2-3 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-         libsoup2.4-dev
-Description: Backend library for evolution calendars (development files)
- This package contains header files and a static library for
- libexchange-storage1.2-3.
- .
- libexchange-storage is a client library to access Exchange servers
- through webdav.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-  
 Package: libgdata1.2-1
 Section: libs
 Architecture: any

Modified: unstable/evolution-data-server/debian/evolution-data-server-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/evolution-data-server-common.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/evolution-data-server-common.install (original)
+++ unstable/evolution-data-server/debian/evolution-data-server-common.install Mon May 17 08:19:59 2010
@@ -1,3 +1,4 @@
-debian/tmp/usr/share/evolution-data-server-2.28
+debian/tmp/usr/share/evolution-data-server-2.30
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/pixmaps
+debian/tmp/usr/share/dbus-1

Modified: unstable/evolution-data-server/debian/evolution-data-server.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/evolution-data-server.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/evolution-data-server.install (original)
+++ unstable/evolution-data-server/debian/evolution-data-server.install Mon May 17 08:19:59 2010
@@ -1,5 +1,4 @@
 debian/tmp/usr/lib/evolution
-debian/tmp/usr/lib/bonobo
 debian/tmp/usr/lib/evolution-data-server-1.2/extensions/*.so
 debian/tmp/usr/lib/evolution-data-server-1.2/camel-providers-*/*.urls
 debian/tmp/usr/lib/evolution-data-server-1.2/camel-providers-*/*.so

Modified: unstable/evolution-data-server/debian/libcamel1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libcamel1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libcamel1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libcamel1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/libcamel*.so
 debian/tmp/usr/lib/pkgconfig/camel*
-debian/tmp/usr/include/evolution-data-server-2.28/camel
+debian/tmp/usr/include/evolution-data-server-2.30/camel

Modified: unstable/evolution-data-server/debian/libebackend1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libebackend1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libebackend1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libebackend1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/pkgconfig/libebackend-1.2.pc
 debian/tmp/usr/lib/libebackend-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/libebackend
+debian/tmp/usr/include/evolution-data-server-2.30/libebackend

Modified: unstable/evolution-data-server/debian/libebook1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libebook1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libebook1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libebook1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,5 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/libebook-1.2.pc
 debian/tmp/usr/lib/libebook-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/libebook
-debian/tmp/usr/share/idl/evolution-data-server-1.2/Evolution-DataServer-Addressbook.idl
+debian/tmp/usr/include/evolution-data-server-2.30/libebook
 debian/tmp/usr/share/gtk-doc/html/libebook

Modified: unstable/evolution-data-server/debian/libecal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libecal1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libecal1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libecal1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,5 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/libecal-1.2.pc
 debian/tmp/usr/lib/libecal-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/libecal
-debian/tmp/usr/share/idl/evolution-data-server-1.2/Evolution-DataServer-Calendar.idl
+debian/tmp/usr/include/evolution-data-server-2.30/libecal
 debian/tmp/usr/share/gtk-doc/html/libecal

Modified: unstable/evolution-data-server/debian/libedata-book1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedata-book1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedata-book1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedata-book1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/pkgconfig/libedata-book-1.2.pc
 debian/tmp/usr/lib/libedata-book-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/libedata-book
+debian/tmp/usr/include/evolution-data-server-2.30/libedata-book

Modified: unstable/evolution-data-server/debian/libedata-cal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedata-cal1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedata-cal1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedata-cal1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/libedata-cal-1.2.pc
 debian/tmp/usr/lib/libedata-cal-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/libedata-cal
+debian/tmp/usr/include/evolution-data-server-2.30/libedata-cal
 debian/tmp/usr/share/gtk-doc/html/libedata-cal

Modified: unstable/evolution-data-server/debian/libedataserver1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedataserver1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedataserver1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedataserver1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,5 +1,4 @@
 debian/tmp/usr/lib/pkgconfig/libedataserver-1.2.pc
 debian/tmp/usr/lib/libedataserver-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/libedataserver
-debian/tmp/usr/share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
+debian/tmp/usr/include/evolution-data-server-2.30/libedataserver
 debian/tmp/usr/share/gtk-doc/html/libedataserver

Modified: unstable/evolution-data-server/debian/libedataserverui1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedataserverui1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedataserverui1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedataserverui1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/pkgconfig/libedataserverui-1.2.pc
 debian/tmp/usr/lib/libedataserverui-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/libedataserverui
+debian/tmp/usr/include/evolution-data-server-2.30/libedataserverui

Modified: unstable/evolution-data-server/debian/libegroupwise1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libegroupwise1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libegroupwise1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libegroupwise1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/pkgconfig/libegroupwise-1.2.pc
 debian/tmp/usr/lib/libegroupwise-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/groupwise
+debian/tmp/usr/include/evolution-data-server-2.30/groupwise

Modified: unstable/evolution-data-server/debian/libgdata-google1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libgdata-google1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libgdata-google1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libgdata-google1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/pkgconfig/libgdata-google-1.2.pc
 debian/tmp/usr/lib/libgdata-google-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/google/libgdata-google
+debian/tmp/usr/include/evolution-data-server-2.30/google/libgdata-google

Modified: unstable/evolution-data-server/debian/libgdata1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libgdata1.2-dev.install?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libgdata1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libgdata1.2-dev.install Mon May 17 08:19:59 2010
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/pkgconfig/libgdata-1.2.pc
 debian/tmp/usr/lib/libgdata-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.28/google/libgdata
+debian/tmp/usr/include/evolution-data-server-2.30/google/libgdata

Modified: unstable/evolution-data-server/debian/patches/01_unitialized_key.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/01_unitialized_key.patch?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/01_unitialized_key.patch (original)
+++ unstable/evolution-data-server/debian/patches/01_unitialized_key.patch Mon May 17 08:19:59 2010
@@ -1,23 +1,22 @@
-From c5bbcdc514dfe2449191b143a95166e2b06bde93 Mon Sep 17 00:00:00 2001
-From: Claudio Saavedra <csaavedra at igalia.com>
-Date: Tue, 27 Apr 2010 11:04:03 +0000
-Subject: Bug #616318 - Don't use an unitialized key in folder_changed_remove_uid
+commit 134b84ec3a0560239647b2098f366585d1ed8bbd
+Author: Claudio Saavedra <csaavedra at igalia.com>
+Date:   Tue Apr 27 13:05:30 2010 +0200
 
-If g_hash_table_lookup_extended() returns FALSE, then the oldkey
-is unset, so don't use it to insert a new item in the hash table.
----
+    Bug #616318 - Don't use an unitialized key in folder_changed_remove_uid
+    
+    If g_hash_table_lookup_extended() returns FALSE, then the oldkey
+    is unset, so don't use it to insert a new item in the hash table.
+
 diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
-index 76ce2c1..533e4f5 100644
+index 6647c17..132821d 100644
 --- a/camel/camel-vee-folder.c
 +++ b/camel/camel-vee-folder.c
-@@ -210,7 +210,7 @@ folder_changed_remove_uid (CamelFolder *sub, const gchar *uid, const gchar hash[
+@@ -1412,7 +1412,7 @@ folder_changed_remove_uid(CamelFolder *sub, const gchar *uid, const gchar hash[8
  				}
  			} else {
  				if (vee_folder_add_uid_test (folder_unmatched, sub, uid, hash))
--					camel_folder_change_info_add_uid (folder_unmatched->changes, oldkey);
-+					camel_folder_change_info_add_uid (folder_unmatched->changes, vuid);
+-					camel_folder_change_info_add_uid(folder_unmatched->changes, oldkey);
++					camel_folder_change_info_add_uid(folder_unmatched->changes, vuid);
  			}
  		} else {
- 			if (g_hash_table_lookup_extended (unmatched_uids, vuid, (gpointer *)&oldkey, &oldval)) {
---
-cgit v0.8.3.1
+ 			if (g_hash_table_lookup_extended(unmatched_uids, vuid, (gpointer *)&oldkey, &oldval)) {

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=1606&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 Mon May 17 08:19:59 2010
@@ -6,7 +6,7 @@
  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}`
++camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCAMEL_CURRENT} - ${LIBCAMEL_AGE}`
  
  
  INTERFACE_VERSION="$BASE_VERSION"
@@ -18,8 +18,7 @@
  
  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
--AC_SUBST(camel_providerdir)
-+camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCANEL_CURRENT} - ${LIBCAMEL_AGE}`
++camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCAMEL_CURRENT} - ${LIBCAMEL_AGE}`
  
  dnl IDL/Component Versioning
  INTERFACE_VERSION="$BASE_VERSION"

Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=1606&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules (original)
+++ unstable/evolution-data-server/debian/rules Mon May 17 08:19:59 2010
@@ -37,4 +37,3 @@
 	chmod g+s $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper*
 	chrpath -d -k $(CURDIR)/debian/evolution-data-server/usr/lib/evolution-data-server-1.2/*/*.so \
 	$(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel*1.2 \
-	$(CURDIR)/debian/evolution-data-server/usr/lib/evolution/evolution-data-server-2.28

More information about the pkg-evolution-commits mailing list