[Pkg-octave-commit] [SCM] Debian packaging for octave-pkg-dev branch, master, updated. af7b13bd41f5fbf57100e2142a7de12fb81b3389

Thomas Weber tweber at debian.org
Sun Feb 19 11:33:29 UTC 2012


The following commit has been merged in the master branch:
commit 1b9b7e93a1ebfce19869318b213d460784096c93
Author: Thomas Weber <tweber at debian.org>
Date:   Sat Oct 8 19:49:16 2011 +0200

    Remove MINVER variable

diff --git a/debian/rules b/debian/rules
index f81be9e..6ad7583 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,12 @@
 # debian/rules for the octave-pkg-dev Debian package
 
 OCTPKG = octave
-MINVER = 3.2.0-1
 FILES = octave-pkg.mk octave-pkg-helper
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 %: %.in
-	sed 's/@OCTAVE@/$(OCTPKG)/;s/@MINVER@/$(MINVER)/' < $< > $@
+	sed 's/@OCTAVE@/$(OCTPKG)/' < $< > $@
 
 build/octave-pkg-dev:: $(FILES)
 	chmod +x octave-pkg-helper
diff --git a/octave-pkg-helper.in b/octave-pkg-helper.in
index 6b58c4f..6a5756c 100644
--- a/octave-pkg-helper.in
+++ b/octave-pkg-helper.in
@@ -49,8 +49,9 @@ if (open (DESC, "< DESCRIPTION")) {
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
     delsubstvar ($package, 'octave:Depends');
-    addsubstvar ($package, 'octave:Depends', '@OCTAVE@', '>= @MINVER@');
+    addsubstvar ($package, 'octave:Depends', 'octave');
     for my $pkg (keys %depends) {
+        # add dependencies from the DESCRIPTION file
         addsubstvar ($package, 'octave:Depends', $pkg, $depends {$pkg});
     }
 }

-- 
Debian packaging for octave-pkg-dev



More information about the Pkg-octave-commit mailing list