r1739 - in /experimental/evolution-data-server/debian: ./ patches/

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Sat Oct 2 13:31:52 UTC 2010


Author: corsac
Date: Sat Oct  2 13:31:45 2010
New Revision: 1739

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1739
Log:
* New upstream release.
* debian/watch updated.
* debian/control:
  - bump gweather, glib and gtk build-dep.
  - add build dep on libgdata.
  - drop dbus-glib build-dep.
  - drop libgdata* packages, now external.
* debian/patches:
  - 01_imapx_lockup dropped, included upstream.
  - 65_evolution-color dropped as well, not relevant anymore.
  - 102-Bug-630135-No-UI-feedback-when-imapx-connection-fail, 
      103-Bug-630150-imapx-attempts-to-connect-to-server-when-, 
      104-Bug-630152-imapx_parser_thread-registers-wrong-opera, 
      105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com, 
      106-Bug-630149-imapx_sync-never-returns-error dropped as well,
      included upstream.
* debian/rules:
  - explicitly disable gtk3 build.
  - get flags from dpkg-buildflags
  - add --as-needed to LDFLAGS.
* libcamel1.2-14.shlibs: 
  - bump depends/conflicts for 2.32.
  - bump soversion to 19.

Removed:
    experimental/evolution-data-server/debian/libgdata-google1.2-1.install
    experimental/evolution-data-server/debian/libgdata-google1.2-dev.install
    experimental/evolution-data-server/debian/libgdata1.2-1.install
    experimental/evolution-data-server/debian/libgdata1.2-dev.install
Modified:
    experimental/evolution-data-server/debian/changelog
    experimental/evolution-data-server/debian/control
    experimental/evolution-data-server/debian/evolution-data-server-common.install
    experimental/evolution-data-server/debian/libcamel1.2-14.shlibs
    experimental/evolution-data-server/debian/libcamel1.2-dev.install
    experimental/evolution-data-server/debian/libebackend1.2-dev.install
    experimental/evolution-data-server/debian/libebook1.2-dev.install
    experimental/evolution-data-server/debian/libecal1.2-dev.install
    experimental/evolution-data-server/debian/libedata-book1.2-dev.install
    experimental/evolution-data-server/debian/libedata-cal1.2-dev.install
    experimental/evolution-data-server/debian/libedataserver1.2-dev.install
    experimental/evolution-data-server/debian/libedataserverui1.2-dev.install
    experimental/evolution-data-server/debian/libegroupwise1.2-dev.install
    experimental/evolution-data-server/debian/patches/series
    experimental/evolution-data-server/debian/rules
    experimental/evolution-data-server/debian/watch

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Sat Oct  2 13:31:45 2010
@@ -1,3 +1,31 @@
+evolution-data-server (2.32.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/watch updated.
+  * debian/control:
+    - bump gweather, glib and gtk build-dep.
+    - add build dep on libgdata.
+    - drop dbus-glib build-dep.
+    - drop libgdata* packages, now external.
+  * debian/patches:
+    - 01_imapx_lockup dropped, included upstream.
+    - 65_evolution-color dropped as well, not relevant anymore.
+    - 102-Bug-630135-No-UI-feedback-when-imapx-connection-fail, 
+        103-Bug-630150-imapx-attempts-to-connect-to-server-when-, 
+        104-Bug-630152-imapx_parser_thread-registers-wrong-opera, 
+        105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com, 
+        106-Bug-630149-imapx_sync-never-returns-error dropped as well,
+        included upstream.
+  * debian/rules:
+    - explicitly disable gtk3 build.
+    - get flags from dpkg-buildflags
+    - add --as-needed to LDFLAGS.
+  * libcamel1.2-14.shlibs: 
+    - bump depends/conflicts for 2.32.
+    - bump soversion to 19.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Oct 2010 14:03:23 +0200
+
 evolution-data-server (2.30.3-2) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: experimental/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/control?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/control (original)
+++ experimental/evolution-data-server/debian/control Sat Oct  2 13:31:45 2010
@@ -29,21 +29,21 @@
                libdb-dev,
                libkrb5-dev,
                libldap2-dev,
-               libglib2.0-dev (>= 2.16.1),
+               libglib2.0-dev (>= 2.25.12),
                libxml2-dev,
                libgconf2-dev,
                libnss3-dev,
-               libgtk2.0-dev (>= 2.18.0),
+               libgtk2.0-dev (>= 2.20.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),
+               libgweather-dev (>= 2.25.4),
                libical-dev,
                libicu-dev,
-               libdbus-glib-1-dev (>= 0.6),
+               libgdata-dev (>= 0.6.3),
                gperf,
                gnome-pkg-tools
 
@@ -315,63 +315,6 @@
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.
 
-Package: libgdata1.2-1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Client library for accessing Google POA through SOAP interface
- This package is a client library to access the Google Data APIs through a 
- SOAP interface.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
-Package: libgdata1.2-dev
-Section: libdevel
-Architecture: any
-Depends: libgdata1.2-1 (= ${binary:Version}),
-         ${misc:Depends},
-         libsoup2.4-dev
-Description: Client library for accessing Google POA (development files)
- This package contains header files and static library for
- libgdata1.2-1.
- .
- libgdata is a client library to access the Google Data APIs through a
- SOAP interface.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
-Package: libgdata-google1.2-1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Client library for accessing Google POA through SOAP interface
- This package is a client library to access Google services through a SOAP
- interface.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
-Package: libgdata-google1.2-dev
-Section: libdevel
-Architecture: any
-Depends: libgdata-google1.2-1 (= ${binary:Version}),
-         ${misc:Depends},
-         libsoup2.4-dev,
-         libgdata1.2-dev
-Description: Client library for accessing Google POA (development files)
- This package contains header files and static library for
- libgdata-google1.2-1.
- .
- libgdata-google is a client library to access Google services through a SOAP
- interface.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
 Package: libebackend1.2-0
 Section: libs
 Architecture: any

Modified: experimental/evolution-data-server/debian/evolution-data-server-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/evolution-data-server-common.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/evolution-data-server-common.install (original)
+++ experimental/evolution-data-server/debian/evolution-data-server-common.install Sat Oct  2 13:31:45 2010
@@ -1,4 +1,4 @@
-debian/tmp/usr/share/evolution-data-server-2.30
+debian/tmp/usr/share/evolution-data-server-2.32
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/pixmaps
 debian/tmp/usr/share/dbus-1

Modified: experimental/evolution-data-server/debian/libcamel1.2-14.shlibs
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libcamel1.2-14.shlibs?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libcamel1.2-14.shlibs (original)
+++ experimental/evolution-data-server/debian/libcamel1.2-14.shlibs Sat Oct  2 13:31:45 2010
@@ -1,2 +1,2 @@
-libcamel-1.2 14 libcamel1.2-14 (>= 2.30.3), libcamel1.2-14 (<< 2.31)
-libcamel-provider-1.2 14 libcamel1.2-14 (>= 2.30.3), libcamel1.2-14 (<< 2.31)
+libcamel-1.2 19 libcamel1.2-14 (>= 2.32.0), libcamel1.2-14 (<< 2.33)
+libcamel-provider-1.2 19 libcamel1.2-14 (>= 2.32.0), libcamel1.2-14 (<< 2.33)

Modified: experimental/evolution-data-server/debian/libcamel1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libcamel1.2-dev.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libcamel1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libcamel1.2-dev.install Sat Oct  2 13:31:45 2010
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/libcamel*.so
 debian/tmp/usr/lib/pkgconfig/camel*
-debian/tmp/usr/include/evolution-data-server-2.30/camel
+debian/tmp/usr/include/evolution-data-server-2.32/camel
 debian/tmp/usr/share/gtk-doc/html/camel

Modified: experimental/evolution-data-server/debian/libebackend1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libebackend1.2-dev.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libebackend1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libebackend1.2-dev.install Sat Oct  2 13:31:45 2010
@@ -1,4 +1,4 @@
 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.30/libebackend
+debian/tmp/usr/include/evolution-data-server-2.32/libebackend
 debian/tmp/usr/share/gtk-doc/html/libebackend

Modified: experimental/evolution-data-server/debian/libebook1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libebook1.2-dev.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libebook1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libebook1.2-dev.install Sat Oct  2 13:31:45 2010
@@ -1,4 +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.30/libebook
+debian/tmp/usr/include/evolution-data-server-2.32/libebook
 debian/tmp/usr/share/gtk-doc/html/libebook

Modified: experimental/evolution-data-server/debian/libecal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libecal1.2-dev.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libecal1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libecal1.2-dev.install Sat Oct  2 13:31:45 2010
@@ -1,4 +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.30/libecal
+debian/tmp/usr/include/evolution-data-server-2.32/libecal
 debian/tmp/usr/share/gtk-doc/html/libecal

Modified: experimental/evolution-data-server/debian/libedata-book1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedata-book1.2-dev.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedata-book1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libedata-book1.2-dev.install Sat Oct  2 13:31:45 2010
@@ -1,4 +1,4 @@
 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.30/libedata-book
+debian/tmp/usr/include/evolution-data-server-2.32/libedata-book
 debian/tmp/usr/share/gtk-doc/html/libedata-book

Modified: experimental/evolution-data-server/debian/libedata-cal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedata-cal1.2-dev.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedata-cal1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libedata-cal1.2-dev.install Sat Oct  2 13:31:45 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.30/libedata-cal
+debian/tmp/usr/include/evolution-data-server-2.32/libedata-cal
 debian/tmp/usr/share/gtk-doc/html/libedata-cal

Modified: experimental/evolution-data-server/debian/libedataserver1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedataserver1.2-dev.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedataserver1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libedataserver1.2-dev.install Sat Oct  2 13:31:45 2010
@@ -1,4 +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.30/libedataserver
+debian/tmp/usr/include/evolution-data-server-2.32/libedataserver
 debian/tmp/usr/share/gtk-doc/html/libedataserver

Modified: experimental/evolution-data-server/debian/libedataserverui1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedataserverui1.2-dev.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedataserverui1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libedataserverui1.2-dev.install Sat Oct  2 13:31:45 2010
@@ -1,4 +1,4 @@
 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.30/libedataserverui
+debian/tmp/usr/include/evolution-data-server-2.32/libedataserverui
 debian/tmp/usr/share/gtk-doc/html/libedataserverui/

Modified: experimental/evolution-data-server/debian/libegroupwise1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libegroupwise1.2-dev.install?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libegroupwise1.2-dev.install (original)
+++ experimental/evolution-data-server/debian/libegroupwise1.2-dev.install Sat Oct  2 13:31:45 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.30/groupwise
+debian/tmp/usr/include/evolution-data-server-2.32/groupwise

Modified: experimental/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/series?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/patches/series (original)
+++ experimental/evolution-data-server/debian/patches/series Sat Oct  2 13:31:45 2010
@@ -1,9 +1,2 @@
-01_imapx_lockup.patch
 25_mute-debug-messages.patch
 45_libcamel_providers_version.patch
-65_evolution-color.patch
-102-Bug-630135-No-UI-feedback-when-imapx-connection-fail.patch
-103-Bug-630150-imapx-attempts-to-connect-to-server-when-.patch
-104-Bug-630152-imapx_parser_thread-registers-wrong-opera.patch
-105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com.patch
-106-Bug-630149-imapx_sync-never-returns-error.patch

Modified: experimental/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/rules?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/rules (original)
+++ experimental/evolution-data-server/debian/rules Sat Oct  2 13:31:45 2010
@@ -13,6 +13,9 @@
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V
 
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 CFLAGS += -fPIC
 
 DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc \
@@ -25,7 +28,8 @@
 	--with-krb5=/usr \
 	--with-libdb=/usr \
 	--enable-gtk-doc \
-	--enable-gnome-keyring=yes
+	--enable-gnome-keyring=yes \
+	--enable-gtk3=no
 
 DEB_FIXPERMS_EXCLUDE_evolution-data-server += usr/lib/evolution/camel-lock-helper*
 

Modified: experimental/evolution-data-server/debian/watch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/watch?rev=1739&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/watch (original)
+++ experimental/evolution-data-server/debian/watch Sat Oct  2 13:31:45 2010
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/([\d\.]+[02468])/evolution-data-server-([\d\.]+)\.tar\.gz	debian	uupdate
+http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/([\d]\.[\d]+[02468])/evolution-data-server-([\d\.]+)\.tar\.gz	debian	uupdate




More information about the pkg-evolution-commits mailing list