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

[Rafael Laboissiere]

Author: rafael
Date: 2006-08-15 19:18:30 +0000 (Tue, 15 Aug 2006)
New Revision: 694

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave-depends
   trunk/packages/octave/debian/rules
Log:
Debian release octave2.9_2.9.7-2

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-08-14 14:54:23 UTC (rev 693)
+++ trunk/packages/octave/debian/changelog	2006-08-15 19:18:30 UTC (rev 694)
@@ -1,3 +1,12 @@
+octave2.9 (2.9.7-2) unstable; urgency=low
+
+  * debian/in/octave-depends:
+    - Introduced substitution variables ${octave<major>:Depends}
+    - Updated POD section accordingly
+  * debian/rules: Create symlink for octave<major>-depends
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 14 Aug 2006 15:10:09 +0200
+
 octave2.9 (2.9.7-1) unstable; urgency=low
 
   [ Thomas Weber ]

Modified: trunk/packages/octave/debian/in/octave-depends
===================================================================
--- trunk/packages/octave/debian/in/octave-depends	2006-08-14 14:54:23 UTC (rev 693)
+++ trunk/packages/octave/debian/in/octave-depends	2006-08-15 19:18:30 UTC (rev 694)
@@ -28,15 +28,18 @@
 
 =head1 SYNOPSIS
 
-B<octave-deps> [S<I<debhelper options>>]
+B<octave-depends> [S<I<debhelper options>>]
 
 =head1 DESCRIPTION
 
-octave-deps is a debhelper-like program that is responsible for generating
-the ${octave:Depends} substitutions and adding them to substvars files.
+octave-depends is a debhelper-like program that is responsible for
+generating the ${octave:Depends} substitutions and adding them to
+substvars files.  Variables ${octave<major>:Depends} are also
+available, where <major> is currently either "-2-1" or "-2-9" (N.B.:
+periods are not allowed in substvar names).
 
 If you use this program, your package must build-depend on octave2.1-headers
-(>= 2.1.65).
+(>= 2.1.73-10) or octave2.9-headers (>= 2.9.7-2).
 
 =cut
 
@@ -44,6 +47,8 @@
 
 my $octcfg = '/usr/bin/octave-config- at VERSION@';
 my $octpkg = 'octave at MAJOR@';
+my $octpfx = 'octave- at MAJOR@';
+$octpfx =~ s/\./-/;
 
 # The current Octave version
 my $octver = `$octcfg --version 2>&1`
@@ -55,6 +60,8 @@
 	delsubstvar($package, "octave:Depends");
 	addsubstvar($package, "octave:Depends", $octpkg, ">= $octver");
 
+	delsubstvar($package, "$octpfx:Depends");
+	addsubstvar($package, "$octpfx:Depends", $octpkg, ">= $octver");
 }
 
 =head1 SEE ALSO

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-08-14 14:54:23 UTC (rev 693)
+++ trunk/packages/octave/debian/rules	2006-08-15 19:18:30 UTC (rev 694)
@@ -315,12 +315,21 @@
 	dh_link --package=$(PACKAGE) \
 		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
+		usr/share/man/man1/octave-$(version).1.gz \
+		usr/share/man/man1/octave$(major).1.gz
 	# make mkoctfileX.Y a symlink and symlink the manpage as well
 	dh_link --package=$(dev_package) \
 		usr/bin/mkoctfile-$(version) usr/bin/mkoctfile$(major)
 	dh_link --package=$(dev_package) \
-		usr/share/man/man1/mkoctfile-$(version).1.gz usr/share/man/man1/mkoctfile$(major).1.gz
+		usr/share/man/man1/mkoctfile-$(version).1.gz \
+		usr/share/man/man1/mkoctfile$(major).1.gz
+	# make octaveX.Y-depends a symlink and symlink the manpage as well
+	dh_link --package=$(dev_package) \
+		usr/bin/octave-depends-$(version) \
+		usr/bin/octave$(major)-depends
+	dh_link --package=$(dev_package) \
+		usr/share/man/man1/octave-depends-$(version).1.gz \
+		usr/share/man/man1/octave$(major)-depends.1.gz
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a