r47019 - in /packages/scilab/branches/5.5/debian: changelog patches/bashim.diff patches/jogl-2.2.diff patches/librarypath.diff patches/m4-hdf5.patch patches/m4-java-ppc64el.patch patches/remove-exit.diff patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Apr 27 16:48:08 2015
New Revision: 47019

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47019
Log:
* New upstream release
* Patches removed (merged upstream):
  - m4-hdf5.patch
  - m4-java-ppc64el.patch
  - remove-exit.diff
  - bashim.diff
  - jogl-2.2.diff

Removed:
    packages/scilab/branches/5.5/debian/patches/bashim.diff
    packages/scilab/branches/5.5/debian/patches/jogl-2.2.diff
    packages/scilab/branches/5.5/debian/patches/m4-hdf5.patch
    packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch
    packages/scilab/branches/5.5/debian/patches/remove-exit.diff
Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/patches/librarypath.diff
    packages/scilab/branches/5.5/debian/patches/series

Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=47019&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Mon Apr 27 16:48:08 2015
@@ -1,3 +1,15 @@
+scilab (5.5.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Patches removed (merged upstream):
+    - m4-hdf5.patch
+    - m4-java-ppc64el.patch
+    - remove-exit.diff
+    - bashim.diff
+    - jogl-2.2.diff
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 01 Apr 2015 11:31:59 +0200
+
 scilab (5.5.1-7) unstable; urgency=medium
 
   * Team upload.

Modified: packages/scilab/branches/5.5/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/librarypath.diff?rev=47019&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/librarypath.diff	(original)
+++ packages/scilab/branches/5.5/debian/patches/librarypath.diff	Mon Apr 27 16:48:08 2015
@@ -1,8 +1,8 @@
-Index: scilab-5.5.0-beta-1/bin/scilab
+Index: scilab-5.5.2/bin/scilab
 ===================================================================
---- scilab-5.5.0-beta-1.orig/bin/scilab	2013-10-02 18:10:40.883780471 +0200
-+++ scilab-5.5.0-beta-1/bin/scilab	2013-10-02 18:10:40.879780471 +0200
-@@ -768,7 +768,7 @@
+--- scilab-5.5.2.orig/bin/scilab
++++ scilab-5.5.2/bin/scilab
+@@ -785,7 +785,7 @@ SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/li
  if test -d $SCI/lib/thirdparty; then
      SCILIB=$SCI/lib/thirdparty:$SCILIB;
  fi
@@ -11,7 +11,7 @@
  
  case $OS in
      *darwin* | *Darwin*) # MacOS X
-@@ -812,6 +812,7 @@
+@@ -829,6 +829,7 @@ case $OS in
      *)
  esac
  
@@ -19,7 +19,7 @@
  
  if test $SCIVERBOSE -ne 0; then
      echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-@@ -1084,6 +1085,7 @@
+@@ -1101,6 +1102,7 @@ if test "$rest" = "yes"; then
          esac
      done
  

Modified: packages/scilab/branches/5.5/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/series?rev=47019&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series	(original)
+++ packages/scilab/branches/5.5/debian/patches/series	Mon Apr 27 16:48:08 2015
@@ -5,8 +5,3 @@
 jh.diff
 depend-scicos.diff
 missing-lib.diff
-m4-hdf5.patch
-m4-java-ppc64el.patch
-remove-exit.diff
-bashim.diff
-jogl-2.2.diff