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

[Rafael Laboissiere]

Author: rafael
Date: 2006-01-22 17:40:41 +0000 (Sun, 22 Jan 2006)
New Revision: 460

Added:
   trunk/packages/octave/debian/in/defs.make
Removed:
   trunk/packages/octave/debian/defs.make
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave-depends
   trunk/packages/octave/debian/rules
Log:
Debian release octave2.1_2.1.72-9

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-01-22 00:10:45 UTC (rev 459)
+++ trunk/packages/octave/debian/changelog	2006-01-22 17:40:41 UTC (rev 460)
@@ -1,3 +1,10 @@
+octave2.1 (1:2.1.72-9) unstable; urgency=low
+
+  * debian/in/deps.make: Added this template file, where the octave-config
+    command is versioned.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 22 Jan 2006 17:07:19 +0100
+
 octave2.9 (2.9.4-10) unstable; urgency=low
 
   * debian/in/control: Generate octave package only for the 2.1 branch.

Deleted: trunk/packages/octave/debian/defs.make

Copied: trunk/packages/octave/debian/in/defs.make (from rev 455, trunk/packages/octave/debian/defs.make)
===================================================================
--- trunk/packages/octave/debian/defs.make	2006-01-20 15:32:17 UTC (rev 455)
+++ trunk/packages/octave/debian/in/defs.make	2006-01-22 17:40:41 UTC (rev 460)
@@ -0,0 +1,6 @@
+# Installation paths for use in debian/rules of Octave-related packages
+# Written by Rafael Laboissiere <rafael at debian.org>
+# $Id$
+
+MDIR = $(shell octave-config- at VERSION@  --print LOCALFCNFILEDIR)
+OCTDIR = $(shell octave-config- at VERSION@  --print LOCALAPIOCTFILEDIR)

Modified: trunk/packages/octave/debian/in/octave-depends
===================================================================
--- trunk/packages/octave/debian/in/octave-depends	2006-01-22 00:10:45 UTC (rev 459)
+++ trunk/packages/octave/debian/in/octave-depends	2006-01-22 17:40:41 UTC (rev 460)
@@ -18,7 +18,7 @@
 
 =head1 NAME
 
-octave-deps - calculates Octave dependencies
+octave-depends - calculates Octave dependencies
 
 =cut
 
@@ -49,7 +49,7 @@
 my $octver = `$octcfg --version 2>&1`
 	or die "Command $octcfg not found";
 chomp $octver;
-  
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	delsubstvar($package, "octave:Depends");

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-01-22 00:10:45 UTC (rev 459)
+++ trunk/packages/octave/debian/rules	2006-01-22 17:40:41 UTC (rev 460)
@@ -87,7 +87,7 @@
 		sed 's/@VERSION@/$(version)/g;s/@PACKAGE@/$(PACKAGE)/g;s/@MAJOR@/$(major)/g;s/@PRIORITY@/$(priority)/g;' \
 			< $$in > $$out ; \
 	done
-	for f in watch octave-depends ; do \
+	for f in watch octave-depends defs.make ; do \
 		sed 's/@VERSION@/$(version)/g;s/@MAJOR@/$(major)/g' \
 			< debian/in/$$f > debian/$$f ; \
 	done
@@ -180,7 +180,7 @@
 
 	rm -f `ls debian/in/PACKAGE* | sed 's/PACKAGE/$(PACKAGE)/;s:/in::'`
 	rm -f octave-depends-$(version).1 
-	( cd debian ; rm -f watch octave-depends )
+	( cd debian ; rm -f watch octave-depends defs.make )
 
 	for f in $(texifiles) ; do			\
 		test ! -f $$f-save || mv $$f-save $$f ;	\