[med-svn] [mia] 03/03: prepare new package

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository mia.

commit c04e4ddee70095f32b33d491d0b62c7725cc34d6
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Tue Sep 29 19:57:38 2015 +0200

    prepare new package
---
 debian/changelog                                   |  7 +--
 debian/patches/02_correct_build_dependencies.patch | 50 ----------------------
 ...03_fix_pixeltype_test_for_32bit_platforms.patch | 16 -------
 debian/patches/series                              |  2 -
 4 files changed, 2 insertions(+), 73 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f22842c..4972022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,14 @@
-mia (2.2.4-1) unstable; urgency=medium
+mia (2.2.5-1) UNRELEASED; urgency=medium
 
   * new upstream 
   * d/patches/* remove patches since they are now included upstream:
     02-manpage-correction-patch, 03_correct_instanciation..
     04_correct_flag_outstream, 05_remove_timestamp_from_doxygen 
-  * d/patches/ add 
-     02_correct_build_dependencies.patch to correct build   
-     03_fix_pixeltype_test_for_32bit_platforms.patch
   * d/* bump so-version of the library package because of ABI change. 
     This also takes care of the needed gcc-5 transition
   * add doxygen-latex to the build-dependencies 
 
- -- Gert Wollny <gw.fossdev at gmail.com>  Mon, 07 Sep 2015 00:00:10 +0200
+ -- Gert Wollny <gw.fossdev at gmail.com>  Tue, 29 Sep 2015 18:30:10 +0200
 
 mia (2.2.3-2) unstable; urgency=medium
 
diff --git a/debian/patches/02_correct_build_dependencies.patch b/debian/patches/02_correct_build_dependencies.patch
deleted file mode 100644
index 3858911..0000000
--- a/debian/patches/02_correct_build_dependencies.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Add build dependency on bplug-in links 
- Some executable are defined to use a cmake macro that does not
- properly set the build dependencies for later documentation
- creation. This patch adds these dependencies manually.
- .
-Author: Gert Wollny <gw.fossdev at gmail.com>
-
-diff --git a/src/fluid2d/CMakeLists.txt b/src/fluid2d/CMakeLists.txt
-index e4962d8..99f345a 100644
---- a/src/fluid2d/CMakeLists.txt
-+++ b/src/fluid2d/CMakeLists.txt
-@@ -20,6 +20,7 @@ SET(fluid2d_SOURCES main.cc vfluid.cc elast.cc helpers.cc)
- 
- ADD_EXECUTABLE(mia-2dfluid ${fluid2d_SOURCES})
- TARGET_LINK_LIBRARIES(mia-2dfluid mia2d)
-+ADD_DEPENDENCIES(mia-2dfluid plugin_test_links)
- MIA_EXE_CREATE_DOCU_AND_INTERFACE(mia 2dfluid)
- 
- INSTALL(TARGETS mia-2dfluid RUNTIME DESTINATION "bin")
-diff --git a/src/fluid3d/CMakeLists.txt b/src/fluid3d/CMakeLists.txt
-index cfee179..45bac96 100644
---- a/src/fluid3d/CMakeLists.txt
-+++ b/src/fluid3d/CMakeLists.txt
-@@ -27,7 +27,7 @@ ADD_DEFINITIONS(-DVSTREAM_DOMAIN=\"fluid3d\")
- ADD_EXECUTABLE(mia-3dfluid ${fluid3d_SOURCES})
- TARGET_LINK_LIBRARIES(mia-3dfluid mia3d)
- INSTALL(TARGETS mia-3dfluid RUNTIME DESTINATION "bin")
--
-+ADD_DEPENDENCIES(mia-3dfluid plugin_test_links)
- MIA_EXE_CREATE_DOCU_AND_INTERFACE(mia 3dfluid)
- 
- 
-diff --git a/src/isosurface/CMakeLists.txt b/src/isosurface/CMakeLists.txt
-index de416b2..1ed6682 100644
---- a/src/isosurface/CMakeLists.txt
-+++ b/src/isosurface/CMakeLists.txt
-@@ -38,11 +38,13 @@ IF(GTS_FOUND)
- 
-   # add the ISO-surface programs 
-   ADD_EXECUTABLE(mia-3disosurface-from-volume iso.cc)
-+  ADD_DEPENDENCIES(mia-3disosurface-from-volume plugin_test_links)
-   MIA_EXE_CREATE_DOCU_AND_INTERFACE(mia 3disosurface-from-volume)
-   TARGET_LINK_LIBRARIES(mia-3disosurface-from-volume miagts)
-   INSTALL(TARGETS mia-3disosurface-from-volume RUNTIME DESTINATION "bin")
- 
-   ADD_EXECUTABLE(mia-3disosurface-from-stack iso_from_slices.cc)
-+  ADD_DEPENDENCIES(mia-3disosurface-from-stack plugin_test_links)
-   MIA_EXE_CREATE_DOCU_AND_INTERFACE(mia 3disosurface-from-stack)
-   TARGET_LINK_LIBRARIES(mia-3disosurface-from-stack miagts)
-   INSTALL(TARGETS mia-3disosurface-from-stack RUNTIME DESTINATION "bin")
diff --git a/debian/patches/03_fix_pixeltype_test_for_32bit_platforms.patch b/debian/patches/03_fix_pixeltype_test_for_32bit_platforms.patch
deleted file mode 100644
index fb08bb8..0000000
--- a/debian/patches/03_fix_pixeltype_test_for_32bit_platforms.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix pixeltype number test for 32 bit builds 
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Forwarded: not-needed
-
---- mia-2.2.4.orig/mia/core/test_pixeltype.cc
-+++ mia-2.2.4/mia/core/test_pixeltype.cc
-@@ -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(CPixelTypeDict.get_name_set().size() == 10);
- 	BOOST_CHECK(it_none == 9);
- #endif
- 
- 	BOOST_CHECK(CPixelTypeDict.get_value("bit")    == it_bit);
diff --git a/debian/patches/series b/debian/patches/series
index 77c0a28..8526e67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 01_disable-treeview-for-jquery-compatibility.patch
-02_correct_build_dependencies.patch
-03_fix_pixeltype_test_for_32bit_platforms.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git