[Pkg-mono-svn-commits] rev 2233 - libapache-mod-mono/trunk/debian

[D. Moonfire]

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

Modified:
   libapache-mod-mono/trunk/debian/changelog
   libapache-mod-mono/trunk/debian/control
   libapache-mod-mono/trunk/debian/rules
Log:
Used perl to identify the version and next version, then used
dh_gencontrol to put those into variables. Also removed a ", ,"
in the control file.


Modified: libapache-mod-mono/trunk/debian/changelog
===================================================================
--- libapache-mod-mono/trunk/debian/changelog	2006-02-05 23:22:08 UTC (rev 2232)
+++ libapache-mod-mono/trunk/debian/changelog	2006-02-05 23:22:38 UTC (rev 2233)
@@ -7,6 +7,9 @@
       files.
     + debian/control
       - Tightened required versions of XSP libraries.
+    + debian/rules
+      - Added perl code to identify the version for tightening
+        requirements between the various packages
 
  -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Wed, 25 Jan 2006 14:22:11 -0600
 

Modified: libapache-mod-mono/trunk/debian/control
===================================================================
--- libapache-mod-mono/trunk/debian/control	2006-02-05 23:22:08 UTC (rev 2232)
+++ libapache-mod-mono/trunk/debian/control	2006-02-05 23:22:38 UTC (rev 2233)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade at debian.org>, Pablo Fischer <pablo at pablo.com.mx>, Dylan R. E. Moonfire <debian at mfgames.com>
-Build-Depends: debhelper (>= 4.1.16), apache-dev, apache2-dev, libmono-dev
+Build-Depends: debhelper (>= 4.1.16), apache-dev, apache2-dev, libmono-dev, perl, coreutils
 Standards-Version: 3.6.2.1
 
 Package: libapache-mod-mono
 Architecture: any
 Section: web
-Depends: ${shlibs:Depends}, debconf (>= 1.2.0), apache (>= 1.3.31) | apache-perl | apache-ssl, mono-jit (>= 1.0.1), mono-apache-server (>= 1.1.13) | mono-apache-server2 (>= 1.1.13), , mono-apache-server (<< 1.1.14) | mono-apache-server2 (<< 1.1.14), wwwconfig-common
+Depends: ${shlibs:Depends}, debconf (>= 1.2.0), apache (>= 1.3.31) | apache-perl | apache-ssl, mono-jit (>= 1.0.1), mono-apache-server (>= ${current-version}) | mono-apache-server2 (>= ${current-version}), mono-apache-server (<< ${next-version}) | mono-apache-server2 (<< ${next-version}), wwwconfig-common
 Description: Run ASP.NET Pages on UNIX with Apache and Mono
  mod_mono is a module for Apache that enables you to write ASP.NET web
  applications, using the Mono .NET implementation.
@@ -19,7 +19,7 @@
 Package: libapache2-mod-mono
 Architecture: any
 Section: web
-Depends: ${shlibs:Depends}, apache2 (>= 2.0.50), mono-jit (>= 1.0.1), mono-apache-server (>= 1.1.13) | mono-apache-server2 (>= 1.1.13), mono-apache-server (<< 1.1.14) | mono-apache-server2 (<< 1.1.14)
+Depends: ${shlibs:Depends}, apache2 (>= 2.0.50), mono-jit (>= 1.0.1), mono-apache-server (>= ${current-version}) | mono-apache-server2 (>= ${current-version}), mono-apache-server (<< ${next-version}) | mono-apache-server2 (<< ${next-version})
 Description: Run ASP.NET Pages on UNIX with Apache 2 and Mono
  mod_mono is a module for Apache that enables you to write ASP.NET web
  applications, using the Mono .NET implementation.

Modified: libapache-mod-mono/trunk/debian/rules
===================================================================
--- libapache-mod-mono/trunk/debian/rules	2006-02-05 23:22:08 UTC (rev 2232)
+++ libapache-mod-mono/trunk/debian/rules	2006-02-05 23:22:38 UTC (rev 2233)
@@ -12,6 +12,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;')
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -129,7 +134,8 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- \
+		-Vcurrent-version=$(PKG_VERSION) -Vnext-version=$(NEXT_PKG_VERSION)
 	dh_md5sums
 	dh_builddeb