r38160 - in /packages/scilab/trunk/debian: changelog control patches/series patches/updateOfJgoodies.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sat Mar  5 18:46:39 2011
New Revision: 38160

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38160
Log:
  * Update of a check due to the recent update of libjgoodies-looks-java

Added:
    packages/scilab/trunk/debian/patches/updateOfJgoodies.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/control
    packages/scilab/trunk/debian/patches/series

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=38160&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sat Mar  5 18:46:39 2011
@@ -1,3 +1,9 @@
+scilab (5.3.1-2) unstable; urgency=low
+
+  * Update of a check due to the recent update of libjgoodies-looks-java
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 05 Mar 2011 16:51:46 +0100
+
 scilab (5.3.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=38160&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Sat Mar  5 18:46:39 2011
@@ -11,7 +11,7 @@
  libblas-dev | librefblas3-dev | libatlas-base-dev, liblapack-dev, 
 # Java deps
  libflexdock-java (>= 0.5.1), libjogl-java (>= 1.1.1), libgl1-mesa-dev,
- libjrosetta-java (>= 1.0.1), ant,
+ libjrosetta-java (>= 1.0.1), ant, libjgoodies-looks-java,
 # Documentation 
  libjeuclid-core-java (>= 3.1.3), libbatik-java (>= 1.7), fop (>= 0.95), 
  javahelp2, libsaxon-java, libavalon-framework-java, docbook-xsl,

Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=38160&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Sat Mar  5 18:46:39 2011
@@ -5,3 +5,4 @@
 missingaddchapter.diff
 modelicac-not-available.diff
 
+updateOfJgoodies.diff

Added: packages/scilab/trunk/debian/patches/updateOfJgoodies.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/updateOfJgoodies.diff?rev=38160&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/updateOfJgoodies.diff (added)
+++ packages/scilab/trunk/debian/patches/updateOfJgoodies.diff Sat Mar  5 18:46:39 2011
@@ -1,0 +1,19 @@
+Index: scilab/configure.ac
+===================================================================
+--- scilab.orig/configure.ac	2011-03-05 16:53:13.000000000 +0100
++++ scilab/configure.ac	2011-03-05 16:53:16.000000000 +0100
+@@ -827,12 +827,12 @@
+                 AC_JAVA_CHECK_VERSION_PACKAGE([flexdock],[import org.flexdock.util.Utilities;],$FLEXDOCK,[0.5.2],[Utilities.VERSION])
+ 
+                 # Swing look&feel implementations
+-                AC_JAVA_CHECK_PACKAGE([looks],[com.jgoodies.looks.common.RenderingUtils],[Scilab Gui - Look and feel],"yes")
++                AC_JAVA_CHECK_PACKAGE([looks],[com.jgoodies.looks.common.MenuItemRenderer],[Scilab Gui - Look and feel],"yes")
+                 LOOKS=$PACKAGE_JAR_FILE
+ 
+                 # Named differently under ArchLinux
+                 if test -z "$LOOKS"; then
+-                    AC_JAVA_CHECK_PACKAGE([jgoodies-looks],[com.jgoodies.looks.common.RenderingUtils],[Scilab Gui - Look and feel])
++                    AC_JAVA_CHECK_PACKAGE([jgoodies-looks],[com.jgoodies.looks.common.MenuItemRenderer],[Scilab Gui - Look and feel])
+                     LOOKS=$PACKAGE_JAR_FILE
+                 fi
+                 AC_SUBST(LOOKS)