[med-svn] r11932 - in trunk/packages/vxl/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-07-28 18:52:58 +0000 (Sat, 28 Jul 2012)
New Revision: 11932

Added:
   trunk/packages/vxl/trunk/debian/patches/fixcompilation2.patch
Modified:
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/patches/series
   trunk/packages/vxl/trunk/debian/rules
Log:
First pass at getting vxl 1.17 to compile

Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2012-07-28 16:51:38 UTC (rev 11931)
+++ trunk/packages/vxl/trunk/debian/changelog	2012-07-28 18:52:58 UTC (rev 11932)
@@ -1,3 +1,9 @@
+vxl (1.17.0-1) UNRELEASED; urgency=low
+
+  * New upstream
+
+ -- Mathieu Malaterre <malat at debian.org>  Sat, 28 Jul 2012 19:43:10 +0200
+
 vxl (1.14.0-18) unstable; urgency=low
 
   * Fix compilation with gcc 4.7. Closes: #674350

Added: trunk/packages/vxl/trunk/debian/patches/fixcompilation2.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fixcompilation2.patch	                        (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/fixcompilation2.patch	2012-07-28 18:52:58 UTC (rev 11932)
@@ -0,0 +1,64 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vxl (1.17.0-1) UNRELEASED; urgency=low
+ .
+   * New upstream
+Author: Mathieu Malaterre <malat at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vxl-1.17.0.orig/contrib/brl/b3p/shapelib/tests/CMakeLists.txt
++++ vxl-1.17.0/contrib/brl/b3p/shapelib/tests/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ ADD_EXECUTABLE(shapelib_test_include test_include.cxx )
+-TARGET_LINK_LIBRARIES( shapelib_test_include shapelib )
++TARGET_LINK_LIBRARIES( shapelib_test_include shp )
+--- vxl-1.17.0.orig/contrib/brl/bbas/baio/baio_unix.cxx
++++ vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx
+@@ -11,7 +11,7 @@
+ #include <aio.h>     //for aio_read
+ //#include <fcntl.h>   // for open (not really necessary
+ #include <strings.h> //includes bzero
+-
++#include <unistd.h>
+ 
+ //: baio_info struct: wrapper for status variables
+ struct baio_info {
+--- vxl-1.17.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt
++++ vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt
+@@ -32,7 +32,7 @@ ENDIF(ECW_FOUND)
+ 
+ ADD_LIBRARY(bwm_algo ${bwm_algo_sources})
+ 
+-TARGET_LINK_LIBRARIES( bwm_algo sdet vtol vil vil_algo vgl vgl_algo vnl vnl_algo vsol vpgl vpgl_algo vpgl_file_formats bgui brip vdgl bsta vgui vul vcl shapelib )
++TARGET_LINK_LIBRARIES( bwm_algo sdet vtol vil vil_algo vgl vgl_algo vnl vnl_algo vsol vpgl vpgl_algo vpgl_file_formats bgui brip vdgl bsta vgui vul vcl shp )
+ 
+ IF( BUILD_TESTING )
+   SUBDIRS(tests)
+--- vxl-1.17.0.orig/vcl/vcl_config_compiler.h.in
++++ vxl-1.17.0/vcl/vcl_config_compiler.h.in
+@@ -145,7 +145,7 @@
+ // define VCL_CAN_STATIC_CONST_INIT_FLOAT to either 0 or 1.
+ 
+ //#define VCL_CAN_STATIC_CONST_INIT_FLOAT 1 /* allowed */
+-//#define VCL_CAN_STATIC_CONST_INIT_FLOAT 0 /* not allowed */
++#define VCL_CAN_STATIC_CONST_INIT_FLOAT 0 /* not allowed */
+ #ifndef VCL_CAN_STATIC_CONST_INIT_FLOAT
+ # define VCL_CAN_STATIC_CONST_INIT_FLOAT @VCL_STATIC_CONST_INIT_FLOAT@
+ #endif

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2012-07-28 16:51:38 UTC (rev 11931)
+++ trunk/packages/vxl/trunk/debian/patches/series	2012-07-28 18:52:58 UTC (rev 11932)
@@ -1,15 +1 @@
-vxl.soname.patch
-video4linux.patch
-opencl_unix.patch
-sse2.patch
-renamelibs.patch
-fixcomp.patch
-fix_alphacomp.patch
-install_doxygen.patch
-libav_trunk.patch
-ffmpeg_C99.patch
-removedoxyen.patch
-png15.patch
-dcmtkgcc47.patch
-vnl_r28976.patch
-gcc47other.patch
+fixcompilation2.patch

Modified: trunk/packages/vxl/trunk/debian/rules
===================================================================
--- trunk/packages/vxl/trunk/debian/rules	2012-07-28 16:51:38 UTC (rev 11931)
+++ trunk/packages/vxl/trunk/debian/rules	2012-07-28 18:52:58 UTC (rev 11932)
@@ -69,4 +69,4 @@
 override_dh_auto_test:
 
 get-orig-source:
-	uscan --verbose --force-download --repack
+	uscan --verbose --force-download --rename --repack