[Pkg-octave-commit] rev 664 - trunk/packages/octave2.9-forge/debian
Thomas Weber
thomas-guest at costa.debian.org
Sun Jul 23 17:57:55 UTC 2006
Author: thomas-guest
Date: 2006-07-23 17:57:55 +0000 (Sun, 23 Jul 2006)
New Revision: 664
Added:
trunk/packages/octave2.9-forge/debian/octave2.9-forge.install
Modified:
trunk/packages/octave2.9-forge/debian/control
trunk/packages/octave2.9-forge/debian/rules
Log:
octave-forge meta package is built by octave2.9-forge; modify rules file for a
build with several binary packages and introduce octave2.9-forge.install for
splitting the packages.
Don't conflict with octave-forge any longer.
Show which toolboxes aren't built.
Modified: trunk/packages/octave2.9-forge/debian/control
===================================================================
--- trunk/packages/octave2.9-forge/debian/control 2006-07-23 17:51:28 UTC (rev 663)
+++ trunk/packages/octave2.9-forge/debian/control 2006-07-23 17:57:55 UTC (rev 664)
@@ -12,8 +12,8 @@
Build-Conflicts: octave2.0-headers, octave2.0, octave2.1-headers, octave2.1
Package: octave2.9-forge
-Replaces: octave-matcompat, octave-forge
-Conflicts: octave-matcompat, octave-forge
+Replaces: octave-matcompat
+Conflicts: octave-matcompat
Architecture: any
Depends: ${octave:Depends}, ${shlibs:Depends}
Suggests: grace, units
@@ -35,3 +35,19 @@
install octave2.1-forge.
.
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.
+
Added: trunk/packages/octave2.9-forge/debian/octave2.9-forge.install
===================================================================
--- trunk/packages/octave2.9-forge/debian/octave2.9-forge.install 2006-07-23 17:51:28 UTC (rev 663)
+++ trunk/packages/octave2.9-forge/debian/octave2.9-forge.install 2006-07-23 17:57:55 UTC (rev 664)
@@ -0,0 +1,5 @@
+debian/tmp/usr/bin usr/
+debian/tmp/usr/lib/octave usr/lib/
+debian/tmp/usr/share/man/man1 usr/share/man
+debian/tmp/usr/share/octave usr/share/
+debian/tmp/usr/share/octave2.9-forge-alternatives usr/share
Modified: trunk/packages/octave2.9-forge/debian/rules
===================================================================
--- trunk/packages/octave2.9-forge/debian/rules 2006-07-23 17:51:28 UTC (rev 663)
+++ trunk/packages/octave2.9-forge/debian/rules 2006-07-23 17:57:55 UTC (rev 664)
@@ -17,8 +17,8 @@
# defs.make points to the correct defs.make-x.y.z
# We ensure the correct version by build-conflicts in control
-PACKAGE := $(DEB_PACKAGES)
- # octave2.9-forge; we only build one binary, so we can use this variable
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+ # octave2.9-forge;
major := $(shell echo $(PACKAGE) | grep -o [0-9].[0-9] -)
# 2.1 or 2.9
@@ -64,16 +64,20 @@
# 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
+ 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
# 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
# touch $(CURDIR)/FIXES/NOINSTALL
# the FIXES directory has been removed upstream
+# show what's not installed
+configure/$(PACKAGE)::
+ find . -name NOINSTALL -print
More information about the Pkg-octave-commit
mailing list