r44362 - in /packages/scilab-toolboxes/sivp/trunk/debian: changelog control patches/c++_switch.diff patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Thu Jan 12 09:41:58 2012
New Revision: 44362

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44362
Log:
  * c++_switch.diff: Fix a FTBFS with opencv 2.3. A header is now C++.
    Implying that sivp should be built with g++ instead (Closes: #634796)

Added:
    packages/scilab-toolboxes/sivp/trunk/debian/patches/c++_switch.diff
Modified:
    packages/scilab-toolboxes/sivp/trunk/debian/changelog
    packages/scilab-toolboxes/sivp/trunk/debian/control
    packages/scilab-toolboxes/sivp/trunk/debian/patches/series

Modified: packages/scilab-toolboxes/sivp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sivp/trunk/debian/changelog?rev=44362&op=diff
==============================================================================
--- packages/scilab-toolboxes/sivp/trunk/debian/changelog (original)
+++ packages/scilab-toolboxes/sivp/trunk/debian/changelog Thu Jan 12 09:41:58 2012
@@ -1,3 +1,10 @@
+sivp (0.5.3-3) unstable; urgency=low
+
+  * c++_switch.diff: Fix a FTBFS with opencv 2.3. A header is now C++.
+    Implying that sivp should be built with g++ instead (Closes: #634796)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 12 Jan 2012 10:26:40 +0100
+
 sivp (0.5.3-2) unstable; urgency=low
 
   * Standards-Version updated to version 3.9.2

Modified: packages/scilab-toolboxes/sivp/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sivp/trunk/debian/control?rev=44362&op=diff
==============================================================================
--- packages/scilab-toolboxes/sivp/trunk/debian/control (original)
+++ packages/scilab-toolboxes/sivp/trunk/debian/control Thu Jan 12 09:41:58 2012
@@ -5,9 +5,9 @@
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
  Shiqi Yu <shiqi.yu at gmail.com>
 Build-Depends: debhelper (>= 5), autotools-dev, cdbs, libcv-dev (>= 2.0.0),
- scilab (>= 3.1), libhighgui-dev (>= 0.9.7), xsltproc, pvm, docbook-xsl, 
- scilab-doc (>= 5.0), libraw1394-dev, libtheora-dev, libvorbis-dev, 
- libcvaux-dev, quilt
+ scilab, libhighgui-dev (>= 0.9.7), xsltproc, pvm, docbook-xsl, 
+ scilab-doc, libraw1394-dev, libtheora-dev, libvorbis-dev, 
+ libcvaux-dev (>= 2.3), quilt
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab-toolboxes/sivp/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab-toolboxes/sivp/trunk

Added: packages/scilab-toolboxes/sivp/trunk/debian/patches/c++_switch.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sivp/trunk/debian/patches/c%2B%2B_switch.diff?rev=44362&op=file
==============================================================================
--- packages/scilab-toolboxes/sivp/trunk/debian/patches/c++_switch.diff (added)
+++ packages/scilab-toolboxes/sivp/trunk/debian/patches/c++_switch.diff Thu Jan 12 09:41:58 2012
@@ -1,0 +1,18 @@
+--- sivp-0.5.3/sci_gateway/c/builder_gateway_c.sce	2010-09-08 14:33:12.000000000 +0200
++++ sivp-0.5.3./sci_gateway/c/builder_gateway_c.sce	2012-01-12 10:20:12.000000000 +0100
+@@ -76,6 +76,7 @@
+   end;
+ 
+   inter_cflags  = inter_cflags + unix_g('pkg-config --cflags opencv');
++  inter_cflags  = inter_cflags + " -fpermissive "
+   inter_ldflags = unix_g('pkg-config --libs opencv');
+   if( (length(inter_cflags)==0) | (length(inter_ldflags)==0))
+     error("Can not find OpenCV. Compiling SIVP needs OpenCV");
+@@ -95,6 +96,6 @@
+                    curr_path     , ..
+                    opencv_libs   , ..
+                    inter_ldflags , ..
+-                   inter_cflags  );
++                   inter_cflags, [], "g++"  );
+ 
+ clear tbx_build_gateway inter_names inter_files inter_cflags inter_libs;

Modified: packages/scilab-toolboxes/sivp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sivp/trunk/debian/patches/series?rev=44362&op=diff
==============================================================================
--- packages/scilab-toolboxes/sivp/trunk/debian/patches/series (original)
+++ packages/scilab-toolboxes/sivp/trunk/debian/patches/series Thu Jan 12 09:41:58 2012
@@ -1,2 +1,4 @@
 wrongPath.diff
 cvUpdateBGStatModel.diff
+c++_switch.diff
+