r1171 - in /unstable/evolution-data-server/debian: ./ patches/
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Sat Apr 25 11:25:51 UTC 2009
Author: corsac
Date: Sat Apr 25 11:25:51 2009
New Revision: 1171
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1171
Log:
merge 2.26 from experimental/
Removed:
unstable/evolution-data-server/debian/patches/66_autoreconf-ignore-folders.patch
unstable/evolution-data-server/debian/patches/67_detect-change-signed-messages.patch
Modified:
unstable/evolution-data-server/debian/changelog
unstable/evolution-data-server/debian/control
unstable/evolution-data-server/debian/evolution-data-server-common.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/libexchange-storage1.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/11_it_translation.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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sat Apr 25 11:25:51 2009
@@ -1,3 +1,21 @@
+evolution-data-server (2.26.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - update eds-common dep for evolution-data-server 2.26.
+ - add build-dep on libicu-dev, libgweather-dev and libical-dev.
+ - drop deprecated Replace/Conflict.
+ * debian/*.install:
+ - update path for 2.26.
+ * debian/patches:
+ - 11_it_translation slightly updated.
+ - debian/patches/66_autoreconf-ignore-folders dropped, eds doesn't ship
+ libical sources anymore.
+ - debian/patches/67_detect-change-signed-messages dropped, included
+ upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 15 Apr 2009 08:01:50 +0200
+
evolution-data-server (2.24.5-4) unstable; urgency=low
* Fix -dbg package section to match the override.
Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Sat Apr 25 11:25:51 2009
@@ -41,7 +41,10 @@
libgnome-keyring-dev (>= 2.20.1),
gtk-doc-tools,
libsqlite3-dev (>= 3.6),
- chrpath
+ chrpath,
+ libgweather-dev (>= 2.24.3),
+ libical-dev,
+ libicu-dev
Package: evolution-data-server
Architecture: any
@@ -59,8 +62,6 @@
Package: evolution-data-server-common
Architecture: all
Depends: ${misc:Depends}
-Replaces: evolution-data-server (<< 1.6.2-1)
-Conflicts: evolution-data-server (<< 1.6.2-1)
Description: architecture independent files for Evolution Data Server
The data server, called "Evolution Data Server" is responsible for managing
calendar and addressbook information.
@@ -181,7 +182,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- evolution-data-server-common (>= 2.24.0)
+ evolution-data-server-common (>= 2.26.0)
Description: GUI utility library for evolution data servers
The data server, called "Evolution Data Server" is responsible for managing
calendar and addressbook information.
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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/evolution-data-server-common.install (original)
+++ unstable/evolution-data-server/debian/evolution-data-server-common.install Sat Apr 25 11:25:51 2009
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/evolution-data-server-2.24
+debian/tmp/usr/share/evolution-data-server-2.26
debian/tmp/usr/share/locale
debian/tmp/usr/share/pixmaps
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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libcamel1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libcamel1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -1,3 +1,3 @@
debian/tmp/usr/lib/libcamel*.so
debian/tmp/usr/lib/pkgconfig/camel*
-debian/tmp/usr/include/evolution-data-server-2.24/camel
+debian/tmp/usr/include/evolution-data-server-2.26/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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libebackend1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libebackend1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -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.24/libebackend
+debian/tmp/usr/include/evolution-data-server-2.26/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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libebook1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libebook1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -1,5 +1,5 @@
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.24/libebook
+debian/tmp/usr/include/evolution-data-server-2.26/libebook
debian/tmp/usr/share/idl/evolution-data-server-1.2/Evolution-DataServer-Addressbook.idl
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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libecal1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libecal1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -1,6 +1,5 @@
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.24/libecal
-debian/tmp/usr/include/evolution-data-server-2.24/libical
+debian/tmp/usr/include/evolution-data-server-2.26/libecal
debian/tmp/usr/share/idl/evolution-data-server-1.2/Evolution-DataServer-Calendar.idl
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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedata-book1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedata-book1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -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.24/libedata-book
+debian/tmp/usr/include/evolution-data-server-2.26/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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedata-cal1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedata-cal1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -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.24/libedata-cal
+debian/tmp/usr/include/evolution-data-server-2.26/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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedataserver1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedataserver1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -1,5 +1,5 @@
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.24/libedataserver
+debian/tmp/usr/include/evolution-data-server-2.26/libedataserver
debian/tmp/usr/share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedataserverui1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libedataserverui1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -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.24/libedataserverui
+debian/tmp/usr/include/evolution-data-server-2.26/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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libegroupwise1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libegroupwise1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -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.24/groupwise
+debian/tmp/usr/include/evolution-data-server-2.26/groupwise
Modified: unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install?rev=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libexchange-storage1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -1,3 +1,3 @@
debian/tmp/usr/lib/pkgconfig/libexchange-storage-1.2.pc
debian/tmp/usr/lib/libexchange-storage-1.2.so
-debian/tmp/usr/include/evolution-data-server-2.24/exchange
+debian/tmp/usr/include/evolution-data-server-2.26/exchange
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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libgdata-google1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libgdata-google1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -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.24/google/libgdata-google
+debian/tmp/usr/include/evolution-data-server-2.26/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=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libgdata1.2-dev.install (original)
+++ unstable/evolution-data-server/debian/libgdata1.2-dev.install Sat Apr 25 11:25:51 2009
@@ -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.24/google/libgdata
+debian/tmp/usr/include/evolution-data-server-2.26/google/libgdata
Modified: unstable/evolution-data-server/debian/patches/11_it_translation.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/11_it_translation.patch?rev=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/11_it_translation.patch (original)
+++ unstable/evolution-data-server/debian/patches/11_it_translation.patch Sat Apr 25 11:25:51 2009
@@ -1,22 +1,21 @@
-diff -ruN evolution-data-server-1.8.0.orig/po/it.po evolution-data-server-1.8.0/po/it.po
---- evolution-data-server-1.8.0.orig/po/it.po 2006-04-20 10:53:20.000000000 +0200
-+++ evolution-data-server-1.8.0/po/it.po 2006-09-06 22:59:13.000000000 +0200
-@@ -2425,7 +2425,7 @@
+diff --git a/po/it.po b/po/it.po
+index 38700bb..06b6ec4 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -2510,7 +2510,7 @@ msgstr "Certificato respinto"
- #: ../camel/camel-tcp-stream-openssl.c:620
+ #: ../camel/camel-tcp-stream-openssl.c:624
msgid "Subject/Issuer mismatch"
-msgstr "Oggetto/Emittente sconnessi"
+msgstr "Proprietario/Emittente sconnessi"
- #: ../camel/camel-tcp-stream-openssl.c:622
+ #: ../camel/camel-tcp-stream-openssl.c:626
msgid "AKID/SKID mismatch"
-@@ -2451,8 +2451,8 @@
- "Fingerprint: %s\n"
+@@ -2537,7 +2537,7 @@ msgid ""
"Signature: %s"
msgstr ""
--"Mittente: %s\n"
+ "Emittente: %s\n"
-"Oggetto: %s\n"
-+"Emittente: %s\n"
+"Proprietario: %s\n"
"Impronta digitale: %s\n"
"Firma: %s"
Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=1171&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules (original)
+++ unstable/evolution-data-server/debian/rules Sat Apr 25 11:25:51 2009
@@ -23,7 +23,8 @@
--with-krb5=/usr \
--with-libdb=/usr \
--enable-gtk-doc \
- --enable-gnome-keyring=yes
+ --enable-gnome-keyring=yes \
+ --without-weather
configure:
dh_testdir
@@ -36,4 +37,4 @@
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.24
+ $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/evolution-data-server-2.26
More information about the pkg-evolution-commits
mailing list