[med-svn] r18437 - in trunk/packages/camitk/trunk/debian: . tests
Emmanuel Promayon
promayon-guest at moszumanska.debian.org
Tue Oct 28 20:47:13 UTC 2014
Author: promayon-guest
Date: 2014-10-28 20:47:12 +0000 (Tue, 28 Oct 2014)
New Revision: 18437
Removed:
trunk/packages/camitk/trunk/debian/libcamitk3-dev.lintian-overrides
Modified:
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/rules
trunk/packages/camitk/trunk/debian/tests/config
Log:
fixed lintian warnings and ci autopkgtest
Modified: trunk/packages/camitk/trunk/debian/control
===================================================================
--- trunk/packages/camitk/trunk/debian/control 2014-10-28 16:43:20 UTC (rev 18436)
+++ trunk/packages/camitk/trunk/debian/control 2014-10-28 20:47:12 UTC (rev 18437)
@@ -23,7 +23,7 @@
xauth
Build-Depends-Indep: doxygen,
graphviz
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/camitk/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/camitk/trunk/
Homepage: http://camitk.imag.fr/
Modified: trunk/packages/camitk/trunk/debian/copyright
===================================================================
--- trunk/packages/camitk/trunk/debian/copyright 2014-10-28 16:43:20 UTC (rev 18436)
+++ trunk/packages/camitk/trunk/debian/copyright 2014-10-28 20:47:12 UTC (rev 18437)
@@ -20,7 +20,7 @@
License: BSD-3-clause
Comment: see original sources at http://qt.gitorious.org/qt-solutions/qt-solutions/trees/master/qtpropertybrowser
-Files: modeling/libraries/mml/monitoring/tools/Xmlhighlighter.*
+Files: modeling/libraries/mml/monitoring/Xmlhighlighter.*
Copyright: © Copyright 2009-10 Martin Holmes, Meagan Timney and the University of Victoria Humanities Computing and Media Centre.
License: LGPL-2.1
see `/usr/share/common-licenses/LGPL-2.1'
Deleted: trunk/packages/camitk/trunk/debian/libcamitk3-dev.lintian-overrides
===================================================================
--- trunk/packages/camitk/trunk/debian/libcamitk3-dev.lintian-overrides 2014-10-28 16:43:20 UTC (rev 18436)
+++ trunk/packages/camitk/trunk/debian/libcamitk3-dev.lintian-overrides 2014-10-28 20:47:12 UTC (rev 18437)
@@ -1,9 +0,0 @@
-# W overrides for hardening-no-fortify-functions because of false positives [1]
-# To verify this is only false positives, I used hardening-check --verbose on the
-# incriminated binary (camitk-wizard) and it reported only unprotected on
-# memmove and memcpy
-# [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673112
-libcamitk3-dev: hardening-no-fortify-functions usr/bin/camitk-wizard
-# same for camitk-cepgenerator, hardening-check --verbose reports
-# only unprotected on memmove and memcpy
-libcamitk3-dev: hardening-no-fortify-functions usr/bin/camitk-cepgenerator
Modified: trunk/packages/camitk/trunk/debian/libcamitk3.lintian-overrides
===================================================================
--- trunk/packages/camitk/trunk/debian/libcamitk3.lintian-overrides 2014-10-28 16:43:20 UTC (rev 18436)
+++ trunk/packages/camitk/trunk/debian/libcamitk3.lintian-overrides 2014-10-28 20:47:12 UTC (rev 18437)
@@ -1,20 +1,6 @@
# W overrides for package-name-doesnt-match-sonames
# The produced lib given by
-# objdump -p camitk-build/lib/libcamitkcore.so.3.3.1 | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/'
+# 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
-# W overrides for hardening-no-fortify-functions because of false positives [1]
-# To verify this is only false positives, I used hardening-check --verbose on all the
-# on all reported binaries. They are all about: memmove and memcpy (apart from libitkfilters.so
-# which adds a memset as well)
-# [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673112
-libcamitk3: hardening-no-fortify-functions usr/lib/camitk-3.3/actions/libbasicmesh.so.3.3.0
-libcamitk3: hardening-no-fortify-functions usr/lib/camitk-3.3/actions/libitkfilters.so.3.3.0
-libcamitk3: hardening-no-fortify-functions usr/lib/camitk-3.3/actions/libitksegmentation.so.3.3.0
-libcamitk3: hardening-no-fortify-functions usr/lib/camitk-3.3/actions/libmeshprocessing.so.3.3.0
-libcamitk3: hardening-no-fortify-functions usr/lib/camitk-3.3/actions/libmml.so.3.3.0
-libcamitk3: hardening-no-fortify-functions usr/lib/camitk-3.3/components/libitkimage.so.3.3.0
-libcamitk3: hardening-no-fortify-functions usr/lib/camitk-3.3/components/libmml.so.3.3.0
-libcamitk3: hardening-no-fortify-functions usr/lib/camitk-3.3/components/libphysicalmodel.so.3.3.0
-libcamitk3: hardening-no-fortify-functions usr/lib/camitk-3.3/libmonitoring.so.3.3.0
Modified: trunk/packages/camitk/trunk/debian/rules
===================================================================
--- trunk/packages/camitk/trunk/debian/rules 2014-10-28 16:43:20 UTC (rev 18436)
+++ trunk/packages/camitk/trunk/debian/rules 2014-10-28 20:47:12 UTC (rev 18437)
@@ -40,6 +40,7 @@
# CMake flags are of two types:
# - generic (to tell cmake to build proper binaries)
# - CamiTK specific options
+# Notes:
# - if you would like a more verbose camitk at run-time, you can add -DCAMITK_LOG_LEVEL=2
# - translation is not ready yet, so disable for now
CMAKE_EXTRA_FLAGS = \
Modified: trunk/packages/camitk/trunk/debian/tests/config
===================================================================
--- trunk/packages/camitk/trunk/debian/tests/config 2014-10-28 16:43:20 UTC (rev 18436)
+++ trunk/packages/camitk/trunk/debian/tests/config 2014-10-28 20:47:12 UTC (rev 18437)
@@ -21,7 +21,7 @@
expectedConfigOutput () {
if [ "$1" = "3.4.0" ]; then
- cat <<EOF > $EXPECTED_CONFIG_OUTPUT
+ cat <<EOF > $EXPECTED_CONFIG_OUTPUT
CamiTK 3.4.0
- CamiTK version......................... CamiTK 3.4.0
- CamiTK Short Version................... camitk-3.4
@@ -29,13 +29,15 @@
- CamiTK Global Installation Directory... /usr
- Component Extension Directories........ /usr/lib/camitk-3.4/components
- Action Extension Directories........... /usr/lib/camitk-3.4/actions
-- Number of Component Extensions......... 11
-- Number of Action Extensions............ 81
+- 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............ 18 (locations: 18 global, 0 local, 0 in working directory, 0 by user)
+- Number of Actions...................... 81
EOF
- fi
+ fi
if [ "$1" = "3.3.2" ]; then
- cat <<EOF > $EXPECTED_CONFIG_OUTPUT
+ cat <<EOF > $EXPECTED_CONFIG_OUTPUT
CamiTK 3.3.2
- CamiTK version......................... CamiTK 3.3.2
- CamiTK Short Version................... camitk-3.3
@@ -46,10 +48,10 @@
- Number of Component Extensions......... 12
- Number of Action Extensions............ 71
EOF
- fi
+ fi
- if [ "$1" = "3.2.2" ]; then
- cat <<EOF > $EXPECTED_CONFIG_OUTPUT
+ if [ "$1" = "3.2.2" ]; then
+ cat <<EOF > $EXPECTED_CONFIG_OUTPUT
- CamiTK version......................... CamiTK 3.2.2
- CamiTK Short Version................... camitk-3.2
- CamiTK SO NAME......................... 3
@@ -60,7 +62,7 @@
- Number of Action Extensions............ 65
- Registered components (G=Global, L=Local, W=Working, U=User):
EOF
- fi
+ fi
}
# if a problem occurs, call the clean method
@@ -74,8 +76,14 @@
expectedConfigOutput $CAMITK_VERSION
# run the config diagnosis (skipping the user/path dependent part using sed)
-# TODO: update the camitk-config code so that extensions are always listed in the same order
-xvfb-run --auto-servernum --server-num=1 camitk-config --config | sed -n "1,5p; 9,12p" > $CONFIG_OUTPUT
+if [ "$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
+ xvfb-run --auto-servernum --server-num=1 camitk-config --config | sed -n "1,5p; 9,12p" > $CONFIG_OUTPUT
+else
+ echo "Can not retrieve any information: unknown CamiTK version (detected version: $CAMITK_VERSION)" > $CONFIG_OUTPUT
+fi
# compare output to expected output
echo "Checking configuration..."
More information about the debian-med-commit
mailing list