[med-svn] r9194 - in trunk/packages/volview/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-01-07 13:18:45 +0000 (Sat, 07 Jan 2012)
New Revision: 9194

Modified:
   trunk/packages/volview/trunk/debian/patches/addtoplevelcmake.patch
   trunk/packages/volview/trunk/debian/patches/fixuptcl.patch
   trunk/packages/volview/trunk/debian/rules
Log:
TCL is in indirect requirement. Make it direct.

Modified: trunk/packages/volview/trunk/debian/patches/addtoplevelcmake.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/addtoplevelcmake.patch	2012-01-07 08:37:36 UTC (rev 9193)
+++ trunk/packages/volview/trunk/debian/patches/addtoplevelcmake.patch	2012-01-07 13:18:45 UTC (rev 9194)
@@ -8,13 +8,6 @@
 Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Last-Update: 2011-11-27
 Forwarded: not-needed
-Index: volview-3.4/CMakeLists.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ volview-3.4/CMakeLists.txt	2011-09-03 16:03:22.000000000 +0200
-@@ -0,0 +1,2 @@
-+project(fake_toplevel)
-+subdirs(VolViewPlatformComplete)
 Index: volview-3.4/VolViewPlatformComplete/CMakeLists.txt
 ===================================================================
 --- volview-3.4.orig/VolViewPlatformComplete/CMakeLists.txt	2011-09-03 16:03:20.000000000 +0200

Modified: trunk/packages/volview/trunk/debian/patches/fixuptcl.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixuptcl.patch	2012-01-07 08:37:36 UTC (rev 9193)
+++ trunk/packages/volview/trunk/debian/patches/fixuptcl.patch	2012-01-07 13:18:45 UTC (rev 9194)
@@ -4,8 +4,8 @@
 Forwarded: not-needed
 Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt
 ===================================================================
---- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-05 16:02:26.000000000 +0000
-+++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-05 16:04:13.000000000 +0000
+--- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-07-18 10:01:20.000000000 +0000
++++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt	2012-01-07 13:17:16.000000000 +0000
 @@ -15,7 +15,9 @@
  ENDIF(COMMAND CMAKE_POLICY)
  
@@ -19,8 +19,8 @@
  
 Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt
 ===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 16:03:28.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 16:04:13.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt	2012-01-07 12:56:34.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt	2012-01-07 12:56:34.000000000 +0000
 @@ -16,7 +16,10 @@
  
  
@@ -48,13 +48,14 @@
  IF(KWVolView_USE_GDCM)
 Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt
 ===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2011-09-05 16:03:28.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2011-09-05 16:04:13.000000000 +0000
-@@ -15,7 +15,9 @@
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2012-01-07 12:56:34.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt	2012-01-07 13:17:42.000000000 +0000
+@@ -15,7 +15,10 @@
  ENDIF(COMMAND CMAKE_POLICY)
  
  PROJECT(KWWidgetsPro)
 -
++find_package(TCL REQUIRED)
 +include_directories(
 +  ${TCL_INCLUDE_PATH}
 +)

Modified: trunk/packages/volview/trunk/debian/rules
===================================================================
--- trunk/packages/volview/trunk/debian/rules	2012-01-07 08:37:36 UTC (rev 9193)
+++ trunk/packages/volview/trunk/debian/rules	2012-01-07 13:18:45 UTC (rev 9194)
@@ -2,7 +2,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@  --parallel
+	dh $@  --parallel --sourcedirectory=VolViewPlatformComplete
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo