[med-svn] [mia] 04/04: import new upstream and remove old patches
Gert Wollny
gert-guest at moszumanska.debian.org
Thu Oct 29 13:54:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository mia.
commit 9118ad0dfa7a2d9aab54dcb16a774f05224f6adf
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Thu Oct 29 14:10:43 2015 +0100
import new upstream and remove old patches
---
debian/changelog | 9 +
debian/libmia-2.2-doc.lintian-overrides | 5 +
...disable-treeview-for-jquery-compatibility.patch | 27 ---
debian/patches/02_remove_double_instaciation.patch | 43 -----
debian/patches/03_correct_imagedraw_tests.patch | 201 ---------------------
debian/patches/series | 3 -
debian/rules | 2 -
doc/reference.dox.cmake | 2 +-
8 files changed, 15 insertions(+), 277 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 486fd55..49ea49f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mia (2.2.7-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+ * remove patches 02/03 because they are applied upstream
+ * remove patch 01 and use the doxygen embedded jquerywith treeview
+ Rationale: src::doxygen://debian/README.jquery
+
+ -- Gert Wollny <gw.fossdev at gmail.com> Thu, 29 Oct 2015 13:25:44 +0100
+
mia (2.2.6-1) unstable; urgency=medium
* New upstream version
diff --git a/debian/libmia-2.2-doc.lintian-overrides b/debian/libmia-2.2-doc.lintian-overrides
new file mode 100644
index 0000000..78a643f
--- /dev/null
+++ b/debian/libmia-2.2-doc.lintian-overrides
@@ -0,0 +1,5 @@
+# The embedded jquery.js is generated by Doxygen and can not be replaced
+# by the one provided by libjs-jquery.
+# For a rationale please see src::Doxygen/debian/README.jquery.
+
+libmia-2.2-doc binary: embedded-javascript-library
diff --git a/debian/patches/01_disable-treeview-for-jquery-compatibility.patch b/debian/patches/01_disable-treeview-for-jquery-compatibility.patch
deleted file mode 100644
index d5231ba..0000000
--- a/debian/patches/01_disable-treeview-for-jquery-compatibility.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Disable the Doxygen treeview
- Disable the treeview in the docygen generated documentation in order
- to avoid wrong behaviour when using the system libjs-jquery library.
- .
- mia (2.0.7-1) UNRELEASED; urgency=low
- .
- * Initial release. (Closes: #694437)
-Author: Gert Wollny <gw.fossdev at gmail.com>
-
----
-
-Origin: upstream
-Forwarded: not-needed
-Last-Update: 2012-12-11
-
---- mia-2.0.7.orig/doc/reference.dox.cmake
-+++ mia-2.0.7/doc/reference.dox.cmake
-@@ -85,7 +85,7 @@ BINARY_TOC = NO
- TOC_EXPAND = NO
- DISABLE_INDEX = NO
- ENUM_VALUES_PER_LINE = 4
--GENERATE_TREEVIEW = YES
-+GENERATE_TREEVIEW = NO
- TREEVIEW_WIDTH = 250
- GENERATE_LATEX = NO
- LATEX_OUTPUT =
-
diff --git a/debian/patches/02_remove_double_instaciation.patch b/debian/patches/02_remove_double_instaciation.patch
deleted file mode 100644
index 0fd98af..0000000
--- a/debian/patches/02_remove_double_instaciation.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: remove duplicate instanciation of 3DVector field templates
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Date: Mon Oct 26 11:25:26 2015 +0100
-Origin: Upstream
-Forwarded: no-needed
-
-
-diff --git a/mia/3d/datafield.cc b/mia/3d/datafield.cc
-index e92d95d..beef397 100644
---- a/mia/3d/datafield.cc
-+++ b/mia/3d/datafield.cc
-@@ -97,10 +97,6 @@ INSTANCIATE(unsigned char );
- INSTANCIATE(signed char);
- INSTANCIATE(bool);
-
--INSTANCIATE(C3DFVector)
--INSTANCIATE(C3DDVector)
--
--
- DEFINE_TYPE_DESCR2(C3DBounds, "3dbounds");
- DEFINE_TYPE_DESCR2(C3DFVector, "3dfvector");
-
-diff --git a/mia/3d/vectorfield.cc b/mia/3d/vectorfield.cc
-index f082531..269d3e0 100644
---- a/mia/3d/vectorfield.cc
-+++ b/mia/3d/vectorfield.cc
-@@ -56,13 +56,14 @@ EXPORT_3D C3DFVectorfield& operator += (C3DFVectorfield& a, const C3DFVectorfiel
- return a;
- }
-
--#define INSTANCIATE(TYPE) \
-- template class T3DDatafield<TYPE>; \
-+#define INSTANCIATE(TYPE) \
-+ template class T3DDatafield<TYPE>; \
- template class range3d_iterator<T3DDatafield<TYPE>::iterator>; \
- template class range3d_iterator<T3DDatafield<TYPE>::const_iterator>; \
- template class range3d_iterator_with_boundary_flag<T3DDatafield<TYPE>::iterator>; \
- template class range3d_iterator_with_boundary_flag<T3DDatafield<TYPE>::const_iterator>;
-
-+
- #define INSTANCIATE2D(TYPE) \
- template class EXPORT_3D T2DDatafield<TYPE>; \
- template class range2d_iterator<T2DDatafield<TYPE>::iterator>; \
diff --git a/debian/patches/03_correct_imagedraw_tests.patch b/debian/patches/03_correct_imagedraw_tests.patch
deleted file mode 100644
index ffa1a16..0000000
--- a/debian/patches/03_correct_imagedraw_tests.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-Description: correct tests for imagedraw
- Some of these tests fail on arm64 and ppc64el and the
- corrections should correct this.
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Date: Mon Oct 26 11:48:29 2015 +0100
-Origin: upstream
-Forwarded: not-needed
-
-diff --git a/mia/3d/test_imagedraw.cc b/mia/3d/test_imagedraw.cc
-index 982da53..253189f 100644
---- a/mia/3d/test_imagedraw.cc
-+++ b/mia/3d/test_imagedraw.cc
-@@ -317,18 +317,18 @@ BOOST_FIXTURE_TEST_CASE( test_draw_line_pivot_y_outside_ends_dx_is_zero, SimpleB
- }
-
-
--BOOST_FIXTURE_TEST_CASE( test_draw_line_pivot_y_outside_ends_dN_is_zero_and_N_outside, SimpleBitImageDrawFixture )
-+BOOST_FIXTURE_TEST_CASE( test_draw_line_dN_is_zero_and_N_outside, SimpleBitImageDrawFixture )
- {
- // x outside and parallel
- output.draw_line(C3DFVector(-1,-6, 5), C3DFVector(-1,14,9));
-- output.draw_line(C3DFVector(30,6, 5), C3DFVector(30,6,5));
-+ output.draw_line(C3DFVector(30,-3, 2), C3DFVector(30,6,5));
-
- // y outside and parallel
- output.draw_line(C3DFVector(1,-6, 5), C3DFVector(1,-6,9));
- output.draw_line(C3DFVector(1, 40, 5), C3DFVector(1,40,9));
-
- // z outside and parallel
-- output.draw_line(C3DFVector(1,6, -5), C3DFVector(1,6,-5));
-+ output.draw_line(C3DFVector(1,6, -5), C3DFVector(8,7,-5));
- output.draw_line(C3DFVector(1,6, 22), C3DFVector(1,14,22));
-
- auto& img = output.get_image();
-
-diff --git a/mia/3d/imagedraw.cc b/mia/3d/imagedraw.cc
-index de1e578..d662bc0 100644
---- a/mia/3d/imagedraw.cc
-+++ b/mia/3d/imagedraw.cc
-@@ -29,7 +29,7 @@ NS_MIA_BEGIN
- using std::max;
- using std::min;
- using std::swap;
--using std::fabs;
-+using std::fabs;
-
- C3DDrawBox::C3DDrawBox(const C3DBounds& size, const C3DFVector& origin, const C3DFVector& spacing):
- m_size(size),
-@@ -43,9 +43,9 @@ C3DDrawBox::C3DDrawBox(const C3DBounds& size, const C3DFVector& origin, const C3
- void C3DDrawBox::draw_point(const C3DFVector& p)
- {
-
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
-
- cvdebug() << "about to draw " << ip << " from " << p << "\n";
- if (ip < m_size)
-diff --git a/mia/3d/test_imagedraw.cc b/mia/3d/test_imagedraw.cc
-index e5d963a..982da53 100644
---- a/mia/3d/test_imagedraw.cc
-+++ b/mia/3d/test_imagedraw.cc
-@@ -59,8 +59,6 @@ BOOST_FIXTURE_TEST_CASE( test_simple_draw_point_outside, SimpleBitImageDrawFixtu
- output.draw_point(C3DFVector(1,11,6));
- output.draw_point(C3DFVector(1,5,12));
-
--
--
- auto& img = output.get_image();
-
-
-@@ -128,9 +126,9 @@ BOOST_FIXTURE_TEST_CASE( test_simple_draw_line_z_pivot, SimpleBitImageDrawFixtur
-
- C3DFVector p(0,0,0);
- for (int k = 0; k < 24; ++k, p += dir) {
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
- cvdebug() << "test about to draw " << ip << " from " << p << "\n";
- pixels.insert(ip);
- }
-@@ -161,9 +159,9 @@ BOOST_FIXTURE_TEST_CASE( test_simple_draw_line_pivot_x, SimpleBitImageDrawFixtur
-
- C3DFVector p(0.1,4.2,5.3);
- for (int k = 0; k < 22; ++k, p += dir) {
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
- cvdebug() << "test about to draw " << ip << " from " << p << "\n";
- pixels.insert(ip);
- }
-@@ -194,9 +192,9 @@ BOOST_FIXTURE_TEST_CASE( test_simple_draw_line_pivot_y, SimpleBitImageDrawFixtur
-
- C3DFVector p(4,0.1,5.2);
- for (int k = 0; k < 22; ++k, p += dir) {
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
- cvdebug() << "test about to draw " << ip << " from " << p << "\n";
- pixels.insert(ip);
- }
-@@ -226,13 +224,15 @@ BOOST_FIXTURE_TEST_CASE( test_draw_line_pivot_x_outside_ends, SimpleBitImageDraw
- C3DFVector dir(0.5, 0.3, 0.1f);
-
- C3DFVector p(-4,2,5);
-- for (int k = 0; k < 42; ++k, p += dir) {
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-- cvdebug() << "test about to draw " << ip << " from " << p << "\n";
-- if (ip.x < img.get_size().x)
-- pixels.insert(ip);
-+ for (int k = 0; k < 40; ++k, p += dir) {
-+ if (p.x >= 0 || p.x < img.get_size().x) {
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
-+ cvdebug() << "test about to draw " << ip << " from " << p << "\n";
-+ if (ip.x < img.get_size().x)
-+ pixels.insert(ip);
-+ }
- }
-
- cvdebug() << "Expect " << pixels.size() << " pixels to be set\n";
-@@ -263,9 +263,9 @@ BOOST_FIXTURE_TEST_CASE( test_draw_line_pivot_y_outside_ends, SimpleBitImageDraw
-
- C3DFVector p(4,-6,5);
- for (int k = 0; k < 42; ++k, p += dir) {
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
- cvdebug() << "test about to draw " << ip << " from " << p << "\n";
- if (ip.y < img.get_size().y)
- pixels.insert(ip);
-@@ -298,9 +298,9 @@ BOOST_FIXTURE_TEST_CASE( test_draw_line_pivot_y_outside_ends_dx_is_zero, SimpleB
-
- C3DFVector p(4,-6,5);
- for (int k = 0; k < 42; ++k, p += dir) {
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
- cvdebug() << "test about to draw " << ip << " from " << p << "\n";
- if (ip.y < img.get_size().y)
- pixels.insert(ip);
-@@ -360,9 +360,9 @@ BOOST_FIXTURE_TEST_CASE( test_draw_line_pivot_z_outside_ends, SimpleBitImageDraw
-
- C3DFVector p(5.5, 6.5, 0);
- for (int k = 0; k < 41 && p.z < 12; ++k, p += dir) {
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
- cvdebug() << "test about to draw " << ip << " from " << p << "\n";
- if (ip.z < img.get_size().z)
- pixels.insert(ip);
-@@ -395,9 +395,9 @@ BOOST_FIXTURE_TEST_CASE( test_draw_line_pivot_x_outside_ends_dz_is_zero, SimpleB
-
- C3DFVector p(-4,2,5);
- for (int k = 0; k < 42; ++k, p += dir) {
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
- cvdebug() << "test about to draw " << ip << " from " << p << "\n";
- if (ip.x < img.get_size().x)
- pixels.insert(ip);
-@@ -430,9 +430,9 @@ BOOST_FIXTURE_TEST_CASE( test_draw_line_pivot_z_outside_ends_dy_is_zero, SimpleB
-
- C3DFVector p(5.5, 4, 0);
- for (int k = 0; k < 41 && p.z < 12; ++k, p += dir) {
-- C3DBounds ip(static_cast<unsigned>(floor(p.x + 0.5)),
-- static_cast<unsigned>(floor(p.y + 0.5)),
-- static_cast<unsigned>(floor(p.z + 0.5)));
-+ C3DBounds ip(static_cast<unsigned>(roundf(p.x)),
-+ static_cast<unsigned>(roundf(p.y)),
-+ static_cast<unsigned>(roundf(p.z)));
- cvdebug() << "test about to draw " << ip << " from " << p << "\n";
- if (ip.z < img.get_size().z)
- pixels.insert(ip);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7d28881..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01_disable-treeview-for-jquery-compatibility.patch
-02_remove_double_instaciation.patch
-03_correct_imagedraw_tests.patch
diff --git a/debian/rules b/debian/rules
index 3e17641..2369978 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,6 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -fvisibility=hidden
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export DH_ALWAYS_EXCLUDE=jquery.js
-
.PHONY: override_dh_strip override_dh_shlibdeps override_dh_auto_test
%:
diff --git a/doc/reference.dox.cmake b/doc/reference.dox.cmake
index 7dc9e9b..a6ebad3 100644
--- a/doc/reference.dox.cmake
+++ b/doc/reference.dox.cmake
@@ -84,7 +84,7 @@ BINARY_TOC = NO
TOC_EXPAND = NO
DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
+GENERATE_TREEVIEW = YES
TREEVIEW_WIDTH = 250
GENERATE_LATEX = NO
LATEX_OUTPUT =
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git
More information about the debian-med-commit
mailing list