[ismrmrd] 03/05: d/patches/*: changes due to new upstream release
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Jun 11 15:15:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository ismrmrd.
commit 7091a7bcec4eb6841e39226127a73aa8e6b1c8b8
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed Jun 11 13:08:28 2014 +0100
d/patches/*: changes due to new upstream release
applied upstream:
* 001-fix-test-ndarraycontainer.diff
* 003-fix-spelling-error-in-shepp-logan-bin
modified:
* 002-add-soversion.diff
- version set to 0.0.0, soversion to 0
+ set version and soversion to ismrmrd_xsd lib
---
debian/patches/00-add-soversion.diff | 51 ++++++++++++
debian/patches/001-fix-test-ndarraycontainer.diff | 92 ----------------------
debian/patches/002-add-soversion.diff | 35 --------
.../003-fix-spelling-error-in-shepp-logan-bin | 19 -----
debian/patches/series | 4 +-
5 files changed, 52 insertions(+), 149 deletions(-)
diff --git a/debian/patches/00-add-soversion.diff b/debian/patches/00-add-soversion.diff
new file mode 100644
index 0000000..ce0ddef
--- /dev/null
+++ b/debian/patches/00-add-soversion.diff
@@ -0,0 +1,51 @@
+From: Ghislain Vaillant <ghisvail at gmail.com>
+Subject: Add required soversioning
+ Upstream does not use soversioning, which is not compliant with the Debian
+ policy. This patch introduces a temporary soversion string.
+Forwarded: yes
+Bug: http://sourceforge.net/p/ismrmrd/tickets/11/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@
+
+ enable_testing()
+
+-#Set the build type to Release if not specified
++#Set the build type to Release if not specified
+ IF(NOT CMAKE_BUILD_TYPE)
+ SET(CMAKE_BUILD_TYPE Release CACHE STRING
+ "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+@@ -25,6 +25,17 @@
+ set(ISMRMRD_SCHEMA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/schema)
+ set(ISMRMRD_SCHEMA_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/xsd)
+
++set(ISMRMRD_MAJOR_VERSION 0)
++set(ISMRMRD_MINOR_VERSION 0)
++set(ISMRMRD_BUILD_VERSION 0)
++set(ISMRMRD_VERSION
++ "${ISMRMRD_MAJOR_VERSION}.${ISMRMRD_MINOR_VERSION}.${ISMRMRD_BUILD_VERSION}")
++set(ISMRMRD_SOVERSION "${ISMRMRD_MAJOR_VERSION}")
++set(ISMRMRD_LIBRARY_PROPERTIES ${ISMRMRD_LIBRARY_PROPERTIES}
++ VERSION "${ISMRMRD_VERSION}"
++ SOVERSION "${ISMRMRD_SOVERSION}"
++)
++
+ # add project specific cmake find modules
+ list(APPEND CMAKE_MODULE_PATH ${ISMRMRD_MODULE_DIR})
+
+@@ -54,6 +65,7 @@
+ endif(WIN32)
+
+ add_library(ismrmrd SHARED ismrmrd_hdf5.cpp)
++set_target_properties(ismrmrd PROPERTIES ${ISMRMRD_LIBRARY_PROPERTIES})
+ include_directories(${HDF5_C_INCLUDE_DIR} ${HDF5_CXX_INCLUDE_DIR}
+ ${Boost_INCLUDE_DIR})
+
+@@ -100,6 +112,7 @@
+
+ if ( NOT WIN32 )
+ add_library(ismrmrd_xsd SHARED ${XSDS_SOURCES})
++ set_target_properties(ismrmrd_xsd PROPERTIES ${ISMRMRD_LIBRARY_PROPERTIES})
+ include_directories(${XERCESC_INCLUDE_DIR})
+ target_link_libraries(ismrmrd_xsd ${XERCESC_LIBRARIES})
+ endif ( NOT WIN32 )
diff --git a/debian/patches/001-fix-test-ndarraycontainer.diff b/debian/patches/001-fix-test-ndarraycontainer.diff
deleted file mode 100644
index a390bcb..0000000
--- a/debian/patches/001-fix-test-ndarraycontainer.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-From: Ghislain Vaillant <ghisvail at gmail.com>
-Subject: Fixes broken test for t_ndarraycontainer
- MATLAB/FORTRAN indexing convention is used instead of C-style indexing,
- provoking an out-of-bounds access to memory. This patch fixes the indexing.
-Forwarded: yes
-Bug: http://sourceforge.net/p/ismrmrd/tickets/9/
---- a/tests/c++/t_ndarraycontainer.cpp
-+++ b/tests/c++/t_ndarraycontainer.cpp
-@@ -17,9 +17,8 @@
- static void random (NDArrayContainer<type>& ndac) {
- type mi = (type) std::numeric_limits<int>::max();
- assert (ndac.is_consistent());
-- size_t i = ndac.elements();
-- size_t j = ndac.data_.size();
-- for (; i>=1; i--)
-+ size_t j = ndac.elements();
-+ for (size_t i=0; i<j; i++)
- ndac[i] = 1.0 - 2.0 * (type)rand() / mi;
- }
-
-@@ -32,9 +31,8 @@
- static void random (NDArrayContainer<type>& ndac) {
- type mi = (type) std::numeric_limits<int>::max();
- assert (ndac.is_consistent());
-- size_t i = ndac.elements();
-- size_t j = ndac.data_.size();
-- for (; i>=1; i--)
-+ size_t j = ndac.elements();
-+ for (size_t i=0; i<j; i++)
- ndac[i] = 1.0 - 2.0 * (type)rand() / mi;
- }
-
-@@ -48,9 +46,8 @@
- static void random (NDArrayContainer<type>& ndac) {
- rtype mi = std::numeric_limits<int>::max();
- assert (ndac.is_consistent());
-- size_t i = ndac.elements();
-- size_t j = ndac.data_.size();
-- for (; i>=1; i--)
-+ size_t j = ndac.elements();
-+ for (size_t i=0; i<j; i++)
- ndac[i] = type(1.0, 1.0) - type(2.0 * (rtype)rand() / mi, 2.0 * (rtype)rand() / mi);
- }
-
-@@ -64,9 +61,8 @@
- static void random (NDArrayContainer<type>& ndac) {
- rtype mi = std::numeric_limits<int>::max();
- assert (ndac.is_consistent());
-- size_t i = ndac.elements();
-- size_t j = ndac.data_.size();
-- for (; i>=1; i--)
-+ size_t j = ndac.elements();
-+ for (size_t i=0; i<j; i++)
- ndac[i] = type(1.0, 1.0) - type(2.0 * (rtype)rand() / mi, 2.0 * (rtype)rand() / mi);
- }
-
-@@ -79,9 +75,8 @@
- static void random (NDArrayContainer<type>& ndac) {
- type mi = (type) std::numeric_limits<type>::max();
- assert (ndac.is_consistent());
-- size_t i = ndac.elements();
-- size_t j = ndac.data_.size();
-- for (; i>=1; i--)
-+ size_t j = ndac.elements();
-+ for (size_t i=0; i<j; i++)
- ndac[i] = rand();
- }
-
-@@ -94,9 +89,8 @@
- static void random (NDArrayContainer<type>& ndac) {
- type mi = (type) std::numeric_limits<type>::max();
- assert (ndac.is_consistent());
-- size_t i = ndac.elements();
-- size_t j = ndac.data_.size();
-- for (; i>=1; i--)
-+ size_t j = ndac.elements();
-+ for (size_t i=0; i<j; i++)
- ndac[i] = rand();
- }
-
-@@ -109,9 +103,8 @@
- static void random (NDArrayContainer<type>& ndac) {
- type mi = (type) std::numeric_limits<type>::max();
- assert (ndac.is_consistent());
-- size_t i = ndac.elements();
-- size_t j = ndac.data_.size();
-- for (; i>=1; i--)
-+ size_t j = ndac.elements();
-+ for (size_t i=0; i<j; i++)
- ndac[i] = rand();
- }
-
diff --git a/debian/patches/002-add-soversion.diff b/debian/patches/002-add-soversion.diff
deleted file mode 100644
index 0651be3..0000000
--- a/debian/patches/002-add-soversion.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Ghislain Vaillant <ghisvail at gmail.com>
-Subject: Add required soversioning
- Upstream does not use soversioning, which is not compliant with the Debian
- policy. This patch introduces a temporary soversion string.
-Forwarded: yes
-Bug: http://sourceforge.net/p/ismrmrd/tickets/11/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,6 +3,18 @@
-
- enable_testing()
-
-+SET(ISMRMRD_MAJOR_VERSION 0)
-+SET(ISMRMRD_MINOR_VERSION 5)
-+SET(ISMRMRD_BUILD_VERSION 2)
-+SET(ISMRMRD_VERSION
-+ "${ISMRMRD_MAJOR_VERSION}.${ISMRMRD_MINOR_VERSION}.${ISMRMRD_BUILD_VERSION}")
-+SET(ISMRMRD_SOVERSION
-+ "${ISMRMRD_MAJOR_VERSION}")
-+SET(ISMRMRD_LIBRARY_PROPERTIES ${ISMRMRD_LIBRARY_PROPERTIES}
-+ VERSION "${ISMRMRD_VERSION}"
-+ SOVERSION "${ISMRMRD_SOVERSION}"
-+)
-+
- if (WIN32)
- ADD_DEFINITIONS(-DWIN32 -D_WIN32 -D_WINDOWS)
- ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
-@@ -35,6 +47,7 @@
-
- # Add library ismrmrd
- add_library(ismrmrd SHARED ismrmrd_hdf5.cpp)
-+SET_TARGET_PROPERTIES(ismrmrd PROPERTIES ${ISMRMRD_LIBRARY_PROPERTIES})
-
- #The findHDF5.cmake does not work very well on Windows, let's help it out
- IF(WIN32)
diff --git a/debian/patches/003-fix-spelling-error-in-shepp-logan-bin b/debian/patches/003-fix-spelling-error-in-shepp-logan-bin
deleted file mode 100644
index 49d4412..0000000
--- a/debian/patches/003-fix-spelling-error-in-shepp-logan-bin
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fix spelling mistake reported by lintian
- Accelleration -> acceleration in ismrmrd_generate_cartesian_shepp_logan.
-Author: Ghislain Vaillant <ghisvail at gmail.com>
-Origin: other
-Forwarded: no
-Last-Update: 2014-04-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/utilities/generate_cartesian_shepp_logan.cpp
-+++ b/utilities/generate_cartesian_shepp_logan.cpp
-@@ -63,7 +63,7 @@
- }
-
- std::cout << "Generating Cartesian Shepp Logan Phantom" << std::endl;
-- std::cout << "Accelleration: " << acc_factor << std::endl;
-+ std::cout << "Acceleration: " << acc_factor << std::endl;
-
- boost::shared_ptr<NDArrayContainer<std::complex<float> > > phantom = shepp_logan_phantom(matrix_size);
- boost::shared_ptr<NDArrayContainer<std::complex<float> > > coils = generate_birdcage_sensititivies(matrix_size, ncoils, 1.5);
diff --git a/debian/patches/series b/debian/patches/series
index 1b3d1dd..6c2dc7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-001-fix-test-ndarraycontainer.diff
-002-add-soversion.diff
+00-add-soversion.diff
-003-fix-spelling-error-in-shepp-logan-bin
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git
More information about the debian-science-commits
mailing list