r45089 - in /packages/scilab-toolboxes/sivp/trunk/debian: changelog orig-tar.exclude orig-tar.sh patches/c++_switch.diff patches/cvUpdateBGStatModel.diff patches/ecjpath.diff patches/manifest.diff patches/series patches/wrongPath.diff rules watch

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Fri Jun 22 14:48:47 2012
New Revision: 45089

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45089
Log:
* New upstream release from svn snapshoot
(Closes: #660355, #674363) (LP: #610837, #879097)
* Drop the patches (most of them are applied upstream)

Removed:
    packages/scilab-toolboxes/sivp/trunk/debian/patches/c++_switch.diff
    packages/scilab-toolboxes/sivp/trunk/debian/patches/cvUpdateBGStatModel.diff
    packages/scilab-toolboxes/sivp/trunk/debian/patches/ecjpath.diff
    packages/scilab-toolboxes/sivp/trunk/debian/patches/manifest.diff
    packages/scilab-toolboxes/sivp/trunk/debian/patches/series
    packages/scilab-toolboxes/sivp/trunk/debian/patches/wrongPath.diff
Modified:
    packages/scilab-toolboxes/sivp/trunk/debian/changelog
    packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.exclude
    packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.sh
    packages/scilab-toolboxes/sivp/trunk/debian/rules
    packages/scilab-toolboxes/sivp/trunk/debian/watch

Modified: packages/scilab-toolboxes/sivp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sivp/trunk/debian/changelog?rev=45089&op=diff
==============================================================================
--- packages/scilab-toolboxes/sivp/trunk/debian/changelog (original)
+++ packages/scilab-toolboxes/sivp/trunk/debian/changelog Fri Jun 22 14:48:47 2012
@@ -1,3 +1,11 @@
+sivp (0.5.3~svn287-1) unstable; urgency=low
+
+  * New upstream release from svn snapshoot
+  (Closes: #660355, #674363) (LP: #610837, #879097)
+  * Drop the patches (most of them are applied upstream)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 22 Jun 2012 15:18:51 +0200
+
 sivp (0.5.3-3) unstable; urgency=low
 
   * c++_switch.diff: Fix a FTBFS with opencv 2.3. A header is now C++.

Modified: packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.exclude
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.exclude?rev=45089&op=diff
==============================================================================
--- packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.exclude (original)
+++ packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.exclude Fri Jun 22 14:48:47 2012
@@ -1,2 +1,4 @@
 *.dll
 *.lib
+*.so
+

Modified: packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.sh?rev=45089&op=diff
==============================================================================
--- packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.sh (original)
+++ packages/scilab-toolboxes/sivp/trunk/debian/orig-tar.sh Fri Jun 22 14:48:47 2012
@@ -5,7 +5,7 @@
 TAR=../sivp_$2.orig.tar.gz
 
 # clean up the upstream tarball
-unzip $3 
+unzip $3 -d $DIR
 tar -c -z -X debian/orig-tar.exclude -f $TAR $DIR/
 rm -rf $DIR $3
 

Modified: packages/scilab-toolboxes/sivp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sivp/trunk/debian/rules?rev=45089&op=diff
==============================================================================
--- packages/scilab-toolboxes/sivp/trunk/debian/rules (original)
+++ packages/scilab-toolboxes/sivp/trunk/debian/rules Fri Jun 22 14:48:47 2012
@@ -5,15 +5,14 @@
 
 DEB_DH_MAKESHLIBS_ARGS_scilab-sivp := -n
 
-
-build/scilab-sivp:: 
+build-arch: 
 	SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
 	/usr/bin/scilab -nw -f builder.sce	
 
 
 install/scilab-sivp::
-		mkdir -p $(CURDIR)/debian/scilab-sivp/usr/lib/scilab-sivp/sci_gateway/c/
-		cp -R $(CURDIR)/sci_gateway/c/libsivp.so $(CURDIR)/sci_gateway/c/loader.sce $(CURDIR)/debian/scilab-sivp/usr/lib/scilab-sivp/sci_gateway/c/
+		mkdir -p $(CURDIR)/debian/scilab-sivp/usr/lib/scilab-sivp/sci_gateway/cpp/
+		cp -R $(CURDIR)/sci_gateway/cpp/libgw_sivp.so $(CURDIR)/sci_gateway/cpp/loader.sce $(CURDIR)/debian/scilab-sivp/usr/lib/scilab-sivp/sci_gateway/cpp/
 		cp -Rp $(CURDIR)/loader.sce $(CURDIR)/etc/ $(CURDIR)/demos/ $(CURDIR)/images/ $(CURDIR)/jar/ $(CURDIR)/macros/  $(CURDIR)/debian/scilab-sivp/usr/lib/scilab-sivp/
 
 		cp -Rp sci_gateway/loader_gateway.sce $(CURDIR)/debian/scilab-sivp/usr/lib/scilab-sivp/sci_gateway/

Modified: packages/scilab-toolboxes/sivp/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sivp/trunk/debian/watch?rev=45089&op=diff
==============================================================================
--- packages/scilab-toolboxes/sivp/trunk/debian/watch (original)
+++ packages/scilab-toolboxes/sivp/trunk/debian/watch Fri Jun 22 14:48:47 2012
@@ -1,3 +1,3 @@
 version=3
-http://sf.net/sivp/sivp-(\d+[0-9\-\.r]+)\.zip \
+http://atoms.scilab.org/toolboxes/sivp/ .*/files/SIVP-(\d+[0-9\-\.r]+)-src\.zip \
   debian debian/orig-tar.sh