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

Andreas Tille tille at alioth.debian.org
Fri May 27 10:18:23 UTC 2011 

Author: tille
Date: 2011-05-27 10:18:23 +0000 (Fri, 27 May 2011)
New Revision: 6858

Added:
   trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
   trunk/packages/ginkgocadx/trunk/debian/patches/gcc46.patch
   trunk/packages/ginkgocadx/trunk/debian/patches/sqlite.patch
Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
   trunk/packages/ginkgocadx/trunk/debian/control
   trunk/packages/ginkgocadx/trunk/debian/patches/series
   trunk/packages/ginkgocadx/trunk/debian/rules
Log:
Basically commit the changes of Thorsten Alteholz who had trouble in commiting; small changes of package description; added ITP bug #


Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2011-05-27 10:00:47 UTC (rev 6857)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2011-05-27 10:18:23 UTC (rev 6858)
@@ -1,5 +1,5 @@
 ginkgocadx (2.4.1.1-1) unstable; urgency=low
 
-  * Initial release (Closes: )
+  * Initial release (Closes: #628106)
 
  -- Andreas Tille <tille at debian.org>  Mon, 02 May 2011 08:09:26 +0200

Modified: trunk/packages/ginkgocadx/trunk/debian/control
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/control	2011-05-27 10:00:47 UTC (rev 6857)
+++ trunk/packages/ginkgocadx/trunk/debian/control	2011-05-27 10:18:23 UTC (rev 6858)
@@ -2,12 +2,12 @@
 Section: science
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>
+Uploaders: Andreas Tille <tille at debian.org>, Thorsten Alteholz <debian at alteholz.de>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8), cmake (>= 2.8), libgtk2.0-dev, libxml2-dev, libssl-dev, libwrap0-dev,
  libwxgtk2.8-dev (>= 2.8.10), libvtk5-dev (>= 5.6.0), libinsighttoolkit3-dev (>= 3.20.0),
- libdcmtk2-dev (>= 3.6.0), liblog4cpp5-dev (>= 1.0-4), libcairo2-dev (>= 1.8.10), libgtk2.0-dev,
- libgdcm2-dev, libwrap0, libfftw3-dev
+ libdcmtk2-dev (>= 3.6.0), liblog4cpp5-dev (>= 1.0-4), libcairo2-dev (>= 1.8.10), 
+ libgdcm2-dev, libwrap0, libfftw3-dev, chrpath, libsqlite3-dev
 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/
@@ -16,8 +16,8 @@
 Package: ginkgocadx
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description:  Ginkgo CADx is a multi-platform Open Source Medical Imaging Software
- which provides a complete DICOM Viewer solution with advanced
+Description: Medical Imaging Software and complete DICOM Viewer
+ Ginkgo CADx provides a complete DICOM Viewer solution with advanced
  capabilities and extensions support.
  .
   * Easy and customizable interface through profiles.

Added: trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides	2011-05-27 10:18:23 UTC (rev 6858)
@@ -0,0 +1,5 @@
+# the software has been developed in Spain, and this error corresponds to
+# some spanish text within the code
+ginkgocadx: spelling-error-in-binary usr/lib/ginkgocadx/libCADxCore.so.2.4.1.1 Posible Possible
+ginkgocadx: spelling-error-in-binary usr/lib/ginkgocadx/libCADxCore.so.2.4.1.1 posible possible
+

Added: trunk/packages/ginkgocadx/trunk/debian/patches/gcc46.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/gcc46.patch	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/gcc46.patch	2011-05-27 10:18:23 UTC (rev 6858)
@@ -0,0 +1,12 @@
+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
+@@ -14,6 +14,7 @@
+ #include "ivista.h"
+ #include <map>
+ #include <list>
++#include <cstddef>
+ 
+ namespace GNC {
+ 	namespace GCS {

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series	2011-05-27 10:00:47 UTC (rev 6857)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series	2011-05-27 10:18:23 UTC (rev 6858)
@@ -1 +1,3 @@
+sqlite.patch
+gcc46.patch
 do_not_install_to_usr_share.patch

Added: trunk/packages/ginkgocadx/trunk/debian/patches/sqlite.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/sqlite.patch	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/sqlite.patch	2011-05-27 10:18:23 UTC (rev 6858)
@@ -0,0 +1,36 @@
+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 @@
+ 
+ AUX_SOURCE_DIRECTORY(resources SRCS)
+ 
+-AUX_SOURCE_DIRECTORY(sqlite SRCS)
+-
+ 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
+@@ -43,7 +43,8 @@
+ #define SQLITE_HAS_CODEC 0
+ #endif
+ 
+-#include "sqlite/sqlite3.h"
++//#include "sqlite/sqlite3.h"
++#include <sqlite3.h>
+ 
+ // Dynamic loading of the SQLite library
+ 

Modified: trunk/packages/ginkgocadx/trunk/debian/rules
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/rules	2011-05-27 10:00:47 UTC (rev 6857)
+++ trunk/packages/ginkgocadx/trunk/debian/rules	2011-05-27 10:18:23 UTC (rev 6858)
@@ -28,3 +28,14 @@
 	rm -rf $(UPSTREAM_SRC)/debian
 	GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 
+override_dh_auto_install:
+	dh_auto_install
+	dh_installchangelogs debian/changelog
+	find ./* -print|grep libvisualizator
+	# there are two path in rpath, one to libraries for the package and one
+	# for mpi, the later has to be removed
+	/usr/bin/chrpath debian/ginkgocadx/usr/lib/ginkgocadx/Plugins/libvisualizator.so.$(VER_FULL)
+	[ ! -f debian/ginkgocadx/usr/lib/ginkgocadx/Plugins/libvisualizator.so.$(VER_FULL) ] || /usr/bin/chrpath -d debian/ginkgocadx/usr/lib/ginkgocadx/Plugins/libvisualizator.so.$(VER_FULL)
+	/usr/bin/chrpath debian/ginkgocadx/usr/lib/ginkgocadx/Plugins/libvisualizator.so.$(VER_FULL)
+	[ ! -f debian/ginkgocadx/usr/lib/ginkgocadx/Plugins/libvisualizator.so.$(VER_FULL) ] ||  /usr/bin/chrpath -r /usr/lib/ginkgocadx debian/ginkgocadx/usr/lib/ginkgocadx/Plugins/libvisualizator.so.$(VER_FULL)
+	/usr/bin/chrpath debian/ginkgocadx/usr/lib/ginkgocadx/Plugins/libvisualizator.so.$(VER_FULL)

More information about the debian-med-commit mailing list