[med-svn] r6240 - in trunk/packages/gofigure2/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-03-11 13:53:20 +0000 (Fri, 11 Mar 2011)
New Revision: 6240

Modified:
   trunk/packages/gofigure2/trunk/debian/changelog
   trunk/packages/gofigure2/trunk/debian/control
   trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch
Log:
gofigure is almost ready to go. remaining issue is: #617240

Modified: trunk/packages/gofigure2/trunk/debian/changelog
===================================================================
--- trunk/packages/gofigure2/trunk/debian/changelog	2011-03-10 16:40:43 UTC (rev 6239)
+++ trunk/packages/gofigure2/trunk/debian/changelog	2011-03-11 13:53:20 UTC (rev 6240)
@@ -1,13 +1,5 @@
 gofigure2 (0.8.0-1) unstable; urgency=low
 
-  * New upstream
-  * Add a watch file now that source are uploaded
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Thu, 10 Mar 2011 17:28:10 +0100
-
-gofigure2 (0.4.2-1) unstable; urgency=low
-
   * Initial release (Closes: #587051)
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Thu, 24 Jun 2010 18:50:08 +0200
-
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Thu, 10 Mar 2011 17:28:10 +0100

Modified: trunk/packages/gofigure2/trunk/debian/control
===================================================================
--- trunk/packages/gofigure2/trunk/debian/control	2011-03-10 16:40:43 UTC (rev 6239)
+++ trunk/packages/gofigure2/trunk/debian/control	2011-03-11 13:53:20 UTC (rev 6240)
@@ -4,9 +4,9 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>,
-Build-Depends: debhelper (>= 7), cmake, libboost-all-dev, libqt4-dev, libinsighttoolkit3-dev (>= 3.20), libvtk5-qt4-dev (>= 5.6),
-  libgdcm2-dev, libopenjpeg-dev, uuid-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7), cmake (>= 2.8.2), libboost-all-dev, libqt4-dev, libinsighttoolkit3-dev (>= 3.20), libvtk5-qt4-dev (>= 5.6),
+  libgdcm2-dev (>= 2.0.16), libopenjpeg-dev, uuid-dev, libqtwebkit-dev | libqtcore4
+Standards-Version: 3.9.1
 Homepage: http://gofigure2.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gofigure2/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gofigure2/trunk/

Modified: trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch	2011-03-10 16:40:43 UTC (rev 6239)
+++ trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch	2011-03-11 13:53:20 UTC (rev 6240)
@@ -1,57 +1,20 @@
-Index: copy/Main/CMakeLists.txt
+Index: GoFigure2-v0.8.0/Main/CMakeLists.txt
 ===================================================================
---- copy/Main/CMakeLists.txt	(revision 1739)
-+++ copy/Main/CMakeLists.txt	(working copy)
-@@ -214,18 +214,18 @@
-   ENDIF( WIN32 )
- ENDIF( UNIX AND NOT APPLE )
- 
--INSTALL( FILES ${GOFIGURE2_LICENSE_FILES} 
--  DESTINATION Licenses COMPONENT Runtime 
--  )
-+#INSTALL( FILES ${GOFIGURE2_LICENSE_FILES} 
-+#  DESTINATION Licenses COMPONENT Runtime 
-+#  )
- #-----------------------------------------------------
- 
- #---------------------------------------------------------------------------
- # install a qt.conf file
- # this inserts some cmake code into the install script to write the file
--INSTALL( CODE "
--  file( WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"\")
--  " COMPONENT Runtime 
--  )
-+#INSTALL( CODE "
-+#  file( WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"\")
-+#  " COMPONENT Runtime 
-+#  )
- 
- #---------------------------------------------------------------------------
- # Use BundleUtilities to get all other dependencies for the application to 
-@@ -249,6 +249,8 @@
- # Note that the image plugins depend on QtSvg and QtXml, and it got those 
+--- GoFigure2-v0.8.0.orig/Main/CMakeLists.txt	2011-03-11 14:30:14.000000000 +0100
++++ GoFigure2-v0.8.0/Main/CMakeLists.txt	2011-03-11 14:30:51.000000000 +0100
+@@ -295,6 +295,7 @@
+ # install(SCRIPT  ...).
+ # Note that the image plugins depend on QtSvg and QtXml, and it got those
  # copied over.
- 
-+
 +IF( APPLE )
  INSTALL( CODE "
-   file( GLOB_RECURSE QTPLUGINS
+     file( GLOB_RECURSE QTPLUGINS
      \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\" )
-@@ -256,14 +258,12 @@
-     fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
-   " COMPONENT Runtime 
-   ) 
--
+@@ -303,7 +304,6 @@
+   "
+   COMPONENT Runtime )
+ 
 -IF( APPLE )
-   INSTALL( FILES ${GOFIGURE2_LICENSE_FILES}
-     DESTINATION ${plugin_dest_dir}/Licenses
-     COMPONENT Runtime
-     )
- ELSE( APPLE )
--  INSTALL( FILES ${GOFIGURE2_LICENSE_FILES} 
--    DESTINATION Licenses COMPONENT Runtime 
--    )
-+  #INSTALL( FILES ${GOFIGURE2_LICENSE_FILES} 
-+  #  DESTINATION Licenses COMPONENT Runtime 
-+  #  )
- ENDIF( APPLE )
+   #---------------------------------------------------------------------------
+   # install a qt.conf file
+   # this inserts some cmake code into the install script to write the file