Author: tille
Date: 2011-07-12 13:43:41 +0000 (Tue, 12 Jul 2011)
New Revision: 7260
Added:
trunk/packages/ginkgocadx/trunk/debian/patches/drop_rpath.patch
Removed:
trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.1
Modified:
trunk/packages/ginkgocadx/trunk/debian/changelog
trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
trunk/packages/ginkgocadx/trunk/debian/manpages
trunk/packages/ginkgocadx/trunk/debian/patches/series
trunk/packages/ginkgocadx/trunk/debian/rules
trunk/packages/ginkgocadx/trunk/debian/watch
Log:
Try to cope with explicite rpath definitions which succeeded except of two
remaining ones; other packaging updates
Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog 2011-07-12 11:48:13 UTC
(rev 7259)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog 2011-07-12 13:43:41 UTC
(rev 7260)
@@ -3,14 +3,23 @@
* New upstream version (most patches applied
Closes: #630877
* updated patches to new version:
- - one remaining non-FHS issue which breaks build
+ - remaining_path_issue.patch: one remaining non-FHS issue which
+ breaks build
+ - drop_rpath.patch: drop explicite rpath defitions
* debian/{mime,sharedmimeinfo}: Mime info for DICOM images
Closes: #631205
- * Added manpage + desktop file (thanks to Karsten Hilbert
+ * Added desktop file (thanks to Karsten Hilbert
<[email protected]>)
+ * Add upstream manpage
* Fixed Vcs fields
- * debian/rules: Add ne extension liblightvisualizator
+ * debian/rules:
+ - Add new extension liblightvisualizator
+ - remove get-orig-source target which becames void because
+ upstream dropped the debian/ dir
+ - strip rpath
* debian/install: move conformance.xml into place
+ * debian/watch: drop useless comments
+ * debian/ginkgocadx.lintian-overrides: Drop unneeded overrides
-- Andreas Tille <[email protected]> Tue, 12 Jul 2011 08:19:11 +0200
Deleted: trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.1
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.1 2011-07-12 11:48:13 UTC
(rev 7259)
+++ trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.1 2011-07-12 13:43:41 UTC
(rev 7260)
@@ -1,51 +0,0 @@
-.\" ========================================================
-.\" license: GPL v2 or later
-.\" ========================================================
-
-.TH Ginkgo\ CADx 1 "2011 June 22nd" "Manual for Ginkgo CADx"
-
-.SH NAME
-Ginkgo CADx \- a medical image (DICOM) viewer
-
-.SH SYNOPSIS
-.B ginkgocadx
-[
-.RB --version
-|
-.RB -version
-|
-.RB -v
-]
-[
-.I <DICOM file>
-|
-.I <XML integration file>
-]
-
-
-.SH DESCRIPTION
-.B Ginkgo CADx
-is a solution for working with medical images in the DICOM
-format.
-
-.SH OPTIONS
-.PP
-.TP
-.B \--version, \--version, -v
-Show version information about Ginkgo CADx.
-.TP
-.B <DICOM file>
-A DICOM file to load on startup.
-.TP
-.B <XML integration file>
-An XML integration file to load on startup.
-
-
-.SH SEE ALSO
-.PP
-.TP
-.B http://ginkgo-cadx.com
-Homepage
-.TP
-.B /usr/share/doc/ginkgocadx/
-Local documentation
Modified: trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
2011-07-12 11:48:13 UTC (rev 7259)
+++ trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
2011-07-12 13:43:41 UTC (rev 7260)
@@ -1,7 +1,3 @@
-# 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
# using dh causes useless ldconfig calls to be added to post{inst,rm}
ginkgocadx: postinst-has-useless-call-to-ldconfig
ginkgocadx: postrm-has-useless-call-to-ldconfig
Modified: trunk/packages/ginkgocadx/trunk/debian/manpages
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/manpages 2011-07-12 11:48:13 UTC
(rev 7259)
+++ trunk/packages/ginkgocadx/trunk/debian/manpages 2011-07-12 13:43:41 UTC
(rev 7260)
@@ -1 +1 @@
-debian/*.1
+man/*.1
Added: trunk/packages/ginkgocadx/trunk/debian/patches/drop_rpath.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/drop_rpath.patch
(rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/drop_rpath.patch
2011-07-12 13:43:41 UTC (rev 7260)
@@ -0,0 +1,56 @@
+--- ginkgocadx-2.5.0.1.orig/src/lightvisualizator/CMakeLists.txt
++++ ginkgocadx-2.5.0.1/src/lightvisualizator/CMakeLists.txt
+@@ -81,7 +81,7 @@
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
+ VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
+ LINK_INTERFACE_LIBRARIES ""
+- INSTALL_RPATH_USE_LINK_PATH TRUE )
++ INSTALL_RPATH_USE_LINK_PATH FALSE )
+ INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
+
+ ################ LIBS ################
+--- ginkgocadx-2.5.0.1.orig/src/fooextension/CMakeLists.txt
++++ ginkgocadx-2.5.0.1/src/fooextension/CMakeLists.txt
+@@ -86,7 +86,7 @@
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
+ VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
+ LINK_INTERFACE_LIBRARIES ""
+- INSTALL_RPATH_USE_LINK_PATH TRUE )
++ INSTALL_RPATH_USE_LINK_PATH FALSE )
+ INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
+
+ ################ LIBS ################
+--- ginkgocadx-2.5.0.1.orig/src/cadxcore/CMakeLists.txt
++++ ginkgocadx-2.5.0.1/src/cadxcore/CMakeLists.txt
+@@ -202,7 +202,7 @@
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
+ VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
+ LINK_INTERFACE_LIBRARIES ""
+- INSTALL_RPATH_USE_LINK_PATH TRUE )
++ INSTALL_RPATH_USE_LINK_PATH FALSE )
+ INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo
DESTINATION share/ginkgocadx/lang/es)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/ginkgocadxcore.mo
DESTINATION share/ginkgocadx/lang/ja)
+--- ginkgocadx-2.5.0.1.orig/src/ginkgocadx/CMakeLists.txt
++++ ginkgocadx-2.5.0.1/src/ginkgocadx/CMakeLists.txt
+@@ -87,8 +87,7 @@
+ IF(LINUX)
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
+ LINK_INTERFACE_LIBRARIES ""
+- CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
+-
++ )
+ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
+ ENDIF()
+
+--- ginkgocadx-2.5.0.1.orig/src/visualizator/CMakeLists.txt
++++ ginkgocadx-2.5.0.1/src/visualizator/CMakeLists.txt
+@@ -105,7 +105,7 @@
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
+ VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
+ LINK_INTERFACE_LIBRARIES ""
+- INSTALL_RPATH_USE_LINK_PATH TRUE )
++ INSTALL_RPATH_USE_LINK_PATH FALSE )
+ INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/visualizator.mo DESTINATION
share/ginkgocadx/lang/es)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/visualizator.mo DESTINATION
share/ginkgocadx/lang/ja)
Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series 2011-07-12
11:48:13 UTC (rev 7259)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series 2011-07-12
13:43:41 UTC (rev 7260)
@@ -1 +1,2 @@
remaining_path_issue.patch
+drop_rpath.patch
Modified: trunk/packages/ginkgocadx/trunk/debian/rules
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/rules 2011-07-12 11:48:13 UTC
(rev 7259)
+++ trunk/packages/ginkgocadx/trunk/debian/rules 2011-07-12 13:43:41 UTC
(rev 7260)
@@ -10,42 +10,10 @@
VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut
-f1 -d-)
-UPSTREAM_SRC = ginkgocadx-$(VER_FULL)
-DEBIAN_SRC_DIR = ginkgocadx-$(VER_FULL)
-DEBIAN_SRC_TAR = ginkgocadx_$(VER_FULL).orig.tar.gz
+pkg=ginkgocadx
-$(UPSTREAM_SRC).tgz:
- wget -c http://voxel.dl.sourceforge.net/sourceforge/ginkgocadx/$@
-
-get-orig-source: $(UPSTREAM_SRC).tgz
- tar xzf $(UPSTREAM_SRC).tgz
- # strip debian subdir
- 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
- # there are two path in rpath, one to libraries for the package and one
- # for mpi, the later has to be removed
- [ ! -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)
- [ ! -f debian/ginkgocadx/usr/lib/ginkgocadx/libCADxCore.so.$(VER_FULL)
] || /usr/bin/chrpath -r /usr/lib/ginkgocadx
debian/ginkgocadx/usr/lib/ginkgocadx/libCADxCore.so.$(VER_FULL)
- [ ! -f
debian/ginkgocadx/usr/lib/ginkgocadx/Plugins/liblightvisualizator.so.$(VER_FULL)
] || /usr/bin/chrpath -r /usr/lib/ginkgocadx
debian/ginkgocadx/usr/lib/ginkgocadx/Plugins/liblightvisualizator.so.$(VER_FULL)
-
-no_need_to_override_dh_auto_build:
- cd src; \
- mkdir build; \
- cd build; \
- cmake ../ -DCMAKE_BUILD_TYPE=Release \
- make
-
-# You might like to set CMAKE_BUILD_TYPE=Debug instead of Release
-
-# The following settings seem to be default in src/CMakeLists.txt
-# -DUSE_PATCHED_LIBS:BOOL=FALSE \
-# -DUSE_CUSTOM_WX:BOOL=FALSE \
-# -DUSE_CUSTOM_VTK:BOOL=FALSE \
-# -DUSE_CUSTOM_ITK:BOOL=FALSE \
-# -DUSE_CUSTOM_DCMTK=FALSE \
-# -DUSE_SYSTEM_SQLITE=TRUE \
-# -DCUSTOM_PACKAGE:BOOL=FALSE ; \
+ # Delete RPATH
+ find debian/$(pkg)/usr/lib/$(pkg) -type f -name "lib*.so.$(VER_FULL)"
-exec /usr/bin/chrpath -r /usr/lib/$(pkg) \{\} \;
Modified: trunk/packages/ginkgocadx/trunk/debian/watch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/watch 2011-07-12 11:48:13 UTC
(rev 7259)
+++ trunk/packages/ginkgocadx/trunk/debian/watch 2011-07-12 13:43:41 UTC
(rev 7260)
@@ -1,4 +1,2 @@
version=3
http://sf.net/ginkgocadx/ginkgocadx-(.*)\.tgz
-
-# http://sf.net/ginkgocadx/Ginkgo_CADx-(.*)_src\.tgz
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
