r1896 - in /experimental/evolution-data-server3/debian: changelog control libcamel-1.2-23.shlibs rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Apr 10 09:43:14 2011
New Revision: 1896

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1896
Log:
* Automatically generate better shlibs for libcamel.
* Tighten dependencies on libcamel and e-d-s-common.

Removed:
    experimental/evolution-data-server3/debian/libcamel-1.2-23.shlibs
Modified:
    experimental/evolution-data-server3/debian/changelog
    experimental/evolution-data-server3/debian/control
    experimental/evolution-data-server3/debian/rules

Modified: experimental/evolution-data-server3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server3/debian/changelog?rev=1896&op=diff
==============================================================================
--- experimental/evolution-data-server3/debian/changelog (original)
+++ experimental/evolution-data-server3/debian/changelog Sun Apr 10 09:43:14 2011
@@ -2,11 +2,12 @@
 
   * Rename source package to allow parallel installation/migration for
     libedataserverui.
-  * Fix missing file rename for libcamel.shlibs.
   * New upstream stable release.
   * 01_calendar_exit.patch: stolen upstream. Fix a process not exiting 
     at the end of the session.
   * Fix short description for libcamel.
+  * Automatically generate better shlibs for libcamel.
+  * Tighten dependencies on libcamel and e-d-s-common.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 10 Apr 2011 10:55:32 +0200
 

Modified: experimental/evolution-data-server3/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server3/debian/control?rev=1896&op=diff
==============================================================================
--- experimental/evolution-data-server3/debian/control (original)
+++ experimental/evolution-data-server3/debian/control Sun Apr 10 09:43:14 2011
@@ -55,7 +55,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         evolution-data-server-common (= ${source:Version})
+         evolution-data-server-common (= ${source:Version}),
+         libcamel-1.2-23 (= ${binary:Version})
 Suggests: evolution (>= 2.6.1),
           evolution-data-server-dbg (= ${binary:Version})
 Replaces: evolution-data-server1.2
@@ -201,7 +202,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         evolution-data-server-common (>= 2.91)
+         evolution-data-server-common (= ${source:Version})
 Conflicts: libedataserverui1.2-dev
 Description: GUI utility library for evolution data servers
  The data server, called "Evolution Data Server" is responsible for managing

Modified: experimental/evolution-data-server3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server3/debian/rules?rev=1896&op=diff
==============================================================================
--- experimental/evolution-data-server3/debian/rules (original)
+++ experimental/evolution-data-server3/debian/rules Sun Apr 10 09:43:14 2011
@@ -6,7 +6,8 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 #include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk                  
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/hardening-includes/hardening.make
 
 GNOME_MODULE := evolution-data-server
@@ -14,6 +15,7 @@
 DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V
+DEB_DH_MAKESHLIBS_ARGS_libcamel-1.2-23 += -V'libcamel-1.2-23 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-23 (<< $(DEB_GNOME_NEXTVERSION))'
 
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)