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

[Rafael Laboissiere]

Author: rafael
Date: 2006-08-16 08:34:35 +0000 (Wed, 16 Aug 2006)
New Revision: 706

Modified:
   trunk/packages/octave2.9-forge/debian/
   trunk/packages/octave2.9-forge/debian/changelog
   trunk/packages/octave2.9-forge/debian/control
   trunk/packages/octave2.9-forge/debian/octave2.9-forge.install
   trunk/packages/octave2.9-forge/debian/rules
Log:
Debian release octave2.9-forge_2006.07.09+dfsg1-2


Property changes on: trunk/packages/octave2.9-forge/debian
___________________________________________________________________
Name: svn:ignore
   - files
octave2.9-forge.substvars
octave2.9-forge
stamp-*

   + files
octave2.9-forge.substvars
octave2.9-forge
stamp-*
octave-forge.substvars
octave-forge
tmp


Modified: trunk/packages/octave2.9-forge/debian/changelog
===================================================================
--- trunk/packages/octave2.9-forge/debian/changelog	2006-08-15 22:42:50 UTC (rev 705)
+++ trunk/packages/octave2.9-forge/debian/changelog	2006-08-16 08:34:35 UTC (rev 706)
@@ -1,3 +1,19 @@
+octave2.9-forge (2006.07.09+dfsg1-2) unstable; urgency=low
+
+  * Rebuilt for Octave 2.9.7 since the API number bumped from 19 to 20.
+  * debian/control: Build-depends on octave2.9 >= 2.9.7
+
+  * debian/rules: Since the mex stuff was imported into octave in 2.9.7,
+    disable building anything in the extra/mex directory (cf
+    http://www.cae.wisc.edu/pipermail/octave-maintainers/2006-July/000440.html)
+    Also, removed settings of symlinks for mex executable and manpage.
+  * debian/octave2.9-forge.install: Do not install usr/bin and usr/man,
+    because there is no mex binary and manpage there anymore
+
+  * debian/rules: Do realclean in the whole main/fixed/ directory
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 15 Aug 2006 14:15:22 +0200
+
 octave2.9-forge (2006.07.09+dfsg1-1) unstable; urgency=low
 
   [ Thomas Weber ]
@@ -3,10 +19,10 @@
   * Repackaged the upstream source; removed nonfree/splines/gcvsplf.f and
     its license file. This should not have any influence on end users, as
-    we never built this part. This change brought to you by 
+    we never built this part. This change brought to you by
     Joerg 'Eagle Eye' Jaspert ;)
   * This upload still (Closes: #376215, #378171, #352150, #29539, #369545)
 
   [ Dirk Eddelbuettel ]
-  * Built and uploaded while Rafael is travelling 
+  * Built and uploaded while Rafael is travelling
   * debian/control: Added myself to Uploaders, feel free to remove again
   * Removed .svn directories from debian/ and debian/patches for lintian
@@ -16,10 +32,6 @@
 
 octave2.9-forge (2006.07.09-1) unstable; urgency=low
 
-  [ Rafael Laboissiere ]
-  * debian/control: Bumped Standards-Version to 3.7.2 (no changes needed)
-  * debian/rules: Remove *.octlink files not deleted by "make clean"
-
   [ Thomas Weber ]
   * Initial release for Octave 2.9 (Closes: #376215, #378171, #352150)
   * debian/compat: Bumped to compatibility level 5.
@@ -30,6 +42,10 @@
   * Octave 2.9 has full support for sparse matrices (Closes: #295395,
     #369545)
 
+  [ Rafael Laboissiere ]
+  * debian/control: Bumped Standards-Version to 3.7.2 (no changes needed)
+  * debian/rules: Remove *.octlink files not deleted by "make clean"
+
  -- Rafael Laboissiere <rafael at debian.org>  Mon, 24 Jul 2006 14:47:09 +0200
 
 octave-forge (2006.03.17-2) unstable; urgency=low

Modified: trunk/packages/octave2.9-forge/debian/control
===================================================================
--- trunk/packages/octave2.9-forge/debian/control	2006-08-15 22:42:50 UTC (rev 705)
+++ trunk/packages/octave2.9-forge/debian/control	2006-08-16 08:34:35 UTC (rev 706)
@@ -4,7 +4,7 @@
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>, Dirk Eddelbuettel <edd at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), octave2.9-headers (>= 2.9.6-4),
+Build-Depends: debhelper (>= 5), octave2.9-headers (>= 2.9.7),
  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,

Modified: trunk/packages/octave2.9-forge/debian/octave2.9-forge.install
===================================================================
--- trunk/packages/octave2.9-forge/debian/octave2.9-forge.install	2006-08-15 22:42:50 UTC (rev 705)
+++ trunk/packages/octave2.9-forge/debian/octave2.9-forge.install	2006-08-16 08:34:35 UTC (rev 706)
@@ -1,5 +1,3 @@
-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-08-15 22:42:50 UTC (rev 705)
+++ trunk/packages/octave2.9-forge/debian/rules	2006-08-16 08:34:35 UTC (rev 706)
@@ -64,10 +64,6 @@
 # calculate correct dependencies and move mex to mex2.9
 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
 
 # what we don't want in the package
 makebuilddir/$(PACKAGE)::
@@ -75,6 +71,8 @@
 		# we aren't MacOS, honest
 	touch $(CURDIR)/extra/testfun/NOINSTALL
 		# sparse code and testfunctions are in Octave 2.9
+	touch $(CURDIR)/extra/mex/NOINSTALL
+		# mex support introduced in Octave 2.9.7
 	# touch $(CURDIR)/FIXES/NOINSTALL
 		# the FIXES directory has been removed upstream
 
@@ -85,4 +83,4 @@
 # clean files left after "make clean"
 clean::
 	find . -type f -name \*.octlink | xargs rm -f
-	$(MAKE) -C main/fixed/doc realclean
+	$(MAKE) -C main/fixed realclean