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

[Rafael Laboissiere]

Author: rafael
Date: 2006-03-14 10:33:32 +0000 (Tue, 14 Mar 2006)
New Revision: 508

Added:
   trunk/packages/octave/debian/in/octave2.1-watch
   trunk/packages/octave/debian/in/octave2.9-watch
Removed:
   trunk/packages/octave/debian/in/watch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/rules
Log:
New mechanism for generating the debian/watch file

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-03-13 11:23:36 UTC (rev 507)
+++ trunk/packages/octave/debian/changelog	2006-03-14 10:33:32 UTC (rev 508)
@@ -1,7 +1,16 @@
+octave2.1 (1:2.1.72-12) unstable; urgency=low
+
+   NOT YET RELEASED!
+
+   [ Rafael Laboissiere ]
+  * New mechanism for obtaining the versioned debian/watch files
+  * debian/in/octave*-watch: Source files the uscan files
+  * debian/rules: Geenrated debian/watch from debian/in/octave*-watch
+
+ --
+
 octave2.1 (1:2.1.72-11) unstable; urgency=low
 
-   [ Rafael Laboissiere ]
-  
   * debian/patches/50_g++4.1.dpatch: Added patch proposed by John W. Eaton
     to allow compilation with g++ 4.1.
   * debian/patches/50_octave-value-list-resize-2.1.dpatch: Adjusted patch

Added: trunk/packages/octave/debian/in/octave2.1-watch
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-watch	2006-03-13 11:23:36 UTC (rev 507)
+++ trunk/packages/octave/debian/in/octave2.1-watch	2006-03-14 10:33:32 UTC (rev 508)
@@ -0,0 +1,5 @@
+# format version number, currently 2; this line is compulsory!
+version=2
+
+# This is one format for an HTTP site, which is the same as the FTP format
+ftp://ftp.octave.org/pub/octave/octave-([\d\.]+)\.tar\.gz

Copied: trunk/packages/octave/debian/in/octave2.9-watch (from rev 505, trunk/packages/octave/debian/in/watch)
===================================================================
--- trunk/packages/octave/debian/in/watch	2006-03-08 10:22:52 UTC (rev 505)
+++ trunk/packages/octave/debian/in/octave2.9-watch	2006-03-14 10:33:32 UTC (rev 508)
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-([\d\.]+)\.tar\.gz

Deleted: trunk/packages/octave/debian/in/watch

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-03-13 11:23:36 UTC (rev 507)
+++ trunk/packages/octave/debian/rules	2006-03-14 10:33:32 UTC (rev 508)
@@ -87,11 +87,12 @@
 		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 defs.make ; do \
+	for f in octave-depends defs.make ; do \
 		sed 's/@VERSION@/$(version)/g;s/@MAJOR@/$(major)/g' \
 			< debian/in/$$f > debian/$$f ; \
 	done
 	cp debian/in/$(PACKAGE)-00list debian/patches/00list
+	cp debian/in/$(PACKAGE)-watch debian/watch
 
 get-orig-source: upstream
 upstream: