r1111 - in /experimental/evolution-data-server/debian: changelog control lintian/evolution-data-server patches/66_autoreconf-ignore-folders.patch rules

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Sun Jan 11 16:46:51 UTC 2009 

Author: corsac
Date: Sun Jan 11 16:46:51 2009
New Revision: 1111

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1111
Log:
  - add libsoup2.4-dev to libedataserver1.2-dev and libedataserverui1.2-dev.
  - drop libgnomevfs2-dev (build)-deps.
  - version (build) deps on keyring and sqlite3.
* debian/patches:
  - 66_autoreconf-ignore-folders added, don't add libdb/dists and
    calendar/libical to AC_CONFIG_SUBDIRS so autoreconf doesn't fail.
* debian/lintian:
  - evolution-data-server: add an ignore for ancient libtool in unused
    embbered libdb copy.

Added:
    experimental/evolution-data-server/debian/patches/66_autoreconf-ignore-folders.patch
Modified:
    experimental/evolution-data-server/debian/changelog
    experimental/evolution-data-server/debian/control
    experimental/evolution-data-server/debian/lintian/evolution-data-server
    experimental/evolution-data-server/debian/rules

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1111&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Sun Jan 11 16:46:51 2009
@@ -6,6 +6,9 @@
     - update dep on evolution-data-server-common 2.24.
     - add build-dep on chrpath.
     - add libsqlite3-dev to libcamel1.2-dev dependencies.
+    - add libsoup2.4-dev to libedataserver1.2-dev and libedataserverui1.2-dev.
+    - drop libgnomevfs2-dev (build)-deps.
+    - version (build) deps on keyring and sqlite3.
   * debian/*.install:
     - update paths for 2.24.
   * Add libraries, development-files and lintian for libebackend.
@@ -19,8 +22,14 @@
     - debian/lintian: libcamel1.2-11 renamed to libcamel1.2-14 
   * debian/rules:
     - remove rpaths.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 15 Dec 2008 22:31:54 +0100
+  * debian/patches:
+    - 66_autoreconf-ignore-folders added, don't add libdb/dists and
+      calendar/libical to AC_CONFIG_SUBDIRS so autoreconf doesn't fail.
+  * debian/lintian:
+    - evolution-data-server: add an ignore for ancient libtool in unused
+      embbered libdb copy.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 11 Jan 2009 17:23:20 +0100
 
 evolution-data-server (2.22.3-1) unstable; urgency=low
 

Modified: experimental/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/control?rev=1111&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/control (original)
+++ experimental/evolution-data-server/debian/control Sun Jan 11 16:46:51 2009
@@ -36,11 +36,11 @@
                libnss3-dev,
                libgtk2.0-dev (>= 2.10.0),
                libgnome2-dev,
-               libgnomevfs2-dev (>= 2.4.0),
                libsoup2.4-dev,
-               libgnome-keyring-dev,
+               libgnome-keyring-dev (>= 2.20.1),
                gtk-doc-tools,
-               libsqlite3-dev,
+               libsqlite3-dev (>= 3.5),
+               libdb4.6-dev,
                chrpath
 
 Package: evolution-data-server
@@ -102,11 +102,12 @@
          ${shlibs:Depends},
          ${misc:Depends},
          libxml2-dev,
-         libglib2.0-dev,
+         libglib2.0-dev (>= 2.16.1),
          libgconf2-dev,
          libbonobo2-dev (>= 2.20.3),
          liborbit2-dev (>= 1:2.9.8),
-	 libnspr4-dev
+         libsoup2.4-dev,
+         libnspr4-dev
 Description: Utility library for evolution data servers (development files)
  The data server, called "Evolution Data Server" is responsible for managing
  calendar and addressbook information.
@@ -134,7 +135,7 @@
          ${shlibs:Depends},
          libglib2.0-dev,
          libedataserver1.2-dev,
-         libsqlite3-dev
+         libsqlite3-dev (>= 3.5)
 Description: Development files for libcamel
  This package contains header files and static library for libcamel1.2-11
  .
@@ -195,7 +196,8 @@
          libglade2-dev,
          libgnome2-dev,
          libedataserver1.2-dev,
-         libebook1.2-dev
+         libebook1.2-dev,
+         libsoup2.4-dev
 Description: GUI utility library for evolution data servers (development files)
  The data server, called "Evolution Data Server" is responsible for managing
  calendar and addressbook information.
@@ -276,7 +278,6 @@
          ${shlibs:Depends},
          libgnome2-dev,
          libbonobo2-dev (>= 2.20.3),
-         libgnomevfs2-dev,
          libedataserver1.2-dev,
          libecal1.2-dev
 Description: Backend library for evolution calendars (development files)

Modified: experimental/evolution-data-server/debian/lintian/evolution-data-server
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/lintian/evolution-data-server?rev=1111&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/lintian/evolution-data-server (original)
+++ experimental/evolution-data-server/debian/lintian/evolution-data-server Sun Jan 11 16:46:51 2009
@@ -1,2 +1,4 @@
 # camel-lock-helper-1.2 must have access to the mail lock files
 evolution-data-server: setgid-binary usr/lib/evolution/camel-lock-helper-1.2 2755 root/mail
+# we don't run autoreconf in (unused) embbeded libdb copy
+evolution-data-server: ancient-libtool libdb/dist/ltmain.sh 1.4.2

Added: experimental/evolution-data-server/debian/patches/66_autoreconf-ignore-folders.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/66_autoreconf-ignore-folders.patch?rev=1111&op=file
==============================================================================
--- experimental/evolution-data-server/debian/patches/66_autoreconf-ignore-folders.patch (added)
+++ experimental/evolution-data-server/debian/patches/66_autoreconf-ignore-folders.patch Sun Jan 11 16:46:51 2009
@@ -1,0 +1,23 @@
+commit a2bb87c9e448ebf261513f1dc67d255e4077b062
+Author: Yves-Alexis Perez <corsac at debian.org>
+Date:   Sun Jan 11 15:57:28 2009 +0100
+
+    don't add libdb/dist and calendar/libical to SUBDIRS
+
+diff --git a/configure.in b/configure.in
+index 71b3a72..b1f9c8c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1663,12 +1663,6 @@ export privlibdir
+ export privincludedir
+ export privdatadir
+ 
+-if test $enable_calendar = yes; then
+-        AC_CONFIG_SUBDIRS(calendar/libical)
+-fi
+-if test $dynamic_libdb = no; then
+-        AC_CONFIG_SUBDIRS(libdb/dist)
+-fi
+ AC_OUTPUT([
+ Makefile
+ evolution-data-server-zip

Modified: experimental/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/rules?rev=1111&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/rules (original)
+++ experimental/evolution-data-server/debian/rules Sun Jan 11 16:46:51 2009
@@ -24,6 +24,10 @@
 	--with-libdb=/usr \
 	--enable-gtk-doc \
 	--enable-gnome-keyring=yes
+
+configure/evolution-data-server::
+	dh_testdir
+	autoreconf -vfi
 
 DEB_FIXPERMS_EXCLUDE += usr/lib/evolution/camel-lock-helper*

More information about the pkg-evolution-commits mailing list