From: Peter Michael Green Date: Thu, 8 Dec 2016 19:10:10 +0000 (+0000) Subject: Import ismrmrd_1.3.3-1+rpi1.debian.tar.xz X-Git-Tag: archive/raspbian/1.3.3-3+rpi1~8^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=421baa28fc6948fbfbf50ff6a862156133e810f9;p=ismrmrd.git Import ismrmrd_1.3.3-1+rpi1.debian.tar.xz [dgit import tarball ismrmrd 1.3.3-1+rpi1 ismrmrd_1.3.3-1+rpi1.debian.tar.xz] --- 421baa28fc6948fbfbf50ff6a862156133e810f9 diff --git a/changelog b/changelog new file mode 100644 index 0000000..b85e7ce --- /dev/null +++ b/changelog @@ -0,0 +1,137 @@ +ismrmrd (1.3.3-1+rpi1) stretch-staging; urgency=medium + + * Disable testsuite. + + -- Peter Michael Green Thu, 08 Dec 2016 19:10:10 +0000 + +ismrmrd (1.3.3-1) unstable; urgency=medium + + * New upstream version 1.3.3 + * Update patch queue. + - Drop Explicit-64-bit-shifts-for-flags.patch, applied upstream. + - Refresh Fix-HDF5-detection-with-CMake-3.6.patch. + - Refresh Use-Debian-CMake-find-module-location.patch. + - Drop hdf5-1.10.patch, applied upstream. + * Fix usability of ISMRMRD CMake packaging. + - New patch Fix-CMake-package-configuration.patch. + - New patch Fix-CMake-package-detection.patch. + - Drop Use-Debian-CMake-find-module-location.patch, no longer required. + - Install CMake configuration to -dev package. + * Upgrade packaging to debhelper 10. + * Drop superfluous Testsuite field. + * Simplify the packaging testsuite. + * Enable multiarch installation of binaries. + - New patch Add-support-for-multiarch.patch. + - Update install paths of lib and dev packages. + - Add Multi-Arch fields to all binary packages. + * Keep doxygen generated instance of jQuery. + * Miscellaneous changes to control file: + - Replace build dependency on libhdf5-serial-dev with libhdf5-dev. + - Add missing install dependency on libhdf5-dev for the -dev package. + * Miscellaneous changes to rules file: + - Disable verbosity by default. + - Reformat content of dh_auto_build override. + + -- Ghislain Antony Vaillant Sat, 26 Nov 2016 11:45:27 +0000 + +ismrmrd (1.3.2-4.1) unstable; urgency=medium + + * Non-maintainer upload + * New patch to support HDF5 1.10 (closes: #841959) + + -- Gilles Filippini Sun, 30 Oct 2016 17:54:19 +0100 + +ismrmrd (1.3.2-4) unstable; urgency=medium + + * Fix FTBFS due to buggy HDF5 detection with CMake 3.6. + Thanks to Lucas Nussbaum for reporting. (Closes: #835679) + * Update description of binary packages. + * Add missing Section field for some binary packages. + * Bump standards version to 3.9.8, no changes required. + * Use HTTPS for Format field in copyright file. + + -- Ghislain Antony Vaillant Fri, 02 Sep 2016 11:27:37 +0100 + +ismrmrd (1.3.2-3) unstable; urgency=medium + + * d/rules: add missing maintainer CXXFLAGS. + * Add packaging testsuite. + * Add patch fixing compilation of examples with the installed find module. + File: Use-Debian-CMake-find-module-location + * Bump standards version to 3.9.7, no changes required. + + -- Ghislain Antony Vaillant Sat, 05 Mar 2016 17:13:18 +0000 + +ismrmrd (1.3.2-2) unstable; urgency=medium + + * d/control: use secure VCS-Git URI. + * Add patch fixing FTBFS in testsuite. + File: Use-explicit-64-bit-shifts-in-testsuite.patch. + Thanks to Emilio Pozuelo Monfort (Closes: #802172) + * Provide examples in doc package. + * d/control: cme fix, wrap and sort. + * Fix usage of embedded jquery. + + -- Ghislain Antony Vaillant Wed, 03 Feb 2016 19:32:00 +0000 + +ismrmrd (1.3.2-1) unstable; urgency=medium + + * New upstream release. + * Refresh patch queue: + - Drop fixing-check-after-free-in-unit-tests.patch, applied upstream. + - Drop cmake-install-docs.patch, now using alternative via d/rules. + - Rename make-build-reproducible.patch to Disable-HTML-timestamps.patch. + - Add Explicit-64-bit-shifts-for-flags.patch from upstream, should solve + issues with failing testsuite on some architectures. + * Simplify packaging of documentation. + * d/rules: add call to dh_doxygen. + * Update copyright information: + - Add upstream contact. + - Replace MIT by Expat. + - Wrap and sort. + * Add gbp.conf file. + + -- Ghislain Antony Vaillant Mon, 26 Oct 2015 10:34:42 +0000 + +ismrmrd (1.3.1-1) unstable; urgency=medium + + * New upstream release. + * Bump soname of shared library package. + * Enable test suite, requires build dependency on libboost-test-dev. + * Use stricter hardening. + * Make documentation targets architecture-independent: + - d/control: move documentation dependencies to Build-Depends-Indep, + - d/p/cmake-install-docs.patch: enable installation of documentation, + - d/*-doc.install: use installation path set by the above patch, + - d/rules: split older rules to -arch and -indep. + * Remove jquery symlink in documentation package. + * Add d/p/fixing-check-after-free-in-unit-tests.patch, fixes an upstream bug + in the test suite. + + -- Ghislain Antony Vaillant Fri, 18 Sep 2015 09:44:41 +0100 + +ismrmrd (1.2.3-3) unstable; urgency=medium + + * Team upload. + * Rebuild with g++ 5 + Closes: #799107 + + -- Andreas Tille Wed, 16 Sep 2015 08:29:53 +0200 + +ismrmrd (1.2.3-2) unstable; urgency=medium + + * Make package build reproducible. + + -- Ghislain Antony Vaillant Thu, 02 Jul 2015 18:33:32 +0100 + +ismrmrd (1.2.3-1) unstable; urgency=medium + + * New upstream release. + + -- Ghislain Antony Vaillant Thu, 18 Jun 2015 17:19:20 +0100 + +ismrmrd (1.2.1-1) unstable; urgency=low + + * Initial release (Closes: #732360) + + -- Ghislain Antony Vaillant Fri, 20 Feb 2015 16:28:54 +0000 diff --git a/compat b/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +10 diff --git a/control b/control new file mode 100644 index 0000000..bc4d38c --- /dev/null +++ b/control @@ -0,0 +1,108 @@ +Source: ismrmrd +Maintainer: Debian Med Packaging Team +Uploaders: Ghislain Antony Vaillant +Section: science +Priority: optional +Build-Depends: cmake, + debhelper (>= 10), + libboost-program-options-dev, + libboost-test-dev, + libfftw3-dev, + libhdf5-dev, + libpugixml-dev +Build-Depends-Indep: doxygen +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/ismrmrd.git +Vcs-Git: https://anonscm.debian.org/git/debian-med/ismrmrd.git +Homepage: http://ismrmrd.github.io/ + +Package: libismrmrd1.3 +Architecture: any +Multi-Arch: same +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: ISMRM Raw Data format (ISMRMRD) + The ISMRMRD format combines a mix of flexible data structures (XML header) + and fixed structures (equivalent to C-structs) to represent MRI data. + . + In addition, the ISMRMRD format also specifies an image header for storing + reconstructed images and the accompanying C++ library provides a convenient + way of writing such images into HDF5 files along with generic arrays for + storing less well defined data structures, e.g. coil sensitivity maps or + other calibration data. + . + This package provides the shared library. + +Package: libismrmrd-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: ${misc:Depends}, + libhdf5-dev, + libismrmrd1.3 (= ${binary:Version}) +Suggests: libismrmrd-doc +Description: development files for ISMRMRD + The ISMRMRD format combines a mix of flexible data structures (XML header) + and fixed structures (equivalent to C-structs) to represent MRI data. + . + In addition, the ISMRMRD format also specifies an image header for storing + reconstructed images and the accompanying C++ library provides a convenient + way of writing such images into HDF5 files along with generic arrays for + storing less well defined data structures, e.g. coil sensitivity maps or + other calibration data. + . + This package provides the development files. + +Package: libismrmrd-doc +Architecture: all +Multi-Arch: foreign +Section: doc +Depends: ${misc:Depends} +Description: documentation for ISMRMRD + The ISMRMRD format combines a mix of flexible data structures (XML header) + and fixed structures (equivalent to C-structs) to represent MRI data. + . + In addition, the ISMRMRD format also specifies an image header for storing + reconstructed images and the accompanying C++ library provides a convenient + way of writing such images into HDF5 files along with generic arrays for + storing less well defined data structures, e.g. coil sensitivity maps or + other calibration data. + . + This package provides the documentation. + +Package: ismrmrd-tools +Architecture: any +Multi-Arch: foreign +Section: utils +Depends: ${misc:Depends}, + ${shlibs:Depends}, + ismrmrd-schema +Description: command-line tools for ISMRMRD + The ISMRMRD format combines a mix of flexible data structures (XML header) + and fixed structures (equivalent to C-structs) to represent MRI data. + . + In addition, the ISMRMRD format also specifies an image header for storing + reconstructed images and the accompanying C++ library provides a convenient + way of writing such images into HDF5 files along with generic arrays for + storing less well defined data structures, e.g. coil sensitivity maps or + other calibration data. + . + This package provides the command-line tools. + +Package: ismrmrd-schema +Architecture: all +Multi-Arch: foreign +Section: misc +Depends: ${misc:Depends} +Description: schema for ISMRMRD + The ISMRMRD format combines a mix of flexible data structures (XML header) + and fixed structures (equivalent to C-structs) to represent MRI data. + . + In addition, the ISMRMRD format also specifies an image header for storing + reconstructed images and the accompanying C++ library provides a convenient + way of writing such images into HDF5 files along with generic arrays for + storing less well defined data structures, e.g. coil sensitivity maps or + other calibration data. + . + This package provides the XML schema. diff --git a/copyright b/copyright new file mode 100644 index 0000000..181fa4c --- /dev/null +++ b/copyright @@ -0,0 +1,47 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ismrmrd +Upstream-Contact: michael.hansen@nih.gov +Source: http://ismrmrd.github.io/ + +Files: * +Copyright: 2013-2014 Michael S. Hansen + 2013-2014 The ISMRMRD developers and contributors +License: Expat + +Files: debian/* +Copyright: 2014 Ghislain Vaillant +License: Expat + +Files: libsrc/pugiconfig.hpp + libsrc/pugixml.cpp + libsrc/pugixml.hpp +Copyright: 2006-2014 Arseny Kapoulkine +License: Expat + +License: Expat + The MIT License + . + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the Software + without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to + whom the Software is furnished to do so, subject to the + following conditions: + . + The above copyright notice and this permission notice shall + be included in all copies or substantial portions of the + Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT + WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE AND NONINFRINGEMENT. IN NO EVENT + SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..e4b2a8c --- /dev/null +++ b/gbp.conf @@ -0,0 +1,9 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = master +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = True + +[pq] +patch-numbers = False diff --git a/ismrmrd-schema.install b/ismrmrd-schema.install new file mode 100644 index 0000000..a1c957e --- /dev/null +++ b/ismrmrd-schema.install @@ -0,0 +1 @@ +usr/share/ismrmrd/schema/* diff --git a/ismrmrd-tools.install b/ismrmrd-tools.install new file mode 100644 index 0000000..582ef72 --- /dev/null +++ b/ismrmrd-tools.install @@ -0,0 +1,5 @@ +usr/bin/ismrmrd_generate_cartesian_shepp_logan +usr/bin/ismrmrd_info +usr/bin/ismrmrd_read_timing_test +usr/bin/ismrmrd_recon_cartesian_2d +usr/bin/ismrmrd_test_xml diff --git a/ismrmrd-tools.lintian-overrides b/ismrmrd-tools.lintian-overrides new file mode 100644 index 0000000..f640faa --- /dev/null +++ b/ismrmrd-tools.lintian-overrides @@ -0,0 +1,5 @@ +ismrmrd-tools: binary-without-manpage usr/bin/ismrmrd_generate_cartesian_shepp_logan +ismrmrd-tools: binary-without-manpage usr/bin/ismrmrd_info +ismrmrd-tools: binary-without-manpage usr/bin/ismrmrd_read_timing_test +ismrmrd-tools: binary-without-manpage usr/bin/ismrmrd_recon_cartesian_2d +ismrmrd-tools: binary-without-manpage usr/bin/ismrmrd_test_xml diff --git a/libismrmrd-dev.install b/libismrmrd-dev.install new file mode 100644 index 0000000..9af26b8 --- /dev/null +++ b/libismrmrd-dev.install @@ -0,0 +1,3 @@ +usr/include/ismrmrd +usr/lib/*/*.so +usr/lib/*/cmake diff --git a/libismrmrd-doc.doc-base b/libismrmrd-doc.doc-base new file mode 100644 index 0000000..05196f2 --- /dev/null +++ b/libismrmrd-doc.doc-base @@ -0,0 +1,10 @@ +Document: libismrmrd-doc +Title: ISMRMRD API Documentation +Author: ISMRMRD developers +Abstract: This documentation describes the ISMRMRD library API. +Section: Science/Physics + +Format: HTML +Index: /usr/share/doc/libismrmrd-doc/html/api/index.html +Files: /usr/share/doc/libismrmrd-doc/html/api/*.html + diff --git a/libismrmrd-doc.docs b/libismrmrd-doc.docs new file mode 100644 index 0000000..32e5cb3 --- /dev/null +++ b/libismrmrd-doc.docs @@ -0,0 +1 @@ +*/doc/html diff --git a/libismrmrd-doc.examples b/libismrmrd-doc.examples new file mode 100644 index 0000000..e39721e --- /dev/null +++ b/libismrmrd-doc.examples @@ -0,0 +1 @@ +examples/* diff --git a/libismrmrd1.3.install b/libismrmrd1.3.install new file mode 100644 index 0000000..3de3b10 --- /dev/null +++ b/libismrmrd1.3.install @@ -0,0 +1 @@ +usr/lib/*/*.so.* diff --git a/patches/Add-support-for-multiarch.patch b/patches/Add-support-for-multiarch.patch new file mode 100644 index 0000000..e547902 --- /dev/null +++ b/patches/Add-support-for-multiarch.patch @@ -0,0 +1,45 @@ +From: Ghislain Antony Vaillant +Date: Fri, 11 Nov 2016 10:49:53 +0000 +Subject: Add support for multiarch. + +--- + CMakeLists.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e6b7589..b614f71 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -198,10 +198,12 @@ target_link_libraries(ismrmrd ${ISMRMRD_TARGET_LINK_LIBS}) + list(APPEND ISMRMRD_LIBRARIES ismrmrd) # Add to list of libraries to be found + list(APPEND ISMRMRD_LIBRARY_DIRS ${CMAKE_BINARY_DIR} ) # Add to list of directories to find libaries + ++include(GNUInstallDirs) ++ + # install the main library + install(TARGETS ismrmrd EXPORT ISMRMRDTargets +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION bin + COMPONENT Devel + ) +@@ -257,7 +259,7 @@ configure_file(cmake/ISMRMRDConfig.cmake.in + + set(CONFIG_ISMRMRD_SCHEMA_DIR ${CMAKE_INSTALL_PREFIX}/share/ismrmrd/schema) + set(CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include) +-set(CONFIG_ISMRMRD_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/lib) ++set(CONFIG_ISMRMRD_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + if (ISMRMRD_DATASET_SUPPORT) + list(APPEND CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS}) + list(APPEND CONFIG_ISMRMRD_LIBRARY_DIRS ${HDF5_LIBRARY_DIRS}) +@@ -268,7 +270,7 @@ configure_file(cmake/ISMRMRDConfig.cmake.in + @ONLY + ) + +-set(ConfigPackageLocation lib/cmake/ISMRMRD) ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/ISMRMRD) + install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/InstallFiles/ISMRMRDConfig.cmake" diff --git a/patches/Disable-HTML-timestamps.patch b/patches/Disable-HTML-timestamps.patch new file mode 100644 index 0000000..63190a9 --- /dev/null +++ b/patches/Disable-HTML-timestamps.patch @@ -0,0 +1,22 @@ +From: Ghislain Antony Vaillant +Date: Wed, 18 Nov 2015 18:53:13 +0000 +Subject: Disable HTML timestamps. + +Reason: makes build reproducible. +--- + doc/Doxyfile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in +index ff07a28..5346e9a 100644 +--- a/doc/Doxyfile.in ++++ b/doc/Doxyfile.in +@@ -1130,7 +1130,7 @@ HTML_COLORSTYLE_GAMMA = 80 + # The default value is: YES. + # This tag requires that the tag GENERATE_HTML is set to YES. + +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML + # documentation will contain sections that can be hidden and shown after the diff --git a/patches/Fix-CMake-package-configuration.patch b/patches/Fix-CMake-package-configuration.patch new file mode 100644 index 0000000..5d7c99b --- /dev/null +++ b/patches/Fix-CMake-package-configuration.patch @@ -0,0 +1,24 @@ +From: Ghislain Antony Vaillant +Date: Fri, 11 Nov 2016 12:36:34 +0000 +Subject: Fix CMake package configuration. + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e9b1a9..e6b7589 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -258,6 +258,11 @@ configure_file(cmake/ISMRMRDConfig.cmake.in + set(CONFIG_ISMRMRD_SCHEMA_DIR ${CMAKE_INSTALL_PREFIX}/share/ismrmrd/schema) + set(CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include) + set(CONFIG_ISMRMRD_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/lib) ++if (ISMRMRD_DATASET_SUPPORT) ++ list(APPEND CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS}) ++ list(APPEND CONFIG_ISMRMRD_LIBRARY_DIRS ${HDF5_LIBRARY_DIRS}) ++ list(APPEND ISMRMRD_LIBRARIES ${HDF5_LIBRARIES}) ++endif () + configure_file(cmake/ISMRMRDConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/InstallFiles/ISMRMRDConfig.cmake" + @ONLY diff --git a/patches/Fix-CMake-package-detection.patch b/patches/Fix-CMake-package-detection.patch new file mode 100644 index 0000000..379cae9 --- /dev/null +++ b/patches/Fix-CMake-package-detection.patch @@ -0,0 +1,27 @@ +From: Ghislain Antony Vaillant +Date: Wed, 16 Nov 2016 10:29:41 +0000 +Subject: Fix CMake package detection. + +--- + examples/c/CMakeLists.txt | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt +index 778ab5a..b9a30c4 100644 +--- a/examples/c/CMakeLists.txt ++++ b/examples/c/CMakeLists.txt +@@ -3,13 +3,7 @@ project(ISMRMRD-C-EXAMPLE) + + # if building this example as a standalone project + if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +- if(NOT DEFINED ENV{ISMRMRD_HOME}) +- message(FATAL_ERROR "ISMRMRD_HOME environment variable must be defined") +- endif() +- +- list(APPEND CMAKE_MODULE_PATH "$ENV{ISMRMRD_HOME}/share/ismrmrd/cmake") +- +- find_package(Ismrmrd REQUIRED) ++ find_package(ISMRMRD REQUIRED) + + # otherwise, building it as part of ISMRMRD itself + else() diff --git a/patches/Fix-HDF5-detection-with-CMake-3.6.patch b/patches/Fix-HDF5-detection-with-CMake-3.6.patch new file mode 100644 index 0000000..fc56011 --- /dev/null +++ b/patches/Fix-HDF5-detection-with-CMake-3.6.patch @@ -0,0 +1,30 @@ +From: Ghislain Antony Vaillant +Date: Thu, 1 Sep 2016 18:28:21 +0100 +Subject: Fix HDF5 detection with CMake 3.6. + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 665e106..5e9b1a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,7 +111,7 @@ find_package(HDF5 1.8 COMPONENTS C) + if (HDF5_FOUND) + set (ISMRMRD_DATASET_SUPPORT true) + set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp) +- set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR}) ++ set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_INCLUDE_DIRS}) + set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES}) + else () + set (ISMRMRD_DATASET_SUPPORT false) +@@ -146,7 +146,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES) + if(DEFINED ENV{HDF5_ROOT}) + set(HDF5_BIN_DIR $ENV{HDF5_ROOT}/bin) + else () +- set(HDF5_BIN_DIR ${HDF5_C_INCLUDE_DIR}/../bin) ++ set(HDF5_BIN_DIR ${HDF5_INCLUDE_DIRS}/../bin) + endif () + message("Install hdf5 libraries from ${HDF5_BIN_DIR} ") + install( DIRECTORY ${HDF5_BIN_DIR} DESTINATION bin/.. FILES_MATCHING PATTERN "*.dll" ) diff --git a/patches/Use-explicit-64-bit-shifts-in-testsuite.patch b/patches/Use-explicit-64-bit-shifts-in-testsuite.patch new file mode 100644 index 0000000..fde8a86 --- /dev/null +++ b/patches/Use-explicit-64-bit-shifts-in-testsuite.patch @@ -0,0 +1,30 @@ +From: Ghislain Antony Vaillant +Date: Wed, 3 Feb 2016 17:31:14 +0000 +Subject: Use explicit 64-bit shifts in testsuite. + +--- + tests/test_channels.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_channels.cpp b/tests/test_channels.cpp +index 54a1c8a..ec110f5 100644 +--- a/tests/test_channels.cpp ++++ b/tests/test_channels.cpp +@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(test_set_channel_on) + + for (int chan = 0; chan < 64 * ISMRMRD_CHANNEL_MASKS; chan++) { + BOOST_CHECK_EQUAL(ismrmrd_set_channel_on(channel_mask, chan), ISMRMRD_NOERROR); +- uint64_t bitmask = 1 << (chan % 64); ++ uint64_t bitmask = (uint64_t)1 << (chan % 64); + size_t offset = chan / 64; + BOOST_REQUIRE((channel_mask[offset] & bitmask) != 0); + } +@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(test_set_channel_off) + for (int chan = 0; chan < 64 * ISMRMRD_CHANNEL_MASKS; chan++) { + BOOST_CHECK_EQUAL(ismrmrd_set_channel_off(channel_mask, chan), ISMRMRD_NOERROR); + +- uint64_t bitmask = 1 << (chan % 64); ++ uint64_t bitmask = (uint64_t)1 << (chan % 64); + size_t offset = chan / 64; + BOOST_REQUIRE((channel_mask[offset] & bitmask) == 0); + } diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..36508a4 --- /dev/null +++ b/patches/series @@ -0,0 +1,6 @@ +Disable-HTML-timestamps.patch +Use-explicit-64-bit-shifts-in-testsuite.patch +Fix-HDF5-detection-with-CMake-3.6.patch +Fix-CMake-package-configuration.patch +Fix-CMake-package-detection.patch +Add-support-for-multiarch.patch diff --git a/rules b/rules new file mode 100755 index 0000000..51f2007 --- /dev/null +++ b/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Hardening flags. +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +export DEB_CXXFLAGS_MAINT_APPEND = -Wall -pedantic +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- -DUSE_SYSTEM_PUGIXML=ON + +override_dh_auto_build-indep: + dh_auto_build -- apidoc + +override_dh_auto_installdocs-indep: + dh_installdocs --indep + dh_doxygen --indep + +override_dh_compress: + dh_compress --exclude=examples + +override_dh_auto_test: + echo testsuite disabled diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/tests/control b/tests/control new file mode 100644 index 0000000..4171a46 --- /dev/null +++ b/tests/control @@ -0,0 +1,6 @@ +Test-Command: cd $AUTOPKGTEST_TMP + ; cmake /usr/share/doc/libismrmrd-doc/examples/c/ + ; make -j$(nproc) + ; ./ismrmrd_c_example +Depends: @, cmake, g++ | c++-compiler +Restrictions: allow-stderr diff --git a/watch b/watch new file mode 100644 index 0000000..5da2ace --- /dev/null +++ b/watch @@ -0,0 +1,3 @@ +version=3 +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/ismrmrd-$1\.tar\.gz/ \ + https://github.com/ismrmrd/ismrmrd/tags .*/v?(\d\S*)\.tar\.gz