r35493 - in /packages/scilab/trunk/debian: ./ patches/

[sylvestre-guest at users.alioth.debian.org]

Author: sylvestre-guest
Date: Fri Feb 13 12:54:55 2009
New Revision: 35493

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35493
Log:
  * New upstream release
  * Some patches removed (included upstream)
  * Better watch file
  * Missing dep to pkg-config

Removed:
    packages/scilab/trunk/debian/patches/docbook.diff
    packages/scilab/trunk/debian/patches/installicons.diff
    packages/scilab/trunk/debian/patches/jeuclid.diff
    packages/scilab/trunk/debian/patches/link-doc.diff
    packages/scilab/trunk/debian/patches/misctcl.diff
    packages/scilab/trunk/debian/patches/switchOrder.diff
    packages/scilab/trunk/debian/patches/unused-classpath.diff
    packages/scilab/trunk/debian/patches/xmltoformat-2.diff
    packages/scilab/trunk/debian/patches/xmltoformat.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/control
    packages/scilab/trunk/debian/patches/librarypath.diff
    packages/scilab/trunk/debian/watch

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35493&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Fri Feb 13 12:54:55 2009
@@ -1,3 +1,12 @@
+scilab (5.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Some patches removed (included upstream)
+  * Better watch file
+  * Missing dep to pkg-config
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Fri, 13 Feb 2009 09:44:31 +0100
+
 scilab (5.0.3-6) experimental; urgency=low
 
   * Integration of a patch to be able to build french without the locale

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=35493&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Fri Feb 13 12:54:55 2009
@@ -4,7 +4,7 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre.ledru at inria.fr>, Aurélien GÉRÔME <ag at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: autoconf, cdbs, debhelper (>= 5), cdbs, gfortran, g++, 
- openjdk-6-jdk, chrpath, ocaml-nox
+ openjdk-6-jdk, chrpath, ocaml-nox, pkg-config,
  quilt, tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev, 
  gettext, libreadline-dev, 
 # numerical libraries

Modified: packages/scilab/trunk/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/librarypath.diff?rev=35493&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/librarypath.diff (original)
+++ packages/scilab/trunk/debian/patches/librarypath.diff Fri Feb 13 12:54:55 2009
@@ -1,15 +1,19 @@
---- scilab-5.0.2.orig/bin/scilab	2008-10-01 16:56:54.000000000 +0200
-+++ scilab-5.0.2/bin/scilab	2008-10-01 16:58:13.000000000 +0200
-@@ -436,11 +436,7 @@
- #fi
+--- bin/scilab.orig	2009-02-13 10:12:45.000000000 +0100
++++ bin/scilab	2009-02-13 10:14:06.000000000 +0100
+@@ -439,7 +439,7 @@
  #export PVM_ARCH
  
--if test "$LD_LIBRARY_PATH" = ""; then
--	LD_LIBRARY_PATH=$SCI/bin:$SCI/lib/scilab/
--else
--	LD_LIBRARY_PATH=$SCI/bin:$SCI/lib/scilab/:$LD_LIBRARY_PATH
--fi
+ SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
+-LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
++#LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+ 
+ case $OS in
+     *darwin* | *Darwin*) # MacOS X
+@@ -453,6 +453,7 @@
+     *)
+ esac
+ 
 +LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
+ 
  if test $SCIVERBOSE -ne 0; then
  	echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
- fi

Modified: packages/scilab/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/watch?rev=35493&op=diff
==============================================================================
--- packages/scilab/trunk/debian/watch (original)
+++ packages/scilab/trunk/debian/watch Fri Feb 13 12:54:55 2009
@@ -1,5 +1,5 @@
 version=3
 
 http://www.scilab.org/download/index_download.php \
-  .*/scilab-(.*)-src.tar.gz debian debian/orig-tar.sh
+  .*/scilab-([\d\.]+)-src.tar.gz debian debian/orig-tar.sh