[Pkg-octave-commit] [SCM] octave-pkg-dev branch, master, updated. 6ebacb3770a92f0e08517cc8d994118b7ead5d0a

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 54bf53956b7875a714cb599d795d7a0ab7ecca76
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat Jun 6 22:28:35 2009 +0200

    Use OCTVER and MINVER substitution variables

diff --git a/debian/changelog b/debian/changelog
index 58515d9..a5a6802 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+octave-pkg-dev (0.6.8) UNRELEASED; urgency=low
+
+  * debian/rules, octave-pkg.mk.in, octave-pkg-helper.in: Use separate
+    OCTVER for the major version number and MINVER for the minimum
+    depending version of Octave
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 06 Jun 2009 22:26:48 +0200
+
 octave-pkg-dev (0.6.7) unstable; urgency=low
 
   * octave-pkg.mk.in: Create global and local package list files inside
diff --git a/debian/rules b/debian/rules
index 24c6af3..bcf7d33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,15 @@
 #
 # debian/rules for the octave-pkg-dev Debian package
 
-OCTPKG = octave3.0
-OCTVER = 1:3.0.2-3
+OCTVER = 3.0
+OCTPKG = octave$(OCTVER)
+MINVER = 1:3.0.2-3
 FILES = octave-pkg.mk octave-pkg-helper
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 %: %.in
-	sed 's/@OCTAVE@/$(OCTPKG)/;s/@VERSION@/$(OCTVER)/' < $< > $@
+	sed 's/@OCTAVE@/$(OCTPKG)/;s/@OCTVER@/$(OCTVER)/;s/@MINVER@/$(MINVER)/' < $< > $@
 
 build/octave-pkg-dev:: $(FILES)
 	chmod +x octave-pkg-helper
diff --git a/octave-pkg-helper.in b/octave-pkg-helper.in
index a2967c8..04ce8c1 100644
--- a/octave-pkg-helper.in
+++ b/octave-pkg-helper.in
@@ -49,7 +49,7 @@ if (open (DESC, "< DESCRIPTION")) {
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
     delsubstvar ($package, 'octave:Depends');
-    addsubstvar ($package, 'octave:Depends', '@OCTAVE@', '>= @VERSION@');
+    addsubstvar ($package, 'octave:Depends', '@OCTAVE@', '>= @MINVER@');
     for my $pkg (keys %depends) {
         addsubstvar ($package, 'octave:Depends', $pkg, $depends {$pkg});
     }
diff --git a/octave-pkg.mk.in b/octave-pkg.mk.in
index 8a12023..f583516 100644
--- a/octave-pkg.mk.in
+++ b/octave-pkg.mk.in
@@ -27,7 +27,7 @@ debpkg = debian/$(package)
 shrpkg = /usr/share/octave/debian
 # The directories below are versioned.  We only support the packages for the
 # stable version of Octave
-octver = 3.0
+octver = @OCTVER@
 mpath = usr/share/octave/packages/$(octver)
 bpath = usr/lib/octave/packages/$(octver)
 pkgname = $(package:octave-%=%)

-- 
octave-pkg-dev