[med-svn] r13009 - in trunk/packages/camitk/trunk/debian: . patches
Emmanuel Promayon
promayon-guest at alioth.debian.org
Thu Feb 14 20:33:15 UTC 2013
Author: promayon-guest
Date: 2013-02-14 20:33:14 +0000 (Thu, 14 Feb 2013)
New Revision: 13009
Removed:
trunk/packages/camitk/trunk/debian/patches/sonamefix.patch
Modified:
trunk/packages/camitk/trunk/debian/changelog
trunk/packages/camitk/trunk/debian/control
trunk/packages/camitk/trunk/debian/copyright
trunk/packages/camitk/trunk/debian/libcamitk3.lintian-overrides
trunk/packages/camitk/trunk/debian/patches/series
trunk/packages/camitk/trunk/debian/rules
trunk/packages/camitk/trunk/debian/watch
Log:
NEW upstream + trying to close the BTS bugs
Modified: trunk/packages/camitk/trunk/debian/changelog
===================================================================
--- trunk/packages/camitk/trunk/debian/changelog 2013-02-14 14:06:59 UTC (rev 13008)
+++ trunk/packages/camitk/trunk/debian/changelog 2013-02-14 20:33:14 UTC (rev 13009)
@@ -1,3 +1,13 @@
+camitk (3.0.7-1) unstable; urgency=low
+
+ * New upstream release. Fix extension inner dependencies.
+ Remove patch applied upstream:
+ - sonamefix.patch
+ * Separate package libqtpropertybrowser3
+ * Updated debian/watch submitted by Bart Martens
+
+ -- Emmanuel Promayon <Emmanuel.Promayon at imag.fr> Thu, 14 Feb 2013 19:09:38 +0100
+
camitk (3.0.3-1) unstable; urgency=low
[ Emmanuel Promayon ]
Modified: trunk/packages/camitk/trunk/debian/control
===================================================================
--- trunk/packages/camitk/trunk/debian/control 2013-02-14 14:06:59 UTC (rev 13008)
+++ trunk/packages/camitk/trunk/debian/control 2013-02-14 20:33:14 UTC (rev 13009)
@@ -13,7 +13,7 @@
Package: libcamitk3
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libqtpropertybrowser3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Computer Assisted Medical Intervention Tool Kit - runtime
Helps researchers and clinicians to easily and rapidly collaborate in
order to prototype CAMI applications, that feature medical images,
@@ -64,3 +64,24 @@
surgical navigation and biomechanical simulations.
.
imp is the CamiTK flagship application.
+
+Package: libqtpropertybrowser3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt Property Browser Library - runtime
+ A framework providing a set of graphical editors for
+ Qt properties similar to the one used in Qt Designer.
+ .
+ This package contains the shared libraries needed to run applications
+ linked against libqtpropertybrowser3.
+
+Package: libqtpropertybrowser3-dev
+Architecture: any
+Section: libdevel
+Depends: libqtpropertybrowser3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Qt Property Browser Library - development
+ A framework providing a set of graphical editors for
+ Qt properties similar to the one used in Qt Designer.
+ .
+ This package contains development files needed to build applications
+ using Qt Property Browser
Modified: trunk/packages/camitk/trunk/debian/copyright
===================================================================
--- trunk/packages/camitk/trunk/debian/copyright 2013-02-14 14:06:59 UTC (rev 13008)
+++ trunk/packages/camitk/trunk/debian/copyright 2013-02-14 20:33:14 UTC (rev 13009)
@@ -31,6 +31,11 @@
see `/usr/share/common-licenses/LGPL-2.1'
Comment: This file is part of the projXMLEditor project which in turn belongs to the Image Markup Tool version 2.0
+Files: tools/qcustomplot
+Copyright: © 2012 Emanuel Eichhammer
+License: GPL-3+
+Comment: Website/Contact http://www.WorksLikeClockwork.com/
+
License: BSD
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -104,3 +109,18 @@
in the file ‘/usr/share/common-licenses/LGPL-3’, and the GNU GPL license
version 3 is included in the file ‘/usr/share/common-licenses/GPL-3’.
+License: GPL-3+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3'.
Modified: trunk/packages/camitk/trunk/debian/libcamitk3.lintian-overrides
===================================================================
--- trunk/packages/camitk/trunk/debian/libcamitk3.lintian-overrides 2013-02-14 14:06:59 UTC (rev 13008)
+++ trunk/packages/camitk/trunk/debian/libcamitk3.lintian-overrides 2013-02-14 20:33:14 UTC (rev 13009)
@@ -1,3 +1,3 @@
# libcamitk3 distributes two sharedlibs
-# W: libcamitk3: package-name-doesnt-match-sonames libcamitkcore3.0 libqtpropertybrowser3.0
+# W: libcamitk3: package-name-doesnt-match-sonames libcamitkcore3 libmonitoring3
libcamitk3 binary: package-name-doesnt-match-sonames
Modified: trunk/packages/camitk/trunk/debian/patches/series
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/series 2013-02-14 14:06:59 UTC (rev 13008)
+++ trunk/packages/camitk/trunk/debian/patches/series 2013-02-14 20:33:14 UTC (rev 13009)
@@ -1 +0,0 @@
-sonamefix.patch
Deleted: trunk/packages/camitk/trunk/debian/patches/sonamefix.patch
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/sonamefix.patch 2013-02-14 14:06:59 UTC (rev 13008)
+++ trunk/packages/camitk/trunk/debian/patches/sonamefix.patch 2013-02-14 20:33:14 UTC (rev 13009)
@@ -1,67 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- camitk (3.0.3-1) unstable; urgency=low
- .
- [ Emmanuel Promayon ]
- * New upstream.
- - Remove non-free tetgen from source. Closes: #689951
- - Adding -fPIC to fix FTBFS on armhf and mipsel. Closes: #690830
- * Fix typo in d/control. Closes: #689021
- .
- [ Mathieu Malaterre ]
- * Remove DMUA (deprecated)
- * Bump Std-Vers to 3.9.4, no changes needed
- * Remove myself from Uploaders
-Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
-Bug-Debian: http://bugs.debian.org/689021
-Bug-Debian: http://bugs.debian.org/689951
-Bug-Debian: http://bugs.debian.org/690830
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- camitk-3.0.3.orig/cmake/modules/CamiTKMacros.cmake
-+++ camitk-3.0.3/cmake/modules/CamiTKMacros.cmake
-@@ -483,7 +483,7 @@ macro(camitk_extension)
- endif()
-
- # target properties (outputname and remove soname)
-- set_property(TARGET ${${TYPE_EXTENSION}_TARGET_NAME} PROPERTY NO_SONAME 1)
-+ set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} PROPERTY NO_SONAME 1)
- set_target_properties(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- PROPERTIES OUTPUT_NAME ${EXTENSION_NAME}
- )
---- camitk-3.0.3.orig/components/vtkmesh/CMakeLists.txt
-+++ camitk-3.0.3/components/vtkmesh/CMakeLists.txt
-@@ -1,4 +1,4 @@
--# vtkmes component does not require any specific things
-+# vtkmesh component does not require any specific things
- # to be compiled/generated by default
- # there are some header installation needed
- camitk_extension(
---- camitk-3.0.3.orig/components/physicalmodel/PMComponentExtension.cpp
-+++ camitk-3.0.3/components/physicalmodel/PMComponentExtension.cpp
-@@ -36,7 +36,7 @@ QString PMComponentExtension::getName()
-
- // --------------- getDescription -------------------
- QString PMComponentExtension::getDescription() const {
-- return "Manage Physical Model <em>.pml</em> files in <b>CamiTK</b>.<br/>CamiTK was initially mainly developped to support this format. Lots of things are possible with a physical model!";
-+ return "Manage Physical Model <em>.pml</em> files in <b>CamiTK</b>.<br/>CamiTK was initially mainly developed to support this format. Lots of things are possible with a physical model!";
- }
-
- // --------------- getFileExtensions -------------------
Modified: trunk/packages/camitk/trunk/debian/rules
===================================================================
--- trunk/packages/camitk/trunk/debian/rules 2013-02-14 14:06:59 UTC (rev 13008)
+++ trunk/packages/camitk/trunk/debian/rules 2013-02-14 20:33:14 UTC (rev 13009)
@@ -4,13 +4,28 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-# warning: couldn't find library libphysicalmodel.so
-#LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(CURDIR)/debian/libcamitk3/usr/lib/camitk-3.0/components/
-# warning: couldn't find library libmultipicking.so
-#LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(CURDIR)/debian/libcamitk3/usr/lib/camitk-3.0/actions/
+VER_MAJOR=3
+VER_MINOR=0
+VER_SHORT=$(VER_MAJOR).$(VER_MINOR)
+pkg_lib = libcamitk$(VER_MAJOR)
+pkg_qpb = libqtpropertybrowser$(VER_MAJOR)
+pkg_dev = libcamitk$(VER_MAJOR)-dev
+pkg_qpb_dev = libqtpropertybrowser$(VER_MAJOR)-dev
+pkg_data = libcamitk$(VER_MAJOR)-data
+pkg_doc = libcamitk$(VER_MAJOR)-doc
+pkg_imp = camitk-imp
+
+# dpkg-shlibdeps needs to know about camitk extension directories to manage inner-dependencies
+# between extensions (i.e., mml component extension depends on physicalmodel component extensions)
+# for component extensions:
+LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(CURDIR)/debian/${pkg_lib}/usr/lib/camitk-${VER_SHORT}/components/
+# for action extensions:
+LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(CURDIR)/debian/${pkg_lib}/usr/lib/camitk-${VER_SHORT}/actions/
+
CMAKE_EXTRA_FLAGS = \
- -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_SKIP_RPATH:BOOL=ON \
+ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-DCAMITK_INSTALL_ROOT:PATH=/usr \
-DTOOL_CORESCHEMA:BOOL=ON \
@@ -35,16 +50,6 @@
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
-VER_MAJOR=3
-VER_MINOR=0
-VER_SHORT=$(VER_MAJOR).$(VER_MINOR)
-
-pkg_lib = libcamitk$(VER_MAJOR)
-pkg_dev = libcamitk$(VER_MAJOR)-dev
-pkg_data = libcamitk$(VER_MAJOR)-data
-pkg_doc = libcamitk$(VER_MAJOR)-doc
-pkg_imp = camitk-imp
-
# let's be smart with doc
override_dh_auto_build-indep:
$(MAKE) -C obj-* apidoc
@@ -56,18 +61,37 @@
override_dh_install:
# camitk dynamic library
- dh_install -p$(pkg_lib) debian/tmp/usr/lib/lib*.so.* usr/lib
- dh_install -p$(pkg_lib) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/actions/lib*.so
- dh_install -p$(pkg_lib) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/components/lib*.so
+ dh_install -p$(pkg_lib) debian/tmp/usr/lib/libcamitkcore.so.* usr/lib
+ dh_install -p$(pkg_lib) debian/tmp/usr/lib/libmonitoring.so.* usr/lib
+ dh_install -p$(pkg_lib) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/actions/lib*.so.*
+ dh_install -p$(pkg_lib) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/components/lib*.so.*
- # camitk headers and static libs + wizard
- dh_install -p$(pkg_dev) debian/tmp/usr/lib/lib*.so usr/lib
+ # separate tools qtpropertybrowser
+ dh_install -p$(pkg_qpb) debian/tmp/usr/lib/libqtpropertybrowser.so.* usr/lib
+
+ # camitk so and headers and static libs + wizard
+ dh_install -p$(pkg_dev) debian/tmp/usr/lib/libcamitkcore.so usr/lib
+ dh_install -p$(pkg_dev) debian/tmp/usr/lib/libmonitoring.so usr/lib
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/actions/lib*.so
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/components/lib*.so
dh_install -p$(pkg_dev) debian/tmp/usr/bin/camitk-wizard
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/lib*.a
- dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/camitkcore
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/coreschema
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/actions
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/components
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/pml
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/lml
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/mml
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/monitoring
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/monitoringgui
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/cmake/*.cmake
dh_installman -p$(pkg_dev) $(CURDIR)/applications/wizard/camitk-wizard.1
+ # qtpropertybrowser so and headers
+ dh_install -p$(pkg_qpb_dev) debian/tmp/usr/lib/libqtpropertybrowser.so usr/lib
+ dh_install -p$(pkg_qpb_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/qtpropertybrowser
+
# api doc
dh_install -p$(pkg_doc) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/apidoc
Modified: trunk/packages/camitk/trunk/debian/watch
===================================================================
--- trunk/packages/camitk/trunk/debian/watch 2013-02-14 14:06:59 UTC (rev 13008)
+++ trunk/packages/camitk/trunk/debian/watch 2013-02-14 20:33:14 UTC (rev 13009)
@@ -1,3 +1,3 @@
version=3
-http://camitk.imag.fr/download_source.xml \
- https://forge.imag.fr/frs/download.php/[\d]+/camitk-([\d.]+)-Source\.tar\.gz
+http://camitk.imag.fr/download_source.xml .*/camitk-(\d.*?)(?:-Source)?\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+# Bart Martens <bartm at debian.org> Sat, 12 Jan 2013 18:53:23 +0000
More information about the debian-med-commit
mailing list