[Pkg-octave-commit] rev 394 - trunk/packages/octave/debian

[Rafael Laboissiere]

Author: rafael
Date: 2005-12-31 17:54:21 +0000 (Sat, 31 Dec 2005)
New Revision: 394

Removed:
   trunk/packages/octave/debian/octave-depends
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/rules
Log:
Debian release octave2.1_2.1.72-8

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-12-31 17:50:41 UTC (rev 393)
+++ trunk/packages/octave/debian/changelog	2005-12-31 17:54:21 UTC (rev 394)
@@ -1,3 +1,26 @@
+octave2.1 (1:2.1.72-8) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/in/octave-depends: New template file.  Give full path to
+    octave-config.  Uses replaceable strings @MAJOR@ and @VERSION at .
+  * debian/rules: Generate debian/octave-depends from
+    debian/in/octave-depends
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Sat, 31 Dec 2005 01:08:32 +0100
+
+octave2.1 (1:2.1.72-7) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * This version use an epoch in his number.  This is necessary due to the
+    mistake I did in uploading the octave_2.9.4-1 virtual package to
+    unstable.  The 2.9.4-1 version replaced the 2.1.72-* version and this
+    is wrong because the 2.1 (testing) branch should take precedence over
+    the 2.9 (unstable) branch.
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Sat, 26 Nov 2005 22:52:34 +0100
+
 octave2.9 (2.9.4-8) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Deleted: trunk/packages/octave/debian/octave-depends

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2005-12-31 17:50:41 UTC (rev 393)
+++ trunk/packages/octave/debian/rules	2005-12-31 17:54:21 UTC (rev 394)
@@ -5,7 +5,6 @@
 #
 # $Id$
 
-
 include /usr/share/dpatch/dpatch.make
 
 # in order: octave, octave2.1, 2.1.28, 2.1  (or whatever the version is)
@@ -14,9 +13,9 @@
 PACKAGE		:= $(shell head -1 debian/changelog | \
 			perl -nle 'm/^(\S+)\s+/ and print $$1')
 version       	:= $(shell head -1 debian/changelog | \
-			perl -nle 'm/\S+\s+\((\S+)-\S+\)/ and print $$1')
-major       	:= $(shell head -1 debian/changelog | perl -nle \
-			'm/\S+\s+\((\d\.\d)\.\d+-\S+\)/ and print $$1')
+			perl -nle 'm/\S+\s+\((?:\d:)*(\S+)-\S+\)/ and print $$1')
+major       	:= $(shell echo $(version) | perl -nle \
+			'm/(\d\.\d)\.\d+/ and print $$1')
 
 ifeq ($(major),2.1)
 priority	:= 80
@@ -88,7 +87,10 @@
 		sed 's/@VERSION@/$(version)/g;s/@PACKAGE@/$(PACKAGE)/g;s/@MAJOR@/$(major)/g;s/@PRIORITY@/$(priority)/g;' \
 			< $$in > $$out ; \
 	done
-	sed 's/@MAJOR@/$(major)/g' < debian/in/watch > debian/watch
+	for f in watch octave-depends ; do \
+		sed 's/@VERSION@/$(version)/g;s/@MAJOR@/$(major)/g' \
+			< debian/in/$$f > debian/$$f ; \
+	done
 	cp debian/in/$(PACKAGE)-00list debian/patches/00list
 
 get-orig-source: upstream
@@ -177,7 +179,8 @@
 	test ! -f octave-bug.in.orig || mv octave-bug.in.orig octave-bug.in
 
 	rm -f `ls debian/in/PACKAGE* | sed 's/PACKAGE/$(PACKAGE)/;s:/in::'`
-	rm -f octave-depends-$(version).1
+	rm -f octave-depends-$(version).1 
+	( cd debian ; rm -f watch octave-depends )
 
 	for f in $(texifiles) ; do			\
 		test ! -f $$f-save || mv $$f-save $$f ;	\