[Pkg-mono-svn-commits] rev 2232 - xsp/trunk/debian

[D. Moonfire]

Author: dmoonfire-guest
Date: 2006-02-05 23:22:08 +0000 (Sun, 05 Feb 2006)
New Revision: 2232

Modified:
   xsp/trunk/debian/changelog
   xsp/trunk/debian/control
   xsp/trunk/debian/rules
Log:
Used dh_gencontrol variables instead of hard-coding. Used perl to identify
the version and the next version for the version lock-stepping.


Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog	2006-02-05 23:02:35 UTC (rev 2231)
+++ xsp/trunk/debian/changelog	2006-02-05 23:22:08 UTC (rev 2232)
@@ -5,6 +5,8 @@
     + debian/control
       - Added a stricter requirement to mono-classlib-1.0 and
         2.0. (Closes: #303755, #332726)
+    + debian/rules
+      - Adding perl to figure out version for requirements.
   * Added Portuguese translation. (Closes #336701)
   * Added Swedish translation. (Closes #351219)
 

Modified: xsp/trunk/debian/control
===================================================================
--- xsp/trunk/debian/control	2006-02-05 23:02:35 UTC (rev 2231)
+++ xsp/trunk/debian/control	2006-02-05 23:22:08 UTC (rev 2232)
@@ -4,11 +4,11 @@
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Dylan R. E. Moonfire <debian at mfgames.com>
 Standards-Version: 3.6.2.1
-Build-Depends-Indep: debhelper (>= 5.0.0), autotools-dev, mono-gmcs, mono-mcs, mono-gac, libmono-dev, cli-common (>= 0.2.0)
+Build-Depends-Indep: debhelper (>= 5.0.0), autotools-dev, mono-gmcs, mono-mcs, mono-gac, libmono-dev, cli-common (>= 0.2.0), perl, coreutils
 
 Package: mono-xsp-base
 Architecture: all
-Depends: ${cli:Depends}, mono-mcs, mono-classlib-1.0 (>= 1.1.13), mono-classlib-1.0 (<< 1.1.14)
+Depends: ${cli:Depends}, mono-mcs, mono-classlib-1.0 (>= ${current-version}), mono-classlib-1.0 (<< ${next-version})
 Conflicts: mono-utils (<= 1.1.9.2-1)
 Description: base libraries for XSP 1.1
  This is the core libraries needed to install the XSP application,
@@ -17,7 +17,7 @@
 
 Package: mono-xsp2-base
 Architecture: all
-Depends: ${cli:Depends}, mono-gmcs, mono-classlib-2.0 (>= 1.1.13), mono-classlib-2.0 (<< 1.1.14)
+Depends: ${cli:Depends}, mono-gmcs, mono-classlib-2.0 (>= ${current-version}), mono-classlib-2.0 (<< ${next-version})
 Description: base libraries for XSP 2.0
  This is the core libraries needed to install the XSP2 application,
  either through the standalone version (XSP2) or the Apache module

Modified: xsp/trunk/debian/rules
===================================================================
--- xsp/trunk/debian/rules	2006-02-05 23:02:35 UTC (rev 2231)
+++ xsp/trunk/debian/rules	2006-02-05 23:22:08 UTC (rev 2232)
@@ -5,6 +5,11 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+# Perl code to figure out the current version and the next "potential" version
+DPKG_VERSION ?= $(shell head -n 1 debian/changelog  | cut -f 2 -d '(' | cut -f 1 -d ')')
+PKG_VERSION ?= $(shell echo $(DPKG_VERSION) | cut -f 1 -d '-' | cut -f 1-3 -d '.')
+NEXT_PKG_VERSION ?= $(shell echo $(PKG_VERSION) | perl -e '$$_=<>;/\.(\d+)$$/;$$a=$$1+1;s/\.(\d+)$$/.$$a/;print;')
+
 export MONO_SHARED_DIR=$(CURDIR)
 
 configure: configure-stamp templates.pot
@@ -146,7 +151,8 @@
 	dh_installdeb
 	dh_shlibdeps
 	dh_clideps -d
-	dh_gencontrol
+	dh_gencontrol -- \
+		-Vcurrent-version=$(PKG_VERSION) -Vnext-version=$(NEXT_PKG_VERSION)
 	dh_md5sums
 	dh_builddeb