[med-svn] r8208 - trunk/packages/mummy/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-19 13:16:35 +0000 (Wed, 19 Oct 2011)
New Revision: 8208

Added:
   trunk/packages/mummy/trunk/debian/patches/fixup.patch
   trunk/packages/mummy/trunk/debian/patches/removecableswig.patch
Modified:
   trunk/packages/mummy/trunk/debian/patches/series
Log:
redo patches

Added: trunk/packages/mummy/trunk/debian/patches/fixup.patch
===================================================================
--- trunk/packages/mummy/trunk/debian/patches/fixup.patch	                        (rev 0)
+++ trunk/packages/mummy/trunk/debian/patches/fixup.patch	2011-10-19 13:16:35 UTC (rev 8208)
@@ -0,0 +1,22 @@
+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"
+     "CableParsers"
+-    "CableExpat"
++    "expat"
+     "CxxTypes"
+     "gxsys"
+     )

Added: trunk/packages/mummy/trunk/debian/patches/removecableswig.patch
===================================================================
--- trunk/packages/mummy/trunk/debian/patches/removecableswig.patch	                        (rev 0)
+++ trunk/packages/mummy/trunk/debian/patches/removecableswig.patch	2011-10-19 13:16:35 UTC (rev 8208)
@@ -0,0 +1,82 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ mummy (1.0.2-1) unstable; urgency=low
+ .
+   * Initial release (Closes: #611789)
+Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Bug-Debian: http://bugs.debian.org/611789
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- mummy-1.0.2.orig/CMakeLists.txt
++++ mummy-1.0.2/CMakeLists.txt
+@@ -338,32 +338,32 @@ IF(Mummy_BUILD_COMPONENT_CABLESWIG OR Mu
+     ENDIF(NOT EXISTS "${Mummy_CableSwig_PARENT_DIR}")
+   ENDIF(NOT Mummy_CableSwig_CVS_REVISION STREQUAL "")
+ 
+-  IF(Mummy_UPDATE_CABLESWIG)
+-    GET_CVS_SNAPSHOT(
+-      "${Mummy_CableSwig_PARENT_DIR}"
+-      ":pserver:anonymous:@public.kitware.com:/cvsroot/CableSwig"
+-      "CableSwig"
+-      "${Mummy_CableSwig_CVS_REVISION}"
+-      )
+-  ELSE(Mummy_UPDATE_CABLESWIG)
+-    MESSAGE(STATUS "CableSwig snapshot already up to date. Skipping cvs update.")
+-  ENDIF(Mummy_UPDATE_CABLESWIG)
++  #IF(Mummy_UPDATE_CABLESWIG)
++  #  GET_CVS_SNAPSHOT(
++  #    "${Mummy_CableSwig_PARENT_DIR}"
++  #    ":pserver:anonymous:@public.kitware.com:/cvsroot/CableSwig"
++  #    "CableSwig"
++  #    "${Mummy_CableSwig_CVS_REVISION}"
++  #    )
++  #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")
+ ENDIF(Mummy_BUILD_COMPONENT_CABLESWIG OR Mummy_BUILD_COMPONENT_MUMMY)
+ 
+ IF(Mummy_BUILD_COMPONENT_CABLESWIG)
+-  ADD_SUBDIRECTORY(
+-    "${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}/GCC_XML/KWSys"
++  #  "${Mummy_CableSwig_BINARY_DIR}/GCC_XML/KWSys"
++  #  )
+ 
+   # Remove these CableSwig settings from the CMake GUI when configuring Mummy:
+   #

Modified: trunk/packages/mummy/trunk/debian/patches/series
===================================================================
--- trunk/packages/mummy/trunk/debian/patches/series	2011-10-19 13:04:54 UTC (rev 8207)
+++ trunk/packages/mummy/trunk/debian/patches/series	2011-10-19 13:16:35 UTC (rev 8208)
@@ -4,3 +4,5 @@
 shlib_exebit.patch
 install_mummy_runtime_dll.patch
 installdoc.patch
+removecableswig.patch
+fixup.patch