[Pkg-octave-commit] r2342 - octave/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-07-22 15:31:10 +0000 (Tue, 22 Jul 2008)
New Revision: 2342

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Do not install octave.st for octave3.1


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-07-22 13:22:00 UTC (rev 2341)
+++ octave/trunk/debian/changelog	2008-07-22 15:31:10 UTC (rev 2342)
@@ -1,3 +1,11 @@
+octave3.1 (3.1.50-3) UNRELEASED; urgency=low
+
+  * debian/rules:
+    + Do not install octave.st for octave3.1 (avoid conflict with
+      octave3.0)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 22 Jul 2008 17:30:55 +0200
+
 octave3.1 (3.1.50-2) experimental; urgency=low
 
   * debian/in/copyright: Add tag for octave3.1, which produces a meaningful

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-07-22 13:22:00 UTC (rev 2341)
+++ octave/trunk/debian/rules	2008-07-22 15:31:10 UTC (rev 2342)
@@ -303,8 +303,8 @@
 	(cd $(debtmp)/usr/bin; 						\
 		rm -v   octave	octave-bug mkoctfile octave-config)
 
-	-test "$(PACKAGEVER)" = 2.1			\
-		|| install --mode=644 debian/octave.st	\
+	-test "$(PACKAGEVER)" = 2.1 -o "$(PACKAGEVER)" = 3.1	\
+		|| install --mode=644 debian/octave.st		\
 			$(debtmp)/usr/share/enscript/hl
 
 	touch install-arch-stamp