[med-svn] r8517 - trunk/packages/gofigure2/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-11-10 19:47:55 +0000 (Thu, 10 Nov 2011)
New Revision: 8517

Removed:
   trunk/packages/gofigure2/trunk/debian/patches/unknown_arg.patch
Modified:
   trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch
   trunk/packages/gofigure2/trunk/debian/patches/mismatch_endif.cmake
   trunk/packages/gofigure2/trunk/debian/patches/series
Log:
trying without patch

Modified: trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch	2011-11-10 19:45:24 UTC (rev 8516)
+++ trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch	2011-11-10 19:47:55 UTC (rev 8517)
@@ -1,8 +1,8 @@
-Index: GoFigure2-v0.8.3/Main/CMakeLists.txt
+Index: GoFigure2-v0.8.4/Main/CMakeLists.txt
 ===================================================================
---- GoFigure2-v0.8.3.orig/Main/CMakeLists.txt	2011-09-16 16:09:48.000000000 +0200
-+++ GoFigure2-v0.8.3/Main/CMakeLists.txt	2011-10-25 18:20:39.000000000 +0200
-@@ -274,6 +274,7 @@
+--- GoFigure2-v0.8.4.orig/Main/CMakeLists.txt	2011-11-10 16:24:50.000000000 +0100
++++ GoFigure2-v0.8.4/Main/CMakeLists.txt	2011-11-10 20:45:51.000000000 +0100
+@@ -277,6 +277,7 @@
    # install(SCRIPT  ...).
    # Note that the image plugins depend on QtSvg and QtXml, and it got those
    # copied over.
@@ -10,9 +10,9 @@
    INSTALL( CODE "
        file( GLOB_RECURSE QTPLUGINS
        \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\" )
-@@ -296,7 +297,6 @@
-   "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Resources/*.txt"
+@@ -287,7 +288,6 @@
    )
+ ENDIF( USE_BUNDLE_UTILITIES )
  
 -IF( APPLE )
    #---------------------------------------------------------------------------

Modified: trunk/packages/gofigure2/trunk/debian/patches/mismatch_endif.cmake
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/mismatch_endif.cmake	2011-11-10 19:45:24 UTC (rev 8516)
+++ trunk/packages/gofigure2/trunk/debian/patches/mismatch_endif.cmake	2011-11-10 19:47:55 UTC (rev 8517)
@@ -1,13 +1,13 @@
-Index: GoFigure2-v0.8.3/Main/CMakeLists.txt
+Index: GoFigure2-v0.8.4/Main/CMakeLists.txt
 ===================================================================
---- GoFigure2-v0.8.3.orig/Main/CMakeLists.txt	2011-10-25 16:31:39.000000000 +0000
-+++ GoFigure2-v0.8.3/Main/CMakeLists.txt	2011-10-25 16:37:10.000000000 +0000
-@@ -324,7 +324,7 @@
-     DESTINATION ${GOFIGURE2_INSTALL_RESOURCSES_DIR}
-     COMPONENT Runtime
+--- GoFigure2-v0.8.4.orig/Main/CMakeLists.txt	2011-11-10 20:45:51.000000000 +0100
++++ GoFigure2-v0.8.4/Main/CMakeLists.txt	2011-11-10 20:45:55.000000000 +0100
+@@ -295,7 +295,7 @@
+     file( WRITE \"\${CMAKE_INSTALL_PREFIX}/${GOFIGURE2_INSTALL_BUNDLE_DIR}/${qtconf_dest_dir}/qt.conf\" \"\")
+     " COMPONENT Runtime
      )
 -ENDIF( APPLE )
 +ENDIF( USE_BUNDLE_UTILITIES )
  
- FILE( GLOB __source_file_h "${CMAKE_CURRENT_SOURCE_DIR}/*.h" )
- 
+ #-----------------------------------------------------
+ # Here Let's take care of License and Resoources files

Modified: trunk/packages/gofigure2/trunk/debian/patches/series
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/series	2011-11-10 19:45:24 UTC (rev 8516)
+++ trunk/packages/gofigure2/trunk/debian/patches/series	2011-11-10 19:47:55 UTC (rev 8517)
@@ -1,3 +1,2 @@
-apple_bundle_fix.patch
-mismatch_endif.cmake
-unknown_arg.patch
+#apple_bundle_fix.patch
+#mismatch_endif.cmake

Deleted: trunk/packages/gofigure2/trunk/debian/patches/unknown_arg.patch
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/unknown_arg.patch	2011-11-10 19:45:24 UTC (rev 8516)
+++ trunk/packages/gofigure2/trunk/debian/patches/unknown_arg.patch	2011-11-10 19:47:55 UTC (rev 8517)
@@ -1,12 +0,0 @@
-Index: GoFigure2-v0.8.3/CMakeLists.txt
-===================================================================
---- GoFigure2-v0.8.3.orig/CMakeLists.txt	2011-09-16 14:09:48.000000000 +0000
-+++ GoFigure2-v0.8.3/CMakeLists.txt	2011-10-25 16:38:05.000000000 +0000
-@@ -518,7 +518,6 @@
-       INSTALL(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/GoFigure2.desktop
-         DESTINATION ${GOFIGURE2_INSTALL_BIN_DIR}
--        @ONLY
-       )
-     ENDIF()
-