[med-svn] [mia] 03/03: Prepare new upstream version for experimental
Gert Wollny
gewo at moszumanska.debian.org
Wed Mar 22 02:40:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository mia.
commit 88697366b39d3ac18183203212712117a65f09fd
Author: Gert Wollny <gewo at debian.org>
Date: Tue Mar 21 23:42:09 2017 +0000
Prepare new upstream version for experimental
---
debian/changelog | 12 +++
debian/compat | 2 +-
debian/control | 12 +--
.../{libmia-2.4-0.install => libmia-2.4-4.install} | 0
...an-overrides => libmia-2.4-4.lintian-overrides} | 8 +-
debian/patches/correct_depenency_handling.patch | 118 ---------------------
debian/patches/hdf5_correct_hid.patch | 15 ---
.../patches/mia_243_check_help_xml_success.patch | 30 ------
debian/patches/mia_243_scoped_lock_no_copy.patch | 22 ----
debian/patches/path_max.patch | 18 ----
debian/patches/series | 5 -
debian/rules | 2 +-
12 files changed, 24 insertions(+), 220 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index db224b3..6f934cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mia (2.4.4-1~exp1) experimental; urgency=medium
+
+ * New upstream version 2.4.4
+ * d/p: remove patches applied upstream
+ * d/control:
+ - update DD address
+ - update package names to new so-version
+ * d/: Update install and overrides to new so-version
+ * d/control, d/compat: move to new debhelper version
+
+ -- Gert Wollny <gewo at debian.org> Tue, 21 Mar 2017 22:32:27 +0000
+
mia (2.4.3-5) unstable; urgency=medium
* d/p: Add patch to handle new 64-bit hid_t in hdf5-1.10
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 60f6433..676bc74 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
Source: mia
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Gert Wollny <gw.fossdev at gmail.com>
+Uploaders: Gert Wollny <gewo at debian.org>
Section: science
Priority: optional
Build-Depends: cmake,
- debhelper (>= 9.0.0),
+ debhelper (>= 10.0.0),
libblas-dev,
libboost-filesystem-dev,
libboost-serialization-dev,
@@ -25,7 +25,7 @@ Build-Depends: cmake,
libtiff-dev,
libvtk6-dev,
libvistaio-dev,
- libxml++2.6-dev,
+ libxml2-dev,
python-lxml
Build-Depends-Indep: docbook-xsl,
doxygen,
@@ -37,7 +37,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/mia.git
Vcs-Git: https://anonscm.debian.org/git/debian-med/mia.git
Homepage: http://mia.sourceforge.net
-Package: libmia-2.4-0
+Package: libmia-2.4-4
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -52,7 +52,7 @@ Description: library for 2D and 3D gray scale image processing
Package: libmia-2.4-dev
Architecture: any
Section: libdevel
-Depends: libmia-2.4-0 (= ${binary:Version}),
+Depends: libmia-2.4-4 (= ${binary:Version}),
mia-doctools (= ${source:Version}),
libitpp-dev,
libgsl-dev,
@@ -87,7 +87,7 @@ Description: library for 2D and 3D gray scale image processing, documentation
Package: mia-tools
Architecture: any
-Depends: libmia-2.4-0 (= ${binary:Version}),
+Depends: libmia-2.4-4 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Recommends: mia-tools-doc
diff --git a/debian/libmia-2.4-0.install b/debian/libmia-2.4-4.install
similarity index 100%
rename from debian/libmia-2.4-0.install
rename to debian/libmia-2.4-4.install
diff --git a/debian/libmia-2.4-0.lintian-overrides b/debian/libmia-2.4-4.lintian-overrides
similarity index 70%
rename from debian/libmia-2.4-0.lintian-overrides
rename to debian/libmia-2.4-4.lintian-overrides
index ce6cf83..006d272 100644
--- a/debian/libmia-2.4-0.lintian-overrides
+++ b/debian/libmia-2.4-4.lintian-overrides
@@ -1,22 +1,22 @@
#
#The package provides multiple libraries, which means no unique soname can be given
#
-libmia-2.4-0 binary: package-name-doesnt-match-sonames
+libmia-2.4-4 binary: package-name-doesnt-match-sonames
#
# The SOURCE_FORTIFY=2 flag is used, but in many cases the compiler is just good enough
# to detect that fortification is not needed
#
-libmia-2.4-0 binary: hardening-no-fortify-functions
+libmia-2.4-4 binary: hardening-no-fortify-functions
#
# Since the symbols will differ greatly between 32 bit and 64 bit builds a symbols file
# would have to be provided for each arch
#
-libmia-2.4-0 binary: no-symbols-control-file
+libmia-2.4-4 binary: no-symbols-control-file
#
# The libray command line parser is designed to call exit if a help
# option was given.
#
-libmia-2.4-0 binary: shlib-calls-exit
+libmia-2.4-4 binary: shlib-calls-exit
diff --git a/debian/patches/correct_depenency_handling.patch b/debian/patches/correct_depenency_handling.patch
deleted file mode 100644
index e503241..0000000
--- a/debian/patches/correct_depenency_handling.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Description: Correct the dependencies to alliviate a parallel build failure
- If more threads are available then targets to be build the old
- dependency chain might invoke building of the man page and the
- nipype interface at the same time wich may result in running two
- instances of building the helper xml files first and as a result a race
- condition occurs that sometimes lets the build fail because the
- xml helper file is empty.
-Origin: upstream
-Forwarded: yes
-Last-Changed: Fri Nov 25 12:56:17 2016 +0100
-Bug-Debian: https://bugs.debian.org/844140
-
---- a/cmake/macros.cmake
-+++ b/cmake/macros.cmake
-@@ -120,70 +120,6 @@
- ENDIF(NOT ${${NAME}_TYPE_SIZE} EQUAL ${EXPECTED})
- ENDMACRO(ASSERT_SIZE)
-
--
--
--#
--# This macro runs the program to create the XMLprogram descrition
--# that is used to create documentation and interfaced
--#
--MACRO(CREATE_EXE_XML_HELP name)
-- ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml
-- COMMAND MIA_PLUGIN_TESTPATH=${PLUGIN_TEST_ROOT}/${PLUGIN_INSTALL_PATH}
-- ./mia-${name} --help-xml ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml
-- COMMAND rm -f ${CMAKE_SOURCE_DIR}/doc/userref.stamp
-- DEPENDS mia-${name} )
--
-- ADD_CUSTOM_TARGET(mia-${name}-xml DEPENDS ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml)
-- ADD_DEPENDENCIES(XMLDOC mia-${name}-xml)
--ENDMACRO(CREATE_EXE_XML_HELP)
--
--
--MACRO(CREATE_NIPYPE_FROM_XML name)
-- IF(CREATE_NIPYPE_INTERFACES)
-- STRING(REPLACE "-" "_" PythonName ${name})
--
-- SET(${name}-nipype-interface ${CMAKE_CURRENT_BINARY_DIR}/mia_${PythonName}.py)
--
-- ADD_CUSTOM_COMMAND(OUTPUT ${${name}-nipype-interface}
-- COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/doc/miaxml2nipype.py
-- -i ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml -o ${${name}-nipype-interface}
-- MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml)
--
-- ADD_CUSTOM_TARGET(mia-${name}-nipype DEPENDS ${${name}-nipype-interface})
-- ADD_DEPENDENCIES(nipypeinterfaces mia-${name}-nipype)
--
-- INSTALL(FILES ${${name}-nipype-interface} DESTINATION ${NIPYPE_INTERFACE_DIR}/mia)
--
-- ENDIF(CREATE_NIPYPE_INTERFACES)
--ENDMACRO(CREATE_NIPYPE_FROM_XML)
--#
--#
--# man pages can only be created if the python + lxml packages are available
--#
--MACRO(CREATE_MANPAGE_FROM_XML name)
-- IF(CREATE_USERDOC)
--
-- SET(${name}-manfile ${CMAKE_BINARY_DIR}/doc/man/mia-${name}.1)
--
-- ADD_CUSTOM_COMMAND(OUTPUT ${${name}-manfile}
-- COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/doc/miaxml2man.py
-- ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml >${${name}-manfile}
-- MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml
-- DEPENDS mandir mia-${name}-xml
-- )
-- ADD_CUSTOM_TARGET(mia-${name}-man DEPENDS ${${name}-manfile})
-- add_dependencies(manpages mia-${name}-man)
-- ENDIF(CREATE_USERDOC)
--
--ENDMACRO(CREATE_MANPAGE_FROM_XML)
--
--
--#MACRO(MIA_EXE_CREATE_DOCU_AND_INTERFACE name)
--# CREATE_EXE_XML_HELP(${name})
--# CREATE_MANPAGE_FROM_XML(${name})
--# CREATE_NIPYPE_FROM_XML(${name})
--# ENDMACRO(MIA_EXE_CREATE_DOCU_AND_INTERFACE)
--
- MACRO(DEFEXE name libraries)
- ADD_EXECUTABLE(mia-${name} ${name}.cc)
- SET_TARGET_PROPERTIES(mia-${name} PROPERTIES COMPILE_FLAGS -DVSTREAM_DOMAIN='"${name}"')
---- a/doc/MiaDoctools.cmake
-+++ b/doc/MiaDoctools.cmake
-@@ -111,9 +111,11 @@
- COMMAND ${PYTHON_EXECUTABLE} ${MIA_DOCTOOLS_ROOT}/miaxml2nipype.py -i ${CMAKE_BINARY_DIR}/doc/${prefix}-${name}.xml -o ${${prefix}-${name}-nipype-interface}
- MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/doc/${prefix}-${name}.xml)
-
-+
- FILE(APPEND ${NIPYPE_INTERFACE_INIT_FILE} "from .${prefix}_${PythonName} import ${prefix}_${PythonName}\n")
-
- ADD_CUSTOM_TARGET(${prefix}-${name}-nipype DEPENDS ${${prefix}-${name}-nipype-interface})
-+ ADD_DEPENDENCIES(${prefix}-${name}-nipype ${prefix}-${name}-xml)
- ADD_DEPENDENCIES(nipypeinterfaces ${prefix}-${name}-nipype)
-
- INSTALL(FILES ${${prefix}-${name}-nipype-interface} DESTINATION ${NIPYPE_INTERFACE_DIR})
-@@ -128,11 +130,13 @@
- SET(${prefix}-${name}-manfile ${CMAKE_CURRENT_BINARY_DIR}/${prefix}-${name}.1)
- ADD_CUSTOM_COMMAND(OUTPUT ${${prefix}-${name}-manfile}
- COMMAND ${PYTHON_EXECUTABLE} ${MIA_DOCTOOLS_ROOT}/miaxml2man.py ${CMAKE_BINARY_DIR}/doc/${prefix}-${name}.xml >${${prefix}-${name}-manfile}
-- MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/doc/${prefix}-${name}.xml
-- )
-- ADD_CUSTOM_TARGET(${prefix}-${name}-man DEPENDS ${${prefix}-${name}-manfile})
-- add_dependencies(manpages ${prefix}-${name}-man)
-- INSTALL(FILES ${${prefix}-${name}-manfile} DESTINATION "share/man/man1")
-+ MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/doc/${prefix}-${name}.xml
-+ DEPENDS ${prefix}-${name}-xml
-+ )
-+ ADD_CUSTOM_TARGET(${prefix}-${name}-man DEPENDS ${${prefix}-${name}-manfile})
-+ ADD_DEPENDENCIES(${prefix}-${name}-man ${prefix}-${name}-xml)
-+ add_dependencies(manpages ${prefix}-${name}-man)
-+ INSTALL(FILES ${${prefix}-${name}-manfile} DESTINATION "share/man/man1")
- ENDMACRO(MIA_CREATE_MANPAGE_FROM_XML)
-
-
diff --git a/debian/patches/hdf5_correct_hid.patch b/debian/patches/hdf5_correct_hid.patch
deleted file mode 100644
index 98a431c..0000000
--- a/debian/patches/hdf5_correct_hid.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Correct possible truncat of hid_t that may now be 64 bit
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Origin: Upstream
-
---- a/addons/hdf5/hdf5mia.cc
-+++ b/addons/hdf5/hdf5mia.cc
-@@ -440,7 +440,7 @@
- auto id = H5Dopen(p, relative_name.c_str(), H5P_DEFAULT);
- check_id(id, "H5Dataset", "open", relative_name);
-
-- int space_id = H5Dget_space(id);
-+ auto space_id = H5Dget_space(id);
- check_id(space_id, "H5Dataset", "get space", name);
- H5Space space(space_id);
-
diff --git a/debian/patches/mia_243_check_help_xml_success.patch b/debian/patches/mia_243_check_help_xml_success.patch
deleted file mode 100644
index 375c752..0000000
--- a/debian/patches/mia_243_check_help_xml_success.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Throw exception if writing help-xml fails
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Date: Mon Nov 14 13:13:19 2016 +0100
-
- Add error handling to help-xml output
-
-diff --git a/mia/core/cmdlineparser.cc b/mia/core/cmdlineparser.cc
-index b820b07..31e679f 100644
---- a/mia/core/cmdlineparser.cc
-+++ b/mia/core/cmdlineparser.cc
-@@ -58,7 +58,8 @@ using std::ostream;
- using std::ofstream;
- using std::ostringstream;
- using std::string;
--using std::invalid_argument;
-+using std::invalid_argument;
-+using std::runtime_error;
- using std::logic_error;
- using std::vector;
- using std::map;
-@@ -394,6 +395,9 @@ void CCmdOptionListData::print_help_xml(const char *name_help, const CPluginHand
- ofstream xmlfile(help_xml.c_str());
- xmlfile << doc->write_to_string_formatted();
- xmlfile << std::endl;
-+ if (!xmlfile.good()) {
-+ throw create_exception<runtime_error>("Unable to write '", help_xml, "'");
-+ }
- }else{
- std::cout << doc->write_to_string_formatted();
- }
diff --git a/debian/patches/mia_243_scoped_lock_no_copy.patch b/debian/patches/mia_243_scoped_lock_no_copy.patch
deleted file mode 100644
index c88ae53..0000000
--- a/debian/patches/mia_243_scoped_lock_no_copy.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: remove copy-operations from scoped lock
- This makes sure that no double-unlocking can happen
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Date: Sun Nov 13 14:01:16 2016 +0100
-
- remove copy from scoped lock
-
-diff --git a/mia/core/parallelcxx11.hh b/mia/core/parallelcxx11.hh
-index c5354a3..b308343 100644
---- a/mia/core/parallelcxx11.hh
-+++ b/mia/core/parallelcxx11.hh
-@@ -52,6 +52,10 @@ public:
- m_mutex.lock();
- own_lock = true;
- };
-+
-+ TScopedLock(const TScopedLock<Mutex>& other) = delete;
-+ TScopedLock& operator = (const TScopedLock<Mutex>& other) = delete;
-+
- ~TScopedLock(){
- if (own_lock)
- m_mutex.unlock();
diff --git a/debian/patches/path_max.patch b/debian/patches/path_max.patch
deleted file mode 100644
index 3b2f7a8..0000000
--- a/debian/patches/path_max.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Description: Define PATH_MAX if the system headers don't
-Forwarded: not-needed
-
---- a/mia/core/test_core.cc
-+++ b/mia/core/test_core.cc
-@@ -32,6 +32,11 @@
- #include <mia/core/utils.hh>
-
-
-+// WIN32 and HURD don't define this
-+#ifndef PATH_MAX
-+#define PATH_MAX 1024
-+#endif
-+
- NS_MIA_USE
- using namespace std;
- using namespace boost::unit_test;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 80a5474..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-path_max.patch
-mia_243_scoped_lock_no_copy.patch
-mia_243_check_help_xml_success.patch
-correct_depenency_handling.patch
-hdf5_correct_hid.patch
diff --git a/debian/rules b/debian/rules
index 9968f5d..5992887 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,6 @@ override_dh_auto_build-arch:
dh_auto_build
override_dh_shlibdeps:
- dh_shlibdeps -- $(shell find debian/libmia-2.4-0/ -name "*.mia")
+ dh_shlibdeps -- $(shell find debian/libmia-2.4-4/ -name "*.mia")
--
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