r35592 - in /packages/slicer/trunk/debian: patches/50_all_changes.dpatch rules
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Thu Mar 19 04:35:15 UTC 2009
Author: domibel-guest
Date: Thu Mar 19 04:35:13 2009
New Revision: 35592
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35592
Log:
preparation for 3.3
Modified:
packages/slicer/trunk/debian/patches/50_all_changes.dpatch
packages/slicer/trunk/debian/rules
Modified: packages/slicer/trunk/debian/patches/50_all_changes.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/50_all_changes.dpatch?rev=35592&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.dpatch (original)
+++ packages/slicer/trunk/debian/patches/50_all_changes.dpatch Thu Mar 19 04:35:13 2009
@@ -5,9 +5,21 @@
## DP: No description.
@DPATCH@
+diff -urNad slicer-3.3.0~svn8902~/Applications/CLI/CMakeLists.txt slicer-3.3.0~svn8902/Applications/CLI/CMakeLists.txt
+--- slicer-3.3.0~svn8902~/Applications/CLI/CMakeLists.txt 2009-03-19 02:54:19.000000000 +0000
++++ slicer-3.3.0~svn8902/Applications/CLI/CMakeLists.txt 2009-03-19 04:08:50.000000000 +0000
+@@ -570,7 +570,7 @@
+ # subdirs( EndoNavTracking )
+ subdirs( ExtractSkeleton )
+ if( ${ITK_VERSION_MAJOR} GREATER 3 OR ${ITK_VERSION_MINOR} GREATER 6 )
+- subdirs( RegisterImagesModule )
++# subdirs( RegisterImagesModule )
+ endif( ${ITK_VERSION_MAJOR} GREATER 3 OR ${ITK_VERSION_MINOR} GREATER 6 )
+ #subdirs( UtahBSpline )
+ subdirs( DiffeomorphicDemonsRegistration )
diff -urNad slicer-3.3.0~svn8902~/Applications/GUI/CMakeLists.txt slicer-3.3.0~svn8902/Applications/GUI/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Applications/GUI/CMakeLists.txt 2009-03-18 21:17:55.000000000 -0400
-+++ slicer-3.3.0~svn8902/Applications/GUI/CMakeLists.txt 2009-03-18 21:29:20.000000000 -0400
+--- slicer-3.3.0~svn8902~/Applications/GUI/CMakeLists.txt 2009-03-19 04:07:41.000000000 +0000
++++ slicer-3.3.0~svn8902/Applications/GUI/CMakeLists.txt 2009-03-19 04:08:33.000000000 +0000
@@ -95,8 +95,10 @@
# --------------------------------------------------------------------------
# Find SLICERLIBCURL (slicercurl)
@@ -22,8 +34,8 @@
# --------------------------------------------------------------------------
# Include dirs
diff -urNad slicer-3.3.0~svn8902~/CMakeLists.txt slicer-3.3.0~svn8902/CMakeLists.txt
---- slicer-3.3.0~svn8902~/CMakeLists.txt 2009-03-18 21:21:12.000000000 -0400
-+++ slicer-3.3.0~svn8902/CMakeLists.txt 2009-03-18 21:29:20.000000000 -0400
+--- slicer-3.3.0~svn8902~/CMakeLists.txt 2009-03-19 04:07:41.000000000 +0000
++++ slicer-3.3.0~svn8902/CMakeLists.txt 2009-03-19 04:08:33.000000000 +0000
@@ -27,6 +27,11 @@
set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
@@ -57,8 +69,8 @@
## BatchMake
option(Slicer3_USE_BatchMake "Build Slicer3 with BatchMake support." OFF)
diff -urNad slicer-3.3.0~svn8902~/Libs/RemoteIO/CMakeLists.txt slicer-3.3.0~svn8902/Libs/RemoteIO/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/RemoteIO/CMakeLists.txt 2009-03-18 21:18:05.000000000 -0400
-+++ slicer-3.3.0~svn8902/Libs/RemoteIO/CMakeLists.txt 2009-03-18 21:29:20.000000000 -0400
+--- slicer-3.3.0~svn8902~/Libs/RemoteIO/CMakeLists.txt 2009-03-19 04:07:41.000000000 +0000
++++ slicer-3.3.0~svn8902/Libs/RemoteIO/CMakeLists.txt 2009-03-19 04:08:33.000000000 +0000
@@ -11,8 +11,11 @@
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
@@ -73,9 +85,18 @@
# Disable MSVC 8 warnings
if(WIN32)
+@@ -100,7 +103,7 @@
+ vtkIOTCL
+ vtkCommonTCL
+ itksys
+- ${SLICERLIBCURL_LIBRARIES}
++ ${CURL_LIBRARIES}
+ MRML
+ )
+
diff -urNad slicer-3.3.0~svn8902~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.3.0~svn8902/Libs/RemoteIO/vtkHTTPHandler.h
---- slicer-3.3.0~svn8902~/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-18 21:18:05.000000000 -0400
-+++ slicer-3.3.0~svn8902/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-18 21:29:20.000000000 -0400
+--- slicer-3.3.0~svn8902~/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-19 04:07:41.000000000 +0000
++++ slicer-3.3.0~svn8902/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-19 04:08:33.000000000 +0000
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -86,8 +107,8 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
diff -urNad slicer-3.3.0~svn8902~/Modules/CMakeLists.txt slicer-3.3.0~svn8902/Modules/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/CMakeLists.txt 2009-03-18 21:19:26.000000000 -0400
-+++ slicer-3.3.0~svn8902/Modules/CMakeLists.txt 2009-03-18 21:29:20.000000000 -0400
+--- slicer-3.3.0~svn8902~/Modules/CMakeLists.txt 2009-03-19 04:07:41.000000000 +0000
++++ slicer-3.3.0~svn8902/Modules/CMakeLists.txt 2009-03-19 04:08:33.000000000 +0000
@@ -56,7 +56,7 @@
Statistics
Tractography
Modified: packages/slicer/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/rules?rev=35592&op=diff
==============================================================================
--- packages/slicer/trunk/debian/rules (original)
+++ packages/slicer/trunk/debian/rules Thu Mar 19 04:35:13 2009
@@ -8,7 +8,7 @@
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+export DH_VERBOSE=0
SHARED_BUILD_PATH = DEB_build_shared
CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
@@ -95,8 +95,8 @@
# install binaries and shared libs
cd $(SHARED_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- dh_install -plibslicer3-dev debian/tmp/usr/lib/lib*.so usr/lib
+# dh_install -plibslicer3-dev debian/tmp/usr/lib/lib*.so usr/lib
+ dh_install -plibslicer3-dev debian/tmp/usr/lib/* usr/lib
dh_install -plibslicer3-dev debian/tmp/usr/include/* usr/include
#usr/lib/Slicer3/*.so.*
More information about the debian-science-commits
mailing list