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

[Mathieu Malaterre]

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

Modified:
   trunk/packages/mummy/trunk/debian/patches/fixup.patch
   trunk/packages/mummy/trunk/debian/patches/removecableswig.patch
   trunk/packages/mummy/trunk/debian/patches/system_cableswig.patch
Log:
cleanup patches

Modified: trunk/packages/mummy/trunk/debian/patches/fixup.patch
===================================================================
--- trunk/packages/mummy/trunk/debian/patches/fixup.patch	2011-10-19 13:18:44 UTC (rev 8210)
+++ trunk/packages/mummy/trunk/debian/patches/fixup.patch	2011-10-19 13:22:35 UTC (rev 8211)
@@ -1,3 +1,7 @@
+Description: use system installed cableswig
+Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Last-Update: 2011-10-19
+
 Index: mummy-1.0.2/CMakeLists.txt
 ===================================================================
 --- mummy-1.0.2.orig/CMakeLists.txt	2011-10-19 13:10:25.000000000 +0000

Modified: trunk/packages/mummy/trunk/debian/patches/removecableswig.patch
===================================================================
--- trunk/packages/mummy/trunk/debian/patches/removecableswig.patch	2011-10-19 13:18:44 UTC (rev 8210)
+++ trunk/packages/mummy/trunk/debian/patches/removecableswig.patch	2011-10-19 13:22:35 UTC (rev 8211)
@@ -1,29 +1,7 @@
-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)
+Description: remove in-source build of cableswig
 Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Bug-Debian: http://bugs.debian.org/611789
+Last-Update: 2011-10-19
 
----
-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
@@ -80,3 +58,25 @@
  
    # 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"
+     "CableParsers"
+-    "CableExpat"
++    "expat"
+     "CxxTypes"
+     "gxsys"
+     )

Modified: trunk/packages/mummy/trunk/debian/patches/system_cableswig.patch
===================================================================
--- trunk/packages/mummy/trunk/debian/patches/system_cableswig.patch	2011-10-19 13:18:44 UTC (rev 8210)
+++ trunk/packages/mummy/trunk/debian/patches/system_cableswig.patch	2011-10-19 13:22:35 UTC (rev 8211)
@@ -15,15 +15,6 @@
  
  SET(mummy_EXECUTABLE "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/mummy${CMAKE_EXECUTABLE_SUFFIX}")
  
-@@ -125,7 +125,7 @@
- # "${CMAKE_CURRENT_SOURCE_DIR}"
- #
- GET_FILENAME_COMPONENT(Mummy_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PATH)
--SET(Mummy_REL_EXPR "..")
-+SET(Mummy_REL_EXPR ".")
- IF("${Mummy_PARENT_DIR}" MATCHES "/ActiViz$")
-   SET(Mummy_REL_EXPR "../..")
- ENDIF("${Mummy_PARENT_DIR}" MATCHES "/ActiViz$")
 Index: mummy-1.0.2/MummyCsharpGenerator.cxx
 ===================================================================
 --- mummy-1.0.2.orig/MummyCsharpGenerator.cxx	2011-02-16 18:30:54.000000000 +0100