[med-svn] [camitk] 06/08: Update packaging and cleanup for new 4.0.0
Emmanuel Promayon
promayon-guest at moszumanska.debian.org
Tue Apr 26 20:15:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
promayon-guest pushed a commit to branch master
in repository camitk.
commit 2d496ef9e31ce74b5337357d7b36b2f4f0622fb1
Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
Date: Tue Apr 26 21:29:48 2016 +0200
Update packaging and cleanup for new 4.0.0
---
debian/changelog | 21 +++++++++++----------
debian/control | 15 +++++----------
debian/copyright | 4 ++--
debian/libcamitk3-data.lintian-overrides | 4 ----
debian/libcamitk3.lintian-overrides | 6 ------
debian/libcamitk4.lintian-overrides | 10 ++++++++++
debian/rules | 9 +++++++--
debian/tests/config | 20 +++++++++++++++++++-
debian/tests/control | 2 +-
9 files changed, 55 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4a85d81..069e9ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,17 @@
camitk (4.0.0~beta-1) UNRELEASED; urgency=low
[ Emmanuel Promayon ]
- * New major version upstream release (updating Build-Depends).
- * camitk 4 now depends on vtk6
- Closes: #798167
- * camitk 4 now depends on Qt5
- Closes: #816805
- * Fixed debian/rules to run test only for architecture any
- Closes: #817163
- * Fixed reproducibility: using SOURCE_DATE_EPOCH when available
- Closes: #794740
-
+ * New upstream beta release. Thanks to Gianfranco Costamagna
+ for the help.
+ * New upstream beta release now depends on Qt5
+ Closes: #816805
+ * New upstream beta check for SOURCE_DATE_EPOCH
+ Closes: #794740
+ * Run test only for architecture Any. Thanks to Andreas Tille
+ for the help. Closes: #817163
+ * Removed Nicolas Saubat from maintainer list. Many thanks
+ to Nicolas for his work on CamiTK during the last 4 years.
+
[ Andreas Tille ]
* Moved packaging from SVN to Git
diff --git a/debian/control b/debian/control
index c336c07..a61d120 100644
--- a/debian/control
+++ b/debian/control
@@ -7,25 +7,20 @@ Priority: optional
Build-Depends: debhelper (>= 9),
cmake,
libvtk6-dev,
- qtbase5-dev,
libvtk6-qt-dev,
- xsdcxx,
- libinsighttoolkit4-dev,
+ qtbase5-dev,
libqt5xmlpatterns5-dev,
- qttools5-dev,
+ libqt5opengl5-dev,
qttools5-dev-tools,
- libvtk6-dev,
- libhdf5-mpi-dev,
- libvtk6-qt-dev,
+ xsdcxx,
libinsighttoolkit4-dev,
libfftw3-dev,
libgdcm2-dev,
libvtkgdcm2-dev,
- libqt5opengl5-dev,
- libqt5xmlpatterns5-dev,
- qttools5-dev-tools,
xvfb,
xauth
+
+
Build-Depends-Indep: doxygen,
graphviz
Standards-Version: 3.9.8
diff --git a/debian/copyright b/debian/copyright
index b51c3da..3a58390 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,9 +16,9 @@ License: LGPL-3+
Files: sdk/libraries/qtpropertybrowser/*
Copyright: © 2010 Nokia Corporation and/or its subsidiary(-ies).
- © 2001-2013 Emmanuel Promayon <Emmanuel.Promayon at imag.fr> for adding support of QVector3
+ © 2001-2016 Emmanuel Promayon <Emmanuel.Promayon at imag.fr> for adding support of QVector3 and move to Qt5
License: BSD-3-clause
-Comment: see original sources at http://qt.gitorious.org/qt-solutions/qt-solutions/trees/master/qtpropertybrowser
+Comment: see original sources at http://github.com/qtproject/qt-solutions/tree/master/qtpropertybrowser
Files: modeling/libraries/mml/monitoring/Xmlhighlighter.*
Copyright: © Copyright 2009-10 Martin Holmes, Meagan Timney and the University of Victoria Humanities Computing and Media Centre.
diff --git a/debian/libcamitk3-data.lintian-overrides b/debian/libcamitk3-data.lintian-overrides
deleted file mode 100644
index 47fc43c..0000000
--- a/debian/libcamitk3-data.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# In this test data files, I think the best is to leave the LICENSE file
-# in order to not add a violation of the CC-BY-SA-3.0 licence
-# see also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740118
-libcamitk3-data: extra-license-file usr/share/camitk-3.4/testdata/LICENSE
diff --git a/debian/libcamitk3.lintian-overrides b/debian/libcamitk3.lintian-overrides
deleted file mode 100644
index e6e2b5d..0000000
--- a/debian/libcamitk3.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# W overrides for package-name-doesnt-match-sonames
-# The produced lib given by
-# objdump -p camitk-build/lib/libcamitkcore.so.3.4.0 | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/'
-# is "libcamitkcore3"
-# but the package is called libcamitk3 (which is more than just the corelib)
-libcamitk3: package-name-doesnt-match-sonames libcamitkcore3
diff --git a/debian/libcamitk4.lintian-overrides b/debian/libcamitk4.lintian-overrides
new file mode 100644
index 0000000..1844772
--- /dev/null
+++ b/debian/libcamitk4.lintian-overrides
@@ -0,0 +1,10 @@
+# W overrides for package-name-doesnt-match-sonames
+# The produced lib given by
+# objdump -p camitk-build/lib/libcamitkcore.so.4.0.0 | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/'
+# is "libcamitkcore4"
+# but the package is called libcamitk4 (as it is more than just the corelib)
+# It is the same for libmonitoring4
+# objdump -p camitk-build/lib/libmonitoring.so.4.0.0 | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/'
+# is "libmonitoring4"
+# but it is in the package libcamitk4
+libcamitk4: package-name-doesnt-match-sonames libcamitkcore4 libmonitoring4
diff --git a/debian/rules b/debian/rules
index 9902bf9..594ee47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,15 +109,20 @@ override_dh_install:
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/libraries/cepgenerator
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}/libraries/pml
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/libraries/pmlschema
- dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/libraries/lml
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/libraries/pml
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/libraries/lmlschema
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/libraries/lml
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/libraries/mmlschema
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/libraries/monitoring
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/camitk-${VER_SHORT}/libraries/monitoringgui
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/cmake/*.cmake
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/cmake/macros/*.cmake
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/cmake/macros/camitk/*.cmake
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/cmake/macros/camitk/packaging/*.cmake
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/cmake/macros/camitk/cdash/projects/*.cmake
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/cmake/macros/camitk/test/*.cmake
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/cmake/macros/camitk/test/level/*.cmake
# wizard
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/bin/camitk-wizard
dh_installman -p$(pkg_dev) debian/tmp/usr/share/man/man1/camitk-wizard.1
diff --git a/debian/tests/config b/debian/tests/config
index 3af8e1d..e8698e8 100644
--- a/debian/tests/config
+++ b/debian/tests/config
@@ -20,6 +20,22 @@ cleanExit () {
# depending on the CamiTK version, the output is different
expectedConfigOutput () {
+ if [ "$1" = "4.0.0" ]; then
+ cat <<EOF > $EXPECTED_CONFIG_OUTPUT
+CamiTK 4.0.0
+- CamiTK version......................... CamiTK 4.0.0
+- CamiTK Short Version................... camitk-4.0
+- CamiTK SO NAME......................... 4
+- CamiTK Global Installation Directory... /usr
+- Component Extension Directories........ /usr/lib/camitk-4.0/components
+- Action Extension Directories........... /usr/lib/camitk-4.0/actions
+- Number of Component Extensions......... 11 (locations: 11 global, 0 local, 0 in working directory, 0 by user)
+- Number of File Extensions Supported.... 35
+- Number of Action Extensions............ 19 (locations: 19 global, 0 local, 0 in working directory, 0 by user)
+- Number of Actions...................... 91
+EOF
+ fi
+
if [ "$1" = "3.4.0" ]; then
cat <<EOF > $EXPECTED_CONFIG_OUTPUT
CamiTK 3.4.0
@@ -76,7 +92,9 @@ echo "Detected CamiTK version is $CAMITK_VERSION"
expectedConfigOutput $CAMITK_VERSION
# run the config diagnosis (skipping the user/path dependent part using sed)
-if [ "$CAMITK_VERSION" = "3.4.0" ]; then
+if [ "$CAMITK_VERSION" = "4.0.0" ]; then
+ xvfb-run --auto-servernum --server-num=1 camitk-config --config | sed -n "1,4p; 9,9p; 13,18p" > $CONFIG_OUTPUT
+elif [ "$CAMITK_VERSION" = "3.4.0" ]; then
xvfb-run --auto-servernum --server-num=1 camitk-config --config | sed -n "1,5p; 9,14p" > $CONFIG_OUTPUT
elif [ "$CAMITK_VERSION" = "3.3.2" ] || [ "$CAMITK_VERSION" = "3.2.2" ]; then
# previous version had less information to compare to
diff --git a/debian/tests/control b/debian/tests/control
index 8d9a820..550f505 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
Tests: config
-Depends: libcamitk3 (>=3.2.2), xvfb, xauth
+Depends: libcamitk4 (>=4.0.0), xvfb, xauth
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/camitk.git
More information about the debian-med-commit
mailing list