Hi folks, At Lawrence's request, I've prepared an NMU to experimental for this issue using the provided patch, so that we can get the necessary new packages into the archive. Given that it has to go through NEW, I'll be uploading directly to the archive rather than using the delayed queue. A final patch is attached.
Jordi, the previous patch didn't hold up under the debian/rules update-control target; per your comments on IRC, I understand you'll be uploading to unstable soon with a fix for this bug, so please use this second patch when you do. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u evolution-data-server-1.4.1.1/debian/control.in
evolution-data-server-1.4.1.1/debian/control.in
--- evolution-data-server-1.4.1.1/debian/control.in
+++ evolution-data-server-1.4.1.1/debian/control.in
@@ -21,7 +21,7 @@
Architecture: any
Conflicts: evolution-data-server1.2-dev
Replaces: evolution-data-server1.2-dev
-Depends: ${misc:Depends}, libedata-book1.2-dev (= ${Source-Version}),
libedata-cal1.2-dev (= ${Source-Version}), libegroupwise1.2-dev (=
${Source-Version}), libedataserverui1.2-dev (= ${Source-Version}),
libcamel1.2-dev (= ${Source-Version}), libaudiofile-dev, libbonobo2-dev,
libdb4.2-dev, libebook1.2-dev, libecal1.2-dev, libedataserver1.2-dev,
libesd0-dev, libgconf2-dev, libgcrypt11-dev, libglib2.0-dev, libgnome2-dev,
libgnomevfs2-dev, libgnutls11-dev, libgpg-error-dev, liborbit2-dev,
libpopt-dev, libsoup2.2-dev, libtasn1-2-dev, libxml2-dev
+Depends: ${misc:Depends}, libedata-book1.2-dev (= ${Source-Version}),
libedata-cal1.2-dev (= ${Source-Version}), libegroupwise1.2-dev (=
${Source-Version}), libexchange-storage1.2-dev (= ${Source-Version}),
libedataserverui1.2-dev (= ${Source-Version}), libcamel1.2-dev (=
${Source-Version}), libaudiofile-dev, libbonobo2-dev, libdb4.2-dev,
libebook1.2-dev, libecal1.2-dev, libedataserver1.2-dev, libesd0-dev,
libgconf2-dev, libgcrypt11-dev, libglib2.0-dev, libgnome2-dev,
libgnomevfs2-dev, libgnutls11-dev, libgpg-error-dev, liborbit2-dev,
libpopt-dev, libsoup2.2-dev, libtasn1-2-dev, libxml2-dev
Description: Development files for evolution-data-server (meta package)
This package contains header files and static library of
evolution-data-server.
@@ -176,6 +176,26 @@
Evolution is the integrated mail, calendar, task and address book
distributed suite from Novell, Inc.
+Package: [EMAIL PROTECTED]@
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Backend library for evolution calendars
+ Evolution is the integrated mail, calendar, task and address book
+ distributed suite from Novell, Inc.
+ .
+ This package is backend library for evolution exchange.
+
+Package: libexchange-storage1.2-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, [EMAIL PROTECTED]@ (= ${Source-Version}),
libecal1.2-dev (= ${Source-Version}),libkrb5-dev, libldap2-dev, libnspr-dev
+Description: Backend library for evolution calendars (development files)
+ Evolution is the integrated mail, calendar, task and address book
+ distributed suite from Novell, Inc.
+ .
+ This package contains header files and static library for [EMAIL PROTECTED]@.
+
Package: [EMAIL PROTECTED]@
Section: libs
Architecture: any
diff -u evolution-data-server-1.4.1.1/debian/control
evolution-data-server-1.4.1.1/debian/control
--- evolution-data-server-1.4.1.1/debian/control
+++ evolution-data-server-1.4.1.1/debian/control
@@ -21,7 +21,7 @@
Architecture: any
Conflicts: evolution-data-server1.2-dev
Replaces: evolution-data-server1.2-dev
-Depends: ${misc:Depends}, libedata-book1.2-dev (= ${Source-Version}),
libedata-cal1.2-dev (= ${Source-Version}), libegroupwise1.2-dev (=
${Source-Version}), libedataserverui1.2-dev (= ${Source-Version}),
libcamel1.2-dev (= ${Source-Version}), libaudiofile-dev, libbonobo2-dev,
libdb4.2-dev, libebook1.2-dev, libecal1.2-dev, libedataserver1.2-dev,
libesd0-dev, libgconf2-dev, libgcrypt11-dev, libglib2.0-dev, libgnome2-dev,
libgnomevfs2-dev, libgnutls11-dev, libgpg-error-dev, liborbit2-dev,
libpopt-dev, libsoup2.2-dev, libtasn1-2-dev, libxml2-dev
+Depends: ${misc:Depends}, libedata-book1.2-dev (= ${Source-Version}),
libedata-cal1.2-dev (= ${Source-Version}), libegroupwise1.2-dev (=
${Source-Version}), libexchange-storage1.2-dev (= ${Source-Version}),
libedataserverui1.2-dev (= ${Source-Version}), libcamel1.2-dev (=
${Source-Version}), libaudiofile-dev, libbonobo2-dev, libdb4.2-dev,
libebook1.2-dev, libecal1.2-dev, libedataserver1.2-dev, libesd0-dev,
libgconf2-dev, libgcrypt11-dev, libglib2.0-dev, libgnome2-dev,
libgnomevfs2-dev, libgnutls11-dev, libgpg-error-dev, liborbit2-dev,
libpopt-dev, libsoup2.2-dev, libtasn1-2-dev, libxml2-dev
Description: Development files for evolution-data-server (meta package)
This package contains header files and static library of
evolution-data-server.
@@ -176,6 +176,26 @@
Evolution is the integrated mail, calendar, task and address book
distributed suite from Novell, Inc.
+Package: libexchange-storage1.2-0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Backend library for evolution calendars
+ Evolution is the integrated mail, calendar, task and address book
+ distributed suite from Novell, Inc.
+ .
+ This package is backend library for evolution exchange.
+
+Package: libexchange-storage1.2-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libexchange-storage1.2-0 (= ${Source-Version}),
libecal1.2-dev (= ${Source-Version}),libkrb5-dev, libldap2-dev, libnspr-dev
+Description: Backend library for evolution calendars (development files)
+ Evolution is the integrated mail, calendar, task and address book
+ distributed suite from Novell, Inc.
+ .
+ This package contains header files and static library for
libexchange-storage1.2-0.
+
Package: libcamel1.2-6
Section: libs
Architecture: any
diff -u evolution-data-server-1.4.1.1/debian/rules
evolution-data-server-1.4.1.1/debian/rules
--- evolution-data-server-1.4.1.1/debian/rules
+++ evolution-data-server-1.4.1.1/debian/rules
@@ -64,6 +64,10 @@
LIBCAMEL_AGE := $(shell grep '^LIBCAMEL_AGE=' configure.in | sed -e
's/LIBCAMEL_AGE=//g')
LIBCAMEL_VER := $(shell expr $(LIBCAMEL_CURRENT) - $(LIBCAMEL_AGE))
+LIBEXCHANGE_STORAGE_CURRENT := $(shell grep '^LIBEXCHANGE_STORAGE_CURRENT='
configure.in | sed -e 's/LIBEXCHANGE_STORAGE_CURRENT=//g')
+LIBEXCHANGE_STORAGE_AGE := $(shell grep '^LIBEXCHANGE_STORAGE_AGE='
configure.in | sed -e 's/LIBEXCHANGE_STORAGE_AGE=//g')
+LIBEXCHANGE_STORAGE_VER := $(shell expr $(LIBEXCHANGE_STORAGE_CURRENT) -
$(LIBEXCHANGE_STORAGE_AGE))
+
RELEASE_TAG := 1.2
update-control:
@@ -74,6 +78,7 @@
@echo " libecal version: $(LIBECAL_VER)"
@echo " libedata-cal version: $(LIBEDATACAL_VER)"
@echo " libegroupwise version: $(LIBEGROUPWISE_VER)"
+ @echo " libexchange-storage version: $(LIBEXCHANGE_STORAGE_VER)"
@echo " libcamel version: $(LIBCAMEL_VER)"
sed -e 's/[EMAIL
PROTECTED]@/libedataserver$(RELEASE_TAG)-$(LIBEDATASERVER_VER)/g' \
-e 's/[EMAIL
PROTECTED]@/libedataserverui$(RELEASE_TAG)-$(LIBEDATASERVERUI_VER)/g' \
@@ -82,6 +87,7 @@
-e 's/[EMAIL PROTECTED]@/libecal$(RELEASE_TAG)-$(LIBECAL_VER)/g' \
-e 's/[EMAIL
PROTECTED]@/libedata-cal$(RELEASE_TAG)-$(LIBEDATACAL_VER)/g' \
-e 's/[EMAIL
PROTECTED]@/libegroupwise$(RELEASE_TAG)-$(LIBEGROUPWISE_VER)/g' \
+ -e 's/[EMAIL
PROTECTED]@/libexchange-storage$(RELEASE_TAG)-$(LIBEXCHANGE_STORAGE_VER)/g' \
-e 's/[EMAIL PROTECTED]@/libcamel$(RELEASE_TAG)-$(LIBCAMEL_VER)/g' \
debian/control.in > debian/control
cp debian/[EMAIL PROTECTED]@.install
debian/libedataserver$(RELEASE_TAG)-$(LIBEDATASERVER_VER).install
@@ -91,6 +97,7 @@
cp debian/[EMAIL PROTECTED]@.install
debian/libecal$(RELEASE_TAG)-$(LIBECAL_VER).install
cp debian/[EMAIL PROTECTED]@.install
debian/libedata-cal$(RELEASE_TAG)-$(LIBEDATACAL_VER).install
cp debian/[EMAIL PROTECTED]@.install
debian/libegroupwise$(RELEASE_TAG)-$(LIBEGROUPWISE_VER).install
+ cp debian/[EMAIL PROTECTED]@.install
debian/libexchange-storage$(RELEASE_TAG)-$(LIBEXCHANGE_STORAGE_VER).install
cp debian/[EMAIL PROTECTED]@.install
debian/libcamel$(RELEASE_TAG)-$(LIBCAMEL_VER).install
common-binary-predeb-arch::
diff -u evolution-data-server-1.4.1.1/debian/changelog
evolution-data-server-1.4.1.1/debian/changelog
--- evolution-data-server-1.4.1.1/debian/changelog
+++ evolution-data-server-1.4.1.1/debian/changelog
@@ -1,3 +1,13 @@
+evolution-data-server (1.4.1.1-1.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Added libexchange-storage and libexchange-storage-dev. The Exchange
+ server communication code has moved to evolution-data-server under
+ servers/exchange. Patch from Sebastien Bacher and Lawrence Walton.
+ Closes: #344829.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Fri, 6 Jan 2006 11:07:51 -0800
+
evolution-data-server (1.4.1.1-1) experimental; urgency=high
[ Jordi Mallach ]
only in patch2:
unchanged:
--- evolution-data-server-1.4.1.1.orig/debian/[EMAIL PROTECTED]@.install
+++ evolution-data-server-1.4.1.1/debian/[EMAIL PROTECTED]@.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libexchange-storage-1.2.so.*
+
only in patch2:
unchanged:
--- evolution-data-server-1.4.1.1.orig/debian/libexchange-storage1.2-0.install
+++ evolution-data-server-1.4.1.1/debian/libexchange-storage1.2-0.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libexchange-storage-1.2.so.*
+
only in patch2:
unchanged:
--- evolution-data-server-1.4.1.1.orig/debian/libexchange-storage1.2-dev.install
+++ evolution-data-server-1.4.1.1/debian/libexchange-storage1.2-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/pkgconfig/libexchange-storage-1.2.pc
+debian/tmp/usr/lib/libexchange-storage-1.2.so
+debian/tmp/usr/lib/libexchange-storage-1.2.la
+debian/tmp/usr/include/evolution-data-server-1.4/exchange
signature.asc
Description: Digital signature
