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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-06 10:02:04 +0000 (Tue, 06 Sep 2011)
New Revision: 7681

Added:
   trunk/packages/volview/trunk/debian/patches/vvforward.patch
Modified:
   trunk/packages/volview/trunk/debian/patches/series
   trunk/packages/volview/trunk/debian/rules
   trunk/packages/volview/trunk/debian/volview.install
Log:
Create a shared forwarding executable to real VolView

Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series	2011-09-06 09:26:28 UTC (rev 7680)
+++ trunk/packages/volview/trunk/debian/patches/series	2011-09-06 10:02:04 UTC (rev 7681)
@@ -8,3 +8,4 @@
 fixuptcl.patch
 fixuptar.patch
 fixupcurl.patch
+vvforward.patch

Added: trunk/packages/volview/trunk/debian/patches/vvforward.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/vvforward.patch	                        (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/vvforward.patch	2011-09-06 10:02:04 UTC (rev 7681)
@@ -0,0 +1,49 @@
+Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-06 10:01:12.000000000 +0000
++++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-06 10:01:14.000000000 +0000
+@@ -45,3 +45,31 @@
+   INSTALL_DEFAULT_DATA_SAMPLES 1
+   DOCUMENTATION_FILE  "Documentation/VolView 3 User Manual.pdf"
+ )
++
++set(dirs
++  "../lib/KWCommonPro" "../lib/KWCommon" "../lib/KWVolView" "../lib/VolViewApplications" "../lib/KWWidgetsPro"
++  )
++  set(KWCommon_FORWARD_BIN_TO_LIB
++    "../lib/VolView"
++    )
++
++foreach(dir ${dirs})
++  set(OTHER_FORWARD
++    "${OTHER_FORWARD},\"${dir}\"")
++endforeach()
++set(KWCommon_FORWARD_EXE
++  VolView
++  )
++configure_file(
++  ${VolViewLibraries_SOURCE_DIR}/KWCommon/kw-forward.c.in
++  ${CMAKE_CURRENT_BINARY_DIR}/vv-forward.c
++  @ONLY
++  )
++add_executable(
++  volview
++  ${CMAKE_CURRENT_BINARY_DIR}/vv-forward.c
++  )
++install(TARGETS volview
++  #  EXPORT ${TARGETS_NAME}
++  RUNTIME DESTINATION bin # COMPONENT Applications
++  )
+Index: volview-3.4/VolViewLibraries/KWCommon/kw-forward.c.in
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWCommon/kw-forward.c.in	2011-09-06 10:01:12.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWCommon/kw-forward.c.in	2011-09-06 10:01:14.000000000 +0000
+@@ -12,7 +12,7 @@
+ 
+ #define vtksys_SHARED_FORWARD_DIR_BUILD "@KWCommon_FORWARD_DIR_BUILD@"
+ #define vtksys_SHARED_FORWARD_PATH_BUILD "."
+-#define vtksys_SHARED_FORWARD_PATH_INSTALL "@KWCommon_FORWARD_BIN_TO_LIB@"
++#define vtksys_SHARED_FORWARD_PATH_INSTALL "@KWCommon_FORWARD_BIN_TO_LIB@"@OTHER_FORWARD@
+ #define vtksys_SHARED_FORWARD_EXE_BUILD "@KWCommon_FORWARD_EXE@"
+ #define vtksys_SHARED_FORWARD_EXE_INSTALL "@KWCommon_FORWARD_BIN_TO_LIB@/@KWCommon_FORWARD_EXE@"
+ #define vtksys_SHARED_FORWARD_OPTION_PRINT "--print"

Modified: trunk/packages/volview/trunk/debian/rules
===================================================================
--- trunk/packages/volview/trunk/debian/rules	2011-09-06 09:26:28 UTC (rev 7680)
+++ trunk/packages/volview/trunk/debian/rules	2011-09-06 10:02:04 UTC (rev 7681)
@@ -20,5 +20,16 @@
 	rmdir debian/volview/usr/doc
 	dh_installdocs
 
+override_dh_shlibdeps:
+	# do nothing
+
+override_dh_install:
+	dh_install --list-missing
+
+override_dh_auto_install:
+	dh_auto_install
+	mv debian/volview/usr/bin/Plugins debian/volview/usr/lib/VolView
+	mv debian/volview/usr/bin/VolView debian/volview/usr/lib/VolView
+
 get-orig-source:
 	./debian/get-orig-source

Modified: trunk/packages/volview/trunk/debian/volview.install
===================================================================
--- trunk/packages/volview/trunk/debian/volview.install	2011-09-06 09:26:28 UTC (rev 7680)
+++ trunk/packages/volview/trunk/debian/volview.install	2011-09-06 10:02:04 UTC (rev 7681)
@@ -2,5 +2,5 @@
 debian/volview.xpm usr/share/pixmaps
 debian/volview.xml usr/share/mime/packages
 debian/volview.desktop usr/share/applications
-usr/bin/Plugins usr/lib/VolView/Plugins
-usr/bin/VolView usr/lib/VolView/VolView
+#usr/bin/Plugins usr/lib/VolView
+#usr/bin/VolView usr/lib/VolView