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

[Rafael Laboissiere]

tags 457191 pending
thanks

Author: rafael
Date: 2007-12-20 23:54:58 +0000 (Thu, 20 Dec 2007)
New Revision: 1119

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Do not install octave.st in octave2.1 package

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-12-20 11:37:34 UTC (rev 1118)
+++ octave/trunk/debian/changelog	2007-12-20 23:54:58 UTC (rev 1119)
@@ -1,10 +1,11 @@
-octave2.9 (1:2.9.19-3) unstable; urgency=low
+octave2.1 (1:2.1.73-15) UNRELEASED; urgency=low
 
-  * debian/in/control: 
-    Build-conflict with atlas3-base-dev and remove it from build-depends
-    (closes: 457167)
+  * debian/rules: Kludge for preventing octave.st from being installed in
+    version 2.1 of the octave*.* package, avoiding clashes with octave2.9
+    (closes: #457191).  This is a temporary solution; octave.st will
+    eventually be incorporated into the enscript package (see Bug#457244).
 
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Thu, 20 Dec 2007 12:32:57 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 21 Dec 2007 00:12:43 +0100
 
 octave2.9 (1:2.9.19-2) unstable; urgency=low
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-12-20 11:37:34 UTC (rev 1118)
+++ octave/trunk/debian/rules	2007-12-20 23:54:58 UTC (rev 1119)
@@ -284,7 +284,9 @@
 	(cd $(debtmp)/usr/bin; 						\
 		rm -v   octave	octave-bug mkoctfile octave-config)
 
-	install --mode=644 debian/octave.st $(debtmp)/usr/share/enscript/hl
+	-test "$(PACKAGEVER)" != 2.1			\
+		|| install --mode=644 debian/octave.st	\
+			$(debtmp)/usr/share/enscript/hl
 
 	touch install-arch-stamp