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

[Rafael Laboissiere]

Author: rafael
Date: 2008-07-22 15:32:43 +0000 (Tue, 22 Jul 2008)
New Revision: 2343

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Set alternatives priority value for octave3.1


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-07-22 15:31:10 UTC (rev 2342)
+++ octave/trunk/debian/changelog	2008-07-22 15:32:43 UTC (rev 2343)
@@ -3,6 +3,7 @@
   * debian/rules:
     + Do not install octave.st for octave3.1 (avoid conflict with
       octave3.0)
+    + Set alternatives priority value for octave3.1
 
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 22 Jul 2008 17:30:55 +0200
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-07-22 15:31:10 UTC (rev 2342)
+++ octave/trunk/debian/rules	2008-07-22 15:32:43 UTC (rev 2343)
@@ -25,6 +25,9 @@
 hack:
 	@echo $(PACKAGEVER)
 
+ifeq ($(major),3.1)
+priority	:= 70
+else
 ifeq ($(major),3.0)
 priority	:= 90
 else
@@ -32,6 +35,7 @@
 priority	:= 80
 endif
 endif
+endif
 
 doc_package	= $(PACKAGE)-doc
 html_package	= $(PACKAGE)-htmldoc