This is an automated email from the git hooks/post-receive script. gert-guest pushed a commit to branch master in repository mia.
commit 880cbc5da0068891671d0b36669117b44a8d65e8 Author: Gert Wollny <[email protected]> Date: Tue Sep 8 22:21:13 2015 +0200 correct patch and revert to unreleased --- debian/changelog | 2 +- debian/patches/03_fix_pixeltype_test_for_32bit_platforms.patch | 5 ++--- mia/core/test_pixeltype.cc | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index f22842c..392ca05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mia (2.2.4-1) unstable; urgency=medium +mia (2.2.4-1) UNRELEASED; urgency=medium * new upstream * d/patches/* remove patches since they are now included upstream: diff --git a/debian/patches/03_fix_pixeltype_test_for_32bit_platforms.patch b/debian/patches/03_fix_pixeltype_test_for_32bit_platforms.patch index 8dcb62d..fb08bb8 100644 --- a/debian/patches/03_fix_pixeltype_test_for_32bit_platforms.patch +++ b/debian/patches/03_fix_pixeltype_test_for_32bit_platforms.patch @@ -4,14 +4,13 @@ Forwarded: not-needed --- mia-2.2.4.orig/mia/core/test_pixeltype.cc +++ mia-2.2.4/mia/core/test_pixeltype.cc -@@ -37,8 +37,8 @@ BOOST_AUTO_TEST_CASE( test_pixeltype_tra +@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE( test_pixeltype_tra BOOST_CHECK(CPixelTypeDict.get_name_set().size() == 12); BOOST_CHECK(it_none == 11); #else - BOOST_CHECK(CPixelTypeDict.get_name_set().size() == 9); -- BOOST_CHECK(it_none == 9); + BOOST_CHECK(CPixelTypeDict.get_name_set().size() == 10); -+ BOOST_CHECK(it_none == 10); + BOOST_CHECK(it_none == 9); #endif BOOST_CHECK(CPixelTypeDict.get_value("bit") == it_bit); diff --git a/mia/core/test_pixeltype.cc b/mia/core/test_pixeltype.cc index a45036f..d1f6243 100644 --- a/mia/core/test_pixeltype.cc +++ b/mia/core/test_pixeltype.cc @@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE( test_pixeltype_translation ) BOOST_CHECK(it_none == 11); #else BOOST_CHECK(CPixelTypeDict.get_name_set().size() == 10); - BOOST_CHECK(it_none == 10); + BOOST_CHECK(it_none == 9); #endif BOOST_CHECK(CPixelTypeDict.get_value("bit") == it_bit); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
