[Pkg-octave-commit] rev 648 - trunk/packages/octave2.9-forge/debian

[Thomas Weber]

Author: thomas-guest
Date: 2006-07-20 19:58:45 +0000 (Thu, 20 Jul 2006)
New Revision: 648

Modified:
   trunk/packages/octave2.9-forge/debian/changelog
   trunk/packages/octave2.9-forge/debian/control
   trunk/packages/octave2.9-forge/debian/rules
Log:
Rename the source to octave2.9-forge, as suggested on mentors list

Depend on latest Octave 2.9 version, to get a versioned mkoctfile command and
create a versioned mex command with it

Close ITPs in changelog


Modified: trunk/packages/octave2.9-forge/debian/changelog
===================================================================
--- trunk/packages/octave2.9-forge/debian/changelog	2006-07-19 10:52:50 UTC (rev 647)
+++ trunk/packages/octave2.9-forge/debian/changelog	2006-07-20 19:58:45 UTC (rev 648)
@@ -1,4 +1,4 @@
-octave-forge (2006.07.09-1) unstable; urgency=low
+octave2.9-forge (2006.07.09-1) unstable; urgency=low
 
   NOT YET RELEASED!
 
@@ -6,12 +6,17 @@
   * debian/control: Bumped Standards-Version to 3.7.2 (no changes needed)
 
   [ Thomas Weber ]
+  * Initial release for Octave 2.9 (Closes: #376215, #378171, #352150)
   * debian/compat: Bumped to compatibility level 5.
-  * debian/control: Accordingly, use debhelper V5.
+  * debian/control: Accordingly, use debhelper V5 and drop build-depends on
+    autoconf
   * debian/watch: Use format version 3.
-
+  * debian/rules: Move mex command to mex2.9 and use mkoctfile2.9 for it
+  * Octave 2.9 has full support for sparse matrices (Closes: #295395,
+    #369545)
+  
  -- 
-
+  
 octave-forge (2006.03.17-2) unstable; urgency=low
 
   * Uploaded to unstable, now that the libhdf5 transition is over

Modified: trunk/packages/octave2.9-forge/debian/control
===================================================================
--- trunk/packages/octave2.9-forge/debian/control	2006-07-19 10:52:50 UTC (rev 647)
+++ trunk/packages/octave2.9-forge/debian/control	2006-07-20 19:58:45 UTC (rev 648)
@@ -1,10 +1,10 @@
-Source: octave-forge
+Source: octave2.9-forge
 Section: math
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), octave2.9-headers (>= 2.9.5-7), libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1), libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, netcdfg-dev, graphicsmagick-libmagick-dev-compat, units, cdbs
+Build-Depends: debhelper (>= 5), octave2.9-headers (>= 2.9.6-4), libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1), libgmp3-dev, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, netcdfg-dev, graphicsmagick-libmagick-dev-compat, units, cdbs
 Build-Conflicts: octave2.0-headers, octave2.0, octave2.1-headers, octave2.1
 
 Package: octave2.9-forge

Modified: trunk/packages/octave2.9-forge/debian/rules
===================================================================
--- trunk/packages/octave2.9-forge/debian/rules	2006-07-19 10:52:50 UTC (rev 647)
+++ trunk/packages/octave2.9-forge/debian/rules	2006-07-20 19:58:45 UTC (rev 648)
@@ -19,6 +19,8 @@
 
 PACKAGE := $(DEB_PACKAGES)
 	# octave2.9-forge; we only build one binary, so we can use this variable
+major := $(shell echo $(PACKAGE) | grep -o [0-9].[0-9] -)
+	# 2.1 or 2.9
       
 # We should probably exchange LOCALAPIFCNFILEDIR for LOCALFCNFILEDIR in defs.make 
 # Unless this happens, overwrite it here
@@ -33,6 +35,7 @@
 # around it
 # octbin := $(shell octave-config -p LOCALARCHLIBDIR)
 octbin := $(shell octave-config -p LOCALARCHLIBDIR)/$(shell octave-config -p API_VERSION)
+# /usr/lib/octave/site/exec/i486-pc-linux-gnu/api-v19/
 
 
 
@@ -52,14 +55,17 @@
 				--with-opath=$(OPATH) \
 				--with-xpath=$(XPATH) \
 				--with-altmpath=$(ALTMPATH) \
-				--with-altopath=$(ALTOPATH)
+				--with-altopath=$(ALTOPATH) \
+				MKOCTFILE=mkoctfile$(major)
 
 # run the check commands 
 DEB_MAKE_CHECK_TARGET := check 
 
-# calculate correct dependencies
+# calculate correct dependencies and move mex to mex2.9
 install/$(PACKAGE)::
 	octave-depends 
+	mv debian/$(PACKAGE)/usr/bin/mex debian/$(PACKAGE)/usr/bin/mex$(major)
+	mv debian/$(PACKAGE)/usr/share/man/man1/mex.1 debian/$(PACKAGE)/usr/share/man/man1/mex$(major).1 
 
 # what we don't want in the package
 makebuilddir/$(PACKAGE)::