[med-svn] r8212 - trunk/packages/mummy/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Wed Oct 19 13:25:10 UTC 2011
Author: malat-guest
Date: 2011-10-19 13:25:10 +0000 (Wed, 19 Oct 2011)
New Revision: 8212
Modified:
trunk/packages/mummy/trunk/debian/patches/removecableswig.patch
trunk/packages/mummy/trunk/debian/patches/series
trunk/packages/mummy/trunk/debian/patches/shlib_exebit.patch
Log:
refresh patches
Modified: trunk/packages/mummy/trunk/debian/patches/removecableswig.patch
===================================================================
--- trunk/packages/mummy/trunk/debian/patches/removecableswig.patch 2011-10-19 13:22:35 UTC (rev 8211)
+++ trunk/packages/mummy/trunk/debian/patches/removecableswig.patch 2011-10-19 13:25:10 UTC (rev 8212)
@@ -2,9 +2,20 @@
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Last-Update: 2011-10-19
---- mummy-1.0.2.orig/CMakeLists.txt
-+++ mummy-1.0.2/CMakeLists.txt
-@@ -338,32 +338,32 @@ IF(Mummy_BUILD_COMPONENT_CABLESWIG OR Mu
+Index: mummy-1.0.2/CMakeLists.txt
+===================================================================
+--- mummy-1.0.2.orig/CMakeLists.txt 2011-10-19 15:23:48.000000000 +0200
++++ mummy-1.0.2/CMakeLists.txt 2011-10-19 15:23:50.000000000 +0200
+@@ -227,6 +227,8 @@
+ "${Mummy_CableSwig_SOURCE_DIR}/Cable/Generators"
+ "${Mummy_CableSwig_SOURCE_DIR}/Cable/Parsers"
+ "${Mummy_CableSwig_BINARY_DIR}/GCC_XML"
++ /usr/include/Cable/CxxTypes
++ /usr/include/Cable
+ )
+
+ INCLUDE_DIRECTORIES(${Mummy_include_dirs})
+@@ -338,32 +340,32 @@
ENDIF(NOT EXISTS "${Mummy_CableSwig_PARENT_DIR}")
ENDIF(NOT Mummy_CableSwig_CVS_REVISION STREQUAL "")
@@ -18,6 +29,10 @@
- ELSE(Mummy_UPDATE_CABLESWIG)
- MESSAGE(STATUS "CableSwig snapshot already up to date. Skipping cvs update.")
- ENDIF(Mummy_UPDATE_CABLESWIG)
+-
+- IF(NOT EXISTS "${Mummy_CableSwig_SOURCE_DIR}/CMakeLists.txt")
+- MESSAGE(FATAL_ERROR "error: CableSwig could not be checked out or updated. Check it out or copy it manually to '${Mummy_CableSwig_SOURCE_DIR}'...")
+- ENDIF(NOT EXISTS "${Mummy_CableSwig_SOURCE_DIR}/CMakeLists.txt")
+ #IF(Mummy_UPDATE_CABLESWIG)
+ # GET_CVS_SNAPSHOT(
+ # "${Mummy_CableSwig_PARENT_DIR}"
@@ -28,10 +43,7 @@
+ #ELSE(Mummy_UPDATE_CABLESWIG)
+ # MESSAGE(STATUS "CableSwig snapshot already up to date. Skipping cvs update.")
+ #ENDIF(Mummy_UPDATE_CABLESWIG)
-
-- IF(NOT EXISTS "${Mummy_CableSwig_SOURCE_DIR}/CMakeLists.txt")
-- MESSAGE(FATAL_ERROR "error: CableSwig could not be checked out or updated. Check it out or copy it manually to '${Mummy_CableSwig_SOURCE_DIR}'...")
-- ENDIF(NOT EXISTS "${Mummy_CableSwig_SOURCE_DIR}/CMakeLists.txt")
++
+ #IF(NOT EXISTS "${Mummy_CableSwig_SOURCE_DIR}/CMakeLists.txt")
+ # MESSAGE(FATAL_ERROR "error: CableSwig could not be checked out or updated. Check it out or copy it manually to '${Mummy_CableSwig_SOURCE_DIR}'...")
+ #ENDIF(NOT EXISTS "${Mummy_CableSwig_SOURCE_DIR}/CMakeLists.txt")
@@ -42,35 +54,23 @@
- "${Mummy_CableSwig_SOURCE_DIR}/Cable"
- "${Mummy_CableSwig_BINARY_DIR}/Cable"
- )
-+ #ADD_SUBDIRECTORY(
-+ # "${Mummy_CableSwig_SOURCE_DIR}/Cable"
-+ # "${Mummy_CableSwig_BINARY_DIR}/Cable"
-+ # )
-
+-
- ADD_SUBDIRECTORY(
- "${Mummy_CableSwig_SOURCE_DIR}/GCC_XML/KWSys"
- "${Mummy_CableSwig_BINARY_DIR}/GCC_XML/KWSys"
- )
+ #ADD_SUBDIRECTORY(
++ # "${Mummy_CableSwig_SOURCE_DIR}/Cable"
++ # "${Mummy_CableSwig_BINARY_DIR}/Cable"
++ # )
++
++ #ADD_SUBDIRECTORY(
+ # "${Mummy_CableSwig_SOURCE_DIR}/GCC_XML/KWSys"
+ # "${Mummy_CableSwig_BINARY_DIR}/GCC_XML/KWSys"
+ # )
# Remove these CableSwig settings from the CMake GUI when configuring Mummy:
#
-Index: mummy-1.0.2/CMakeLists.txt
-===================================================================
---- mummy-1.0.2.orig/CMakeLists.txt 2011-10-19 13:10:25.000000000 +0000
-+++ mummy-1.0.2/CMakeLists.txt 2011-10-19 13:13:54.000000000 +0000
-@@ -227,6 +227,8 @@
- "${Mummy_CableSwig_SOURCE_DIR}/Cable/Generators"
- "${Mummy_CableSwig_SOURCE_DIR}/Cable/Parsers"
- "${Mummy_CableSwig_BINARY_DIR}/GCC_XML"
-+ /usr/include/Cable/CxxTypes
-+ /usr/include/Cable
- )
-
- INCLUDE_DIRECTORIES(${Mummy_include_dirs})
@@ -417,7 +419,7 @@
TARGET_LINK_LIBRARIES(mummyLib
"CableGenerators"
Modified: trunk/packages/mummy/trunk/debian/patches/series
===================================================================
--- trunk/packages/mummy/trunk/debian/patches/series 2011-10-19 13:22:35 UTC (rev 8211)
+++ trunk/packages/mummy/trunk/debian/patches/series 2011-10-19 13:25:10 UTC (rev 8212)
@@ -4,4 +4,3 @@
install_mummy_runtime_dll.patch
installdoc.patch
removecableswig.patch
-fixup.patch
Modified: trunk/packages/mummy/trunk/debian/patches/shlib_exebit.patch
===================================================================
--- trunk/packages/mummy/trunk/debian/patches/shlib_exebit.patch 2011-10-19 13:22:35 UTC (rev 8211)
+++ trunk/packages/mummy/trunk/debian/patches/shlib_exebit.patch 2011-10-19 13:25:10 UTC (rev 8212)
@@ -3,8 +3,8 @@
http://vtk.org/Bug/view.php?id=11870
Index: mummy-1.0.2/Runtime/CMakeLists.txt
===================================================================
---- mummy-1.0.2.orig/Runtime/CMakeLists.txt 2011-02-16 21:45:09.000000000 +0100
-+++ mummy-1.0.2/Runtime/CMakeLists.txt 2011-02-16 21:49:51.000000000 +0100
+--- mummy-1.0.2.orig/Runtime/CMakeLists.txt 2011-10-19 15:23:01.000000000 +0200
++++ mummy-1.0.2/Runtime/CMakeLists.txt 2011-10-19 15:23:15.000000000 +0200
@@ -22,7 +22,7 @@
INSTALL(TARGETS
@@ -16,10 +16,10 @@
Index: mummy-1.0.2/CMakeLists.txt
===================================================================
---- mummy-1.0.2.orig/CMakeLists.txt 2011-02-16 21:45:46.000000000 +0100
-+++ mummy-1.0.2/CMakeLists.txt 2011-02-16 22:04:51.000000000 +0100
+--- mummy-1.0.2.orig/CMakeLists.txt 2011-10-19 15:23:14.000000000 +0200
++++ mummy-1.0.2/CMakeLists.txt 2011-10-19 15:23:15.000000000 +0200
@@ -1,6 +1,11 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.2 FATAL_ERROR)
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3 FATAL_ERROR)
PROJECT(Mummy)
+# Define where we are going to install Kiware.mummy.Runtime.Unmanaged
@@ -41,8 +41,8 @@
# targets for Visual Studio builds:
Index: mummy-1.0.2/MummyConfig.cmake.in
===================================================================
---- mummy-1.0.2.orig/MummyConfig.cmake.in 2011-02-16 21:47:16.000000000 +0100
-+++ mummy-1.0.2/MummyConfig.cmake.in 2011-02-16 21:50:38.000000000 +0100
+--- mummy-1.0.2.orig/MummyConfig.cmake.in 2011-10-19 15:23:01.000000000 +0200
++++ mummy-1.0.2/MummyConfig.cmake.in 2011-10-19 15:23:15.000000000 +0200
@@ -90,7 +90,7 @@
)
More information about the debian-med-commit
mailing list