r2924 - in /unstable/evolution-rss/debian: changelog control rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed May 18 19:01:02 2016
New Revision: 2924

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2924
Log:
Do not hard code the evolution and evolution-data-server versions but
determine them during build time and restrict the dependencies to >=
$major_version and << $next_major_version. This allows us to simply binNMU
the package when there are new major versions of evolution and
evolution-data-server.

Modified:
    unstable/evolution-rss/debian/changelog
    unstable/evolution-rss/debian/control
    unstable/evolution-rss/debian/rules

Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=2924&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog	(original)
+++ unstable/evolution-rss/debian/changelog	Wed May 18 19:01:02 2016
@@ -3,6 +3,11 @@
   * Team upload.
   * Remove people from Uploaders who haven't made any uploads or changes for
     several years. Thank you all for your past contributions.
+  * Do not hard code the evolution and evolution-data-server versions but
+    determine them during build time and restrict the dependencies to >=
+    $major_version and << $next_major_version. This allows us to simply binNMU
+    the package when there are new major versions of evolution and
+    evolution-data-server.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 18 May 2016 17:55:06 +0200
 

Modified: unstable/evolution-rss/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/control?rev=2924&op=diff
==============================================================================
--- unstable/evolution-rss/debian/control	(original)
+++ unstable/evolution-rss/debian/control	Wed May 18 19:01:02 2016
@@ -29,8 +29,10 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         evolution (>= 3.18), evolution (<< 3.19),
-         evolution-data-server (>= 3.18)
+         evolution (>= ${evo:Version}),
+         evolution (<< ${evo:NextVersion}),
+         evolution-data-server (>= ${eds:Version}),
+         evolution-data-server (<< ${eds:NextVersion}),
 Description: Evolution RSS Reader Plugin
  This plugin adds RSS Feeds support for evolution mail.
  .

Modified: unstable/evolution-rss/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/rules?rev=2924&op=diff
==============================================================================
--- unstable/evolution-rss/debian/rules	(original)
+++ unstable/evolution-rss/debian/rules	Wed May 18 19:01:02 2016
@@ -4,6 +4,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
+
+EDS_VERSION = $(shell pkg-config --modversion evolution-data-server-1.2  | awk -F'.' '{print $$1 "." $$2}')
+EDS_NEXTVERSION = $(shell pkg-config --modversion evolution-data-server-1.2  | awk -F'.' '{print $$1 "." $$2+1}')
+EVO_VERSION = $(shell pkg-config --modversion evolution-shell-3.0  | awk -F'.' '{print $$1 "." $$2}')
+EVO_NEXTVERSION = $(shell pkg-config --modversion evolution-shell-3.0  | awk -F'.' '{print $$1 "." $$2+1}')
+
+DEB_DH_GENCONTROL_ARGS_ALL = -- -Veds:Version=$(EDS_VERSION) -Veds:NextVersion=$(EDS_NEXTVERSION) \
+                                -Vevo:Version=$(EVO_VERSION) -Vevo:NextVersion=$(EVO_NEXTVERSION)
 
 DEB_DH_MAKESHLIBS_ARGS=-Xevolution