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

[Thomas Weber]

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

    Drop OCTVER from files - no more octave-specific versioning

diff --git a/debian/rules b/debian/rules
index a2144bd..f81be9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,14 @@
 #
 # debian/rules for the octave-pkg-dev Debian package
 
-OCTVER = 3.2
-OCTPKG = octave$(OCTVER)
+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/@OCTVER@/$(OCTVER)/;s/@MINVER@/$(MINVER)/' < $< > $@
+	sed 's/@OCTAVE@/$(OCTPKG)/;s/@MINVER@/$(MINVER)/' < $< > $@
 
 build/octave-pkg-dev:: $(FILES)
 	chmod +x octave-pkg-helper
diff --git a/octave-pkg.mk.in b/octave-pkg.mk.in
index 0763f0f..6472b3b 100644
--- a/octave-pkg.mk.in
+++ b/octave-pkg.mk.in
@@ -27,9 +27,8 @@ 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 = @OCTVER@
-mpath = usr/share/octave/packages/$(octver)
-bpath = usr/lib/octave/packages/$(octver)
+mpath = usr/share/octave/packages
+bpath = usr/lib/octave/packages
 pkgname = $(package:octave-%=%)
 hosttype = $(shell octave-config -p CANONICAL_HOST_TYPE)
 apiversion = $(shell octave-config -p API_VERSION)
@@ -125,7 +124,7 @@ check-pkg:
 				print "disp (\"[$$1]\")\ntest $$1"'	\
 			>> $$tmp ;				\
 	fi ;							\
-	octave3.2 $(octave_options) $$tmp ;			\
+	octave $(octave_options) $$tmp ;			\
 	rm -f $$tmp
 
 	@if [ -f debian/check.m ] ; then			\

-- 
Debian packaging for octave-pkg-dev