Author: malat
Date: 2012-07-28 18:59:14 +0000 (Sat, 28 Jul 2012)
New Revision: 11933
Modified:
trunk/packages/vxl/trunk/debian/patches/fixcompilation2.patch
trunk/packages/vxl/trunk/debian/rules
trunk/packages/vxl/trunk/debian/watch
Log:
Prefer UNIX eol tarball
Modified: trunk/packages/vxl/trunk/debian/patches/fixcompilation2.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fixcompilation2.patch
2012-07-28 18:52:58 UTC (rev 11932)
+++ trunk/packages/vxl/trunk/debian/patches/fixcompilation2.patch
2012-07-28 18:59:14 UTC (rev 11933)
@@ -23,42 +23,50 @@
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
+Index: vxl-1.17.0/contrib/brl/b3p/shapelib/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/b3p/shapelib/tests/CMakeLists.txt
2010-09-26 08:37:58.000000000 +0200
++++ vxl-1.17.0/contrib/brl/b3p/shapelib/tests/CMakeLists.txt 2012-07-28
20:58:45.335213478 +0200
@@ -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
+ ADD_EXECUTABLE(shapelib_test_include test_include.cxx )
+-TARGET_LINK_LIBRARIES( shapelib_test_include shapelib )
++TARGET_LINK_LIBRARIES( shapelib_test_include shp )
+Index: vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/baio/baio_unix.cxx 2010-11-22
17:11:21.000000000 +0100
++++ vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx 2012-07-28
20:58:45.339213477 +0200
@@ -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
+ #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 {
+Index: vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-05-31
21:59:20.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-07-28
20:58:45.339213477 +0200
+@@ -32,7 +32,7 @@
+
+ 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)
+Index: vxl-1.17.0/vcl/vcl_config_compiler.h.in
+===================================================================
+--- vxl-1.17.0.orig/vcl/vcl_config_compiler.h.in 2012-03-16
16:26:54.000000000 +0100
++++ vxl-1.17.0/vcl/vcl_config_compiler.h.in 2012-07-28 20:58:45.339213477
+0200
@@ -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
+ // 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/rules
===================================================================
--- trunk/packages/vxl/trunk/debian/rules 2012-07-28 18:52:58 UTC (rev
11932)
+++ trunk/packages/vxl/trunk/debian/rules 2012-07-28 18:59:14 UTC (rev
11933)
@@ -69,4 +69,4 @@
override_dh_auto_test:
get-orig-source:
- uscan --verbose --force-download --rename --repack
+ uscan --verbose --force-download --rename
Modified: trunk/packages/vxl/trunk/debian/watch
===================================================================
--- trunk/packages/vxl/trunk/debian/watch 2012-07-28 18:52:58 UTC (rev
11932)
+++ trunk/packages/vxl/trunk/debian/watch 2012-07-28 18:59:14 UTC (rev
11933)
@@ -1,2 +1,2 @@
version=3
-http://sf.net/vxl/vxl-([\d\.]+)\.zip
+http://sf.net/vxl/vxl-([\d\.]+)\.tar.gz
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
