[Pkg-octave-commit] rev 663 - trunk/packages/octave2.1-forge/debian

[Thomas Weber]

Author: thomas-guest
Date: 2006-07-23 17:51:28 +0000 (Sun, 23 Jul 2006)
New Revision: 663

Removed:
   trunk/packages/octave2.1-forge/debian/octave2.1-forge.install
Modified:
   trunk/packages/octave2.1-forge/debian/control
   trunk/packages/octave2.1-forge/debian/rules
Log:
Move octave-forge meta package to octave2.9-forge, circumventing version
numbering. Thus, we only have on source package, so we can drop
octave2.1-forge.install.

Adapt the rules file as well for it and show which toolboxes won't be installed


Modified: trunk/packages/octave2.1-forge/debian/control
===================================================================
--- trunk/packages/octave2.1-forge/debian/control	2006-07-22 20:14:21 UTC (rev 662)
+++ trunk/packages/octave2.1-forge/debian/control	2006-07-23 17:51:28 UTC (rev 663)
@@ -34,18 +34,3 @@
  .
   Homepage: http://octave.sourceforge.net
 
-Package: octave-forge
-Architecture: all
-Depends: octave2.1-forge
-Description: Contributed functions for GNU Octave (2.1 branch)
- Octave is a (mostly Matlab (R) compatible) high-level language, primarily
- intended for numerical computations. It provides a convenient command-line
- interface for solving linear and nonlinear problems numerically.
- .
- This package is an empty 'virtual' package whose sole purpose is to
- install the an octave-forge version compatible to Octave 2.1 (the
- recommended testing branch) .
- .
- Once you have the octave2.1-forge package installed, you can remove this
- package.
-

Deleted: trunk/packages/octave2.1-forge/debian/octave2.1-forge.install

Modified: trunk/packages/octave2.1-forge/debian/rules
===================================================================
--- trunk/packages/octave2.1-forge/debian/rules	2006-07-22 20:14:21 UTC (rev 662)
+++ trunk/packages/octave2.1-forge/debian/rules	2006-07-23 17:51:28 UTC (rev 663)
@@ -19,8 +19,8 @@
 	# defs.make points to the correct defs.make-x.y.z
 	# We ensure the correct version by build-conflicts in control
 
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-	# octave2.1-forge; 
+PACKAGE := $(DEB_PACKAGES)
+	# octave2.1-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
 
@@ -69,18 +69,18 @@
 # calculate correct dependencies and move mex to mex2.1
 install/$(PACKAGE)::
 	octave-depends
-	mv $(CURDIR)/debian/tmp/usr/bin/mex \
-		$(CURDIR)/debian/tmp/usr/bin/mex$(major)
-	mv $(CURDIR)/debian/tmp/usr/share/man/man1/mex.1 \
-		$(CURDIR)/debian/tmp/usr/share/man/man1/mex$(major).1
+	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)::
 	touch $(CURDIR)/extra/MacOSX/NOINSTALL
 		# we aren't MacOS, honest
 	touch $(CURDIR)/main/sparse/NOINSTALL 
-	touch $(CURDIR)/extra/testfun/NOINSTALL
-		# sparse code and testfunctions are in Octave 2.9 
+		# sparse code in octave-forge doesn't work for Octave 2.1
 	# touch $(CURDIR)/FIXES/NOINSTALL
 		# the FIXES directory has been removed upstream
 
+# show what's not installed
+configure/$(PACKAGE)::
+	find . -name NOINSTALL -print