[Pkg-octave-commit] rev 595 - in trunk/packages/octave/debian: . in

[Thomas Weber]

Author: thomas-guest
Date: 2006-04-30 21:12:31 +0000 (Sun, 30 Apr 2006)
New Revision: 595

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/defs.make
   trunk/packages/octave/debian/rules
Log:
enable parallel builds (in the sense that the build process does not die -- no
parallel build is enabled by default)
remove octav-config2.x symlink -- it proved unnecessary
use api-versioned directory for m files


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-04-30 12:49:32 UTC (rev 594)
+++ trunk/packages/octave/debian/changelog	2006-04-30 21:12:31 UTC (rev 595)
@@ -4,6 +4,11 @@
 
   [ Rafael Laboissiere ]
   * debian/control: Bumped Standards-Version to 3.7.0 (no changes needed)
+  
+  [ Thomas Weber ]
+  * debian/rules: Make parallel build possible and remove octave-config2.X
+    link -- it is not needed
+    defs.make: use api-versioned directory for m-files
 
  --
 

Modified: trunk/packages/octave/debian/in/defs.make
===================================================================
--- trunk/packages/octave/debian/in/defs.make	2006-04-30 12:49:32 UTC (rev 594)
+++ trunk/packages/octave/debian/in/defs.make	2006-04-30 21:12:31 UTC (rev 595)
@@ -2,5 +2,5 @@
 # Written by Rafael Laboissiere <rafael at debian.org>
 # $Id$
 
-MDIR = $(shell octave-config- at VERSION@  --print LOCALFCNFILEDIR)
+MDIR = $(shell octave-config- at VERSION@  --print LOCALAPIFCNFILEDIR)
 OCTDIR = $(shell octave-config- at VERSION@  --print LOCALAPIOCTFILEDIR)

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-04-30 12:49:32 UTC (rev 594)
+++ trunk/packages/octave/debian/rules	2006-04-30 21:12:31 UTC (rev 595)
@@ -313,10 +313,6 @@
 		usr/bin/octave-$(version) usr/bin/$(PACKAGE)
 	dh_link --package=$(PACKAGE) \
 		/usr/share/man/man1/octave-$(version).1.gz /usr/share/man/man1/octave$(major).1.gz
-	dh_link --package=$(PACKAGE) \
-		usr/bin/octave-config-$(version) usr/bin/octave-config$(major)
-	dh_link --package=$(PACKAGE) \
-		/usr/share/man/man1/octave-config-$(version).1.gz /usr/share/man/man1/octave-config$(major).1.gz
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
@@ -334,3 +330,5 @@
 binary: install maintainer-scripts binary-arch binary-indep
 .PHONY: build clean make configure binary-indep binary-arch binary
 
+.NOTPARALLEL:
+