[med-svn] r7247 - in trunk/packages/ginkgocadx/trunk/debian: . patches

Andreas Tille tille at alioth.debian.org
Mon Jul 11 09:13:13 UTC 2011


Author: tille
Date: 2011-07-11 09:13:12 +0000 (Mon, 11 Jul 2011)
New Revision: 7247

Added:
   trunk/packages/ginkgocadx/trunk/debian/patches/add_missing_CMakeLists.txt
Removed:
   trunk/packages/ginkgocadx/trunk/debian/patches/01_no_msse.patch
Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
   trunk/packages/ginkgocadx/trunk/debian/control
   trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.1
   trunk/packages/ginkgocadx/trunk/debian/patches/do_not_install_to_usr_share.patch
   trunk/packages/ginkgocadx/trunk/debian/patches/gcc46.patch
   trunk/packages/ginkgocadx/trunk/debian/patches/series
   trunk/packages/ginkgocadx/trunk/debian/patches/sqlite.patch
Log:
Adapted to new upstream version


Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2011-07-11 07:44:57 UTC (rev 7246)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2011-07-11 09:13:12 UTC (rev 7247)
@@ -1,11 +1,14 @@
-ginkgocadx (2.4.1.1-3) UNRELEASED; urgency=low
+ginkgocadx (2.5.0.0-1) UNRELEASED; urgency=low
 
+  * New upstream version (updated patches to new version)
+    Closes: #630877, #630852
   * debian/{mime,sharedmimeinfo}: Mime info for DICOM images
     Closes: #631205
   * Added manpage + desktop file (thanks to Karsten Hilbert
     <Karsten.Hilbert at gmx.net>)
+  * Fixed Vcs fields
 
- -- Andreas Tille <tille at debian.org>  Wed, 22 Jun 2011 19:29:09 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 11 Jul 2011 10:16:37 +0200
 
 ginkgocadx (2.4.1.1-2) unstable; urgency=low
 

Modified: trunk/packages/ginkgocadx/trunk/debian/control
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/control	2011-07-11 07:44:57 UTC (rev 7246)
+++ trunk/packages/ginkgocadx/trunk/debian/control	2011-07-11 09:13:12 UTC (rev 7247)
@@ -10,8 +10,8 @@
  libgdcm2-dev, libwrap0, libfftw3-dev, chrpath, libsqlite3-dev,
  libmysqlclient16 (>= 5.1.57)
 Standards-Version: 3.9.2
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/ginkgocadx/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/ginkgocadx/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/ginkgocadx/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/ginkgocadx/trunk/
 Homepage: http://ginkgo-cadx.com/
 
 Package: ginkgocadx

Modified: trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.1
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.1	2011-07-11 07:44:57 UTC (rev 7246)
+++ trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.1	2011-07-11 09:13:12 UTC (rev 7247)
@@ -5,8 +5,7 @@
 .TH Ginkgo\ CADx 1 "2011 June 22nd" "Manual for Ginkgo CADx"
 
 .SH NAME
-.B Ginkgo CADx
-- a medical image (DICOM) viewer
+Ginkgo CADx \- a medical image (DICOM) viewer
 
 .SH SYNOPSIS
 .B ginkgocadx

Deleted: trunk/packages/ginkgocadx/trunk/debian/patches/01_no_msse.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/01_no_msse.patch	2011-07-11 07:44:57 UTC (rev 7246)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/01_no_msse.patch	2011-07-11 09:13:12 UTC (rev 7247)
@@ -1,16 +0,0 @@
---- ginkgocadx-2.4.1.1.orig/src/CMake/SysDefs.cmake
-+++ ginkgocadx-2.4.1.1/src/CMake/SysDefs.cmake
-@@ -38,11 +38,11 @@
- 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
- 
- ELSEIF(LINUX)
--	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse2")
-+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- 	#SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl")
- 
- ELSEIF(APPLE)
--	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse2")
-+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- 	#SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl")
- 
- ENDIF()

Added: trunk/packages/ginkgocadx/trunk/debian/patches/add_missing_CMakeLists.txt
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/add_missing_CMakeLists.txt	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/add_missing_CMakeLists.txt	2011-07-11 09:13:12 UTC (rev 7247)
@@ -0,0 +1,6 @@
+--- /dev/null
++++ ginkgocadx-2.5.0.0/CMakeLists.txt
+@@ -0,0 +1,3 @@
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
++SUBDIRS(src)
++

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/do_not_install_to_usr_share.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/do_not_install_to_usr_share.patch	2011-07-11 07:44:57 UTC (rev 7246)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/do_not_install_to_usr_share.patch	2011-07-11 09:13:12 UTC (rev 7247)
@@ -1,8 +1,6 @@
-Index: ginkgocadx-2.4.1.1/src/cadxcore/CMakeLists.txt
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/cadxcore/CMakeLists.txt	2011-05-01 12:39:24.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/cadxcore/CMakeLists.txt	2011-05-11 13:24:21.000000000 +0200
-@@ -120,9 +120,9 @@
+--- ginkgocadx-2.5.0.0.orig/src/cadxcore/CMakeLists.txt
++++ ginkgocadx-2.5.0.0/src/cadxcore/CMakeLists.txt
+@@ -200,9 +200,9 @@
  	VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
  	LINK_INTERFACE_LIBRARIES ""
  	INSTALL_RPATH_USE_LINK_PATH TRUE )
@@ -15,41 +13,8 @@
  
  ################ LIBS ################
  
-Index: ginkgocadx-2.4.1.1/src/cadxcore/main/entorno.cpp
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/cadxcore/main/entorno.cpp	2011-05-01 12:39:25.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/cadxcore/main/entorno.cpp	2011-05-11 13:24:21.000000000 +0200
-@@ -116,16 +116,23 @@
- 	wxString pluginsDir;
- 	wxString langDir;
- 	
--	#if defined(_WINDOWS) || defined(LINUX)
-+	#if defined(_WINDOWS)
- 		pluginsDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("Plugins");
- 		langDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("lang");
-+	#elif defined(LINUX)
-+		#if defined(CUSTOM_BUILD)
-+			pluginsDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("Plugins");
-+			langDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("lang");
-+		#else
-+			pluginsDir = wxStandardPaths::Get().GetPluginsDir() + wxFileName::GetPathSeparator() + wxT("Plugins");
-+			langDir = wxStandardPaths::Get().GetResourcesDir()  + wxFileName::GetPathSeparator() + wxT("lang");
-+		#endif
- 		
- 	#else
- 		pluginsDir = wxStandardPaths::Get().GetPluginsDir();
- 		langDir = wxStandardPaths::Get().GetResourcesDir() + wxFileName::GetPathSeparator() + wxT("lang");
- 		
--	#endif
--	
-+	#endif	
- 	
- 	
- 	m_GinkgoPluginsDir = TOPATH(pluginsDir);
-Index: ginkgocadx-2.4.1.1/src/CMake/SysDefs.cmake
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/CMake/SysDefs.cmake	2011-05-01 12:39:24.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/CMake/SysDefs.cmake	2011-05-11 13:24:21.000000000 +0200
+--- ginkgocadx-2.5.0.0.orig/src/CMake/SysDefs.cmake
++++ ginkgocadx-2.5.0.0/src/CMake/SysDefs.cmake
 @@ -54,6 +54,9 @@
  	IF (DEBUG)
  		ADD_DEFINITIONS(-D_GINKGO_DEBUG -DVTK_DEBUG_LEAKS -DDEBUG -D__WXDEBUG__)
@@ -60,53 +25,36 @@
  
  	ADD_DEFINITIONS(-DUSING_EXTENSIONS -DGINKGO_ARCH_${ARCH})
  	
-Index: ginkgocadx-2.4.1.1/src/CMakeLists.txt
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/CMakeLists.txt	2011-05-01 12:39:24.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/CMakeLists.txt	2011-05-11 13:24:21.000000000 +0200
-@@ -81,7 +81,7 @@
- ELSEIF(LINUX AND CUSTOM_PACKAGE)
- 	SET(GINKGO_PROJECT "ginkgo-${ARCH}" CACHE PARENT_SCOPE "")
- ELSE()
--	SET(GINKGO_PROJECT "ginkgo" CACHE PARENT_SCOPE "")
-+	SET(GINKGO_PROJECT "ginkgocadx" CACHE PARENT_SCOPE "")
- ENDIF()
- 
- SET(GINKGO_PLUGINS "" CACHE PARENT_SCOPE "")
-Index: ginkgocadx-2.4.1.1/src/fooextension/CMakeLists.txt
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/fooextension/CMakeLists.txt	2011-05-01 12:39:25.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/fooextension/CMakeLists.txt	2011-05-11 13:24:21.000000000 +0200
-@@ -33,11 +33,11 @@
+--- ginkgocadx-2.5.0.0.orig/src/fooextension/CMakeLists.txt
++++ ginkgocadx-2.5.0.0/src/fooextension/CMakeLists.txt
+@@ -73,11 +73,11 @@
  IF(LINUX AND NOT CUSTOM_PACKAGE)
- 	SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
- 	SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
--	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
-+	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
- 	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--	LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin" isSystemDir)
-+	LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx" isSystemDir)
- 	IF("${isSystemDir}" STREQUAL "-1")
--		SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
-+		SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
- 	ENDIF()
+    SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+    SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
++   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
+    SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-   LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin" isSystemDir)
++   LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx" isSystemDir)
+    IF("${isSystemDir}" STREQUAL "-1")
+-      SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
++      SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
+    ENDIF()
  ENDIF()
  
-@@ -47,7 +47,7 @@
- 	VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
- 	LINK_INTERFACE_LIBRARIES ""
- 	INSTALL_RPATH_USE_LINK_PATH TRUE )
+@@ -87,7 +87,7 @@
+    VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
+    LINK_INTERFACE_LIBRARIES ""
+    INSTALL_RPATH_USE_LINK_PATH TRUE )
 -INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION share/ginkgocadx/bin/Plugins)
 +INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
  
  ################ LIBS ################
  
-Index: ginkgocadx-2.4.1.1/src/ginkgo/CMakeLists.txt
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/ginkgo/CMakeLists.txt	2011-05-01 12:39:25.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/ginkgo/CMakeLists.txt	2011-05-11 13:24:21.000000000 +0200
+--- ginkgocadx-2.5.0.0.orig/src/ginkgocadx/CMakeLists.txt
++++ ginkgocadx-2.5.0.0/src/ginkgocadx/CMakeLists.txt
 @@ -11,11 +11,11 @@
- IF(LINUX AND NOT CUSTOM_PACKAGE)
+ IF(LINUX AND NOT CUSTOM_BUILD)
  	SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
  	SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
 -	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
@@ -120,23 +68,21 @@
  	ENDIF()
  ENDIF()
  
-@@ -23,9 +23,9 @@
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} CADxCore)
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
+@@ -87,9 +87,9 @@
+ IF(LINUX)
+ 	SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
  	LINK_INTERFACE_LIBRARIES ""
 -	CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
 +	CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
  
--INSTALL(TARGETS ${PROJECT_NAME} DESTINATION share/ginkgocadx/bin)
-+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
+-	INSTALL(TARGETS ${PROJECT_NAME} DESTINATION share/ginkgocadx/bin)
++	INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
+ ENDIF()
  
- IF(USE_CUSTOM_WX)
-         ADD_DEFINITIONS(${wxWidgets_defines})
-Index: ginkgocadx-2.4.1.1/src/visualizator/CMakeLists.txt
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/visualizator/CMakeLists.txt	2011-05-01 12:39:24.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/visualizator/CMakeLists.txt	2011-05-11 13:24:21.000000000 +0200
-@@ -52,11 +52,11 @@
+ IF (MACOS)
+--- ginkgocadx-2.5.0.0.orig/src/visualizator/CMakeLists.txt
++++ ginkgocadx-2.5.0.0/src/visualizator/CMakeLists.txt
+@@ -92,11 +92,11 @@
  IF(LINUX AND NOT CUSTOM_PACKAGE)
  	SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
  	SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
@@ -151,7 +97,7 @@
  	ENDIF()
  ENDIF()
  
-@@ -66,9 +66,9 @@
+@@ -106,9 +106,9 @@
  	VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
  	LINK_INTERFACE_LIBRARIES ""
  	INSTALL_RPATH_USE_LINK_PATH TRUE )

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/gcc46.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/gcc46.patch	2011-07-11 07:44:57 UTC (rev 7246)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/gcc46.patch	2011-07-11 09:13:12 UTC (rev 7247)
@@ -1,7 +1,5 @@
-Index: ginkgocadx-2.4.1.1/src/cadxcore/api/icontrato.h
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/cadxcore/api/icontrato.h	2011-05-25 09:50:35.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/cadxcore/api/icontrato.h	2011-05-25 09:51:02.000000000 +0200
+--- ginkgocadx-2.5.0.0.orig/src/cadxcore/api/icontrato.h
++++ ginkgocadx-2.5.0.0/src/cadxcore/api/icontrato.h
 @@ -14,6 +14,7 @@
  #include "ivista.h"
  #include <map>

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series	2011-07-11 07:44:57 UTC (rev 7246)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series	2011-07-11 09:13:12 UTC (rev 7247)
@@ -1,5 +1,5 @@
 sqlite.patch
-spelling.patch
+## spelling.patch
 gcc46.patch
 do_not_install_to_usr_share.patch
-01_no_msse.patch
+add_missing_CMakeLists.txt

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/sqlite.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/sqlite.patch	2011-07-11 07:44:57 UTC (rev 7246)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/sqlite.patch	2011-07-11 09:13:12 UTC (rev 7247)
@@ -1,8 +1,6 @@
-Index: ginkgocadx-2.4.1.1/src/cadxcore/CMakeLists.txt
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/cadxcore/CMakeLists.txt	2011-05-26 19:43:44.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/cadxcore/CMakeLists.txt	2011-05-26 19:48:17.000000000 +0200
-@@ -48,8 +48,6 @@
+--- ginkgocadx-2.5.0.0.orig/src/cadxcore/CMakeLists.txt
++++ ginkgocadx-2.5.0.0/src/cadxcore/CMakeLists.txt
+@@ -52,8 +52,6 @@
  
  AUX_SOURCE_DIRECTORY(resources SRCS)
  
@@ -11,19 +9,8 @@
  AUX_SOURCE_DIRECTORY(endpoint SRCS)
  
  AUX_SOURCE_DIRECTORY(vtk SRCS)
-@@ -200,7 +198,7 @@
- ENDIF()
- 
- IF (LINUX)
--	TARGET_LINK_LIBRARIES(${PROJECT_NAME} ssl GL crypto xml2)
-+	TARGET_LINK_LIBRARIES(${PROJECT_NAME} ssl GL crypto xml2 sqlite3)
- ENDIF()
- 
- IF(MACOS)
-Index: ginkgocadx-2.4.1.1/src/cadxcore/wx/wxsqlite3/wxsqlite3.cpp
-===================================================================
---- ginkgocadx-2.4.1.1.orig/src/cadxcore/wx/wxsqlite3/wxsqlite3.cpp	2011-05-26 19:43:44.000000000 +0200
-+++ ginkgocadx-2.4.1.1/src/cadxcore/wx/wxsqlite3/wxsqlite3.cpp	2011-05-26 19:46:42.000000000 +0200
+--- ginkgocadx-2.5.0.0.orig/src/cadxcore/wx/wxsqlite3/wxsqlite3.cpp
++++ ginkgocadx-2.5.0.0/src/cadxcore/wx/wxsqlite3/wxsqlite3.cpp
 @@ -43,7 +43,8 @@
  #define SQLITE_HAS_CODEC 0
  #endif




More information about the debian-med-commit mailing list