[med-svn] [odil] 01/01: Remove old patches
Julien Lamy
lamy-guest at moszumanska.debian.org
Fri May 13 14:34:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
lamy-guest pushed a commit to branch master
in repository odil.
commit a44180d9a77309740d2b163654bf680c2924d5e3
Author: Julien Lamy <lamy at unistra.fr>
Date: Fri May 13 16:32:39 2016 +0200
Remove old patches
---
debian/patches/804570.patch | 14 --------
debian/patches/807675.patch | 49 --------------------------
debian/patches/fix-install.patch | 15 --------
debian/patches/fix-soname.patch | 28 ---------------
debian/patches/fix-tests-boost1.56.patch | 26 --------------
debian/patches/fix-xml-converter-wrapper.patch | 13 -------
6 files changed, 145 deletions(-)
diff --git a/debian/patches/804570.patch b/debian/patches/804570.patch
deleted file mode 100644
index 6dda455..0000000
--- a/debian/patches/804570.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: Fix library SONAME
-Author: Julien Lamy <lamy at unistra.fr>
-Forwarded: https://github.com/lamyj/dcmtkpp/commit/0a7b8b9eb65be99b20b08f3b1b51b96da2dbcdf5
---- a/tests/code/Exception.cpp
-+++ b/tests/code/Exception.cpp
-@@ -31,6 +31,6 @@ BOOST_AUTO_TEST_CASE(ConditionConstructor)
- {
- dcmtkpp::Exception const exception(EC_IllegalParameter);
- BOOST_CHECK_EQUAL(exception.get_source(), dcmtkpp::Exception::Source::Condition);
-- BOOST_CHECK_EQUAL(exception.what(), EC_IllegalParameter.text());
-+ BOOST_CHECK_EQUAL(exception.what(), OFCondition(EC_IllegalParameter).text());
- BOOST_CHECK(exception.get_condition() == EC_IllegalParameter);
- }
-
diff --git a/debian/patches/807675.patch b/debian/patches/807675.patch
deleted file mode 100644
index ed45bf3..0000000
--- a/debian/patches/807675.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Subject: Disable network tests
-Author: Julien Lamy <lamy at unistra.fr>
-Forwarded: https://github.com/lamyj/odil/commit/06036d6487114fe0738b9772bae5c6b3826fd150
---- a/tests/run.sh
-+++ b/tests/run.sh
-@@ -3,6 +3,13 @@
- set -e
- set -u
-
-+if [ "${1:-}" = "--no-network" ]
-+then
-+ network="no"
-+else
-+ network="yes"
-+fi
-+
- configure() {
- cat > ${directory}/config << EOF
- HostTable BEGIN
-@@ -40,10 +47,13 @@ clean() {
- rm -rf ${directory}
- }
-
--directory=$(mktemp -d odil.XXX)
--configure
--start_scp
--add_data
-+if [ ${network} = "yes" ]
-+then
-+ directory=$(mktemp -d odil.XXX)
-+ configure
-+ start_scp
-+ add_data
-+fi
-
- export ODIL_OWN_AET=LOCAL
- export ODIL_PEER_HOST_NAME=127.0.0.1
-@@ -52,6 +62,9 @@ export ODIL_PEER_AET=REMOTE
-
- ctest --no-compress-output -T Test $@ || true
-
--stop_scp
--clean
-+if [ ${network} = "yes" ]
-+then
-+ stop_scp
-+ clean
-+fi
-
diff --git a/debian/patches/fix-install.patch b/debian/patches/fix-install.patch
deleted file mode 100644
index a51c2fb..0000000
--- a/debian/patches/fix-install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Subject: Fix install path of headers
-Origin: https://github.com/lamyj/odil/commit/98b570598c9f81e6a47fbe713b6ce91ec28b73c3
---- debian.orig/src/CMakeLists.txt 2016-02-29 17:00:55.030079890 +0100
-+++ debian/src/CMakeLists.txt 2016-02-29 17:03:35.865718095 +0100
-@@ -25,7 +25,9 @@
- VERSION ${odil_VERSION}
- SOVERSION ${odil_MAJOR_VERSION})
-
--install(FILES ${headers} ${templates} DESTINATION include/odil)
-+install(
-+ DIRECTORY odil/ DESTINATION include/odil
-+ FILES_MATCHING PATTERN "*.h" PATTERN "*.txx")
- install(
- TARGETS odil
- ARCHIVE DESTINATION lib
diff --git a/debian/patches/fix-soname.patch b/debian/patches/fix-soname.patch
deleted file mode 100644
index 1f02006..0000000
--- a/debian/patches/fix-soname.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Subject: Fix library SONAME
-Author: Julien Lamy <lamy at unistra.fr>
-Forwarded: https://github.com/lamyj/dcmtkpp/commit/3e56d7494f1856bd0c8cb9694919f5e99e446036
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,11 @@
- cmake_minimum_required(VERSION 2.8)
-+
- project("dcmtkpp")
-+set(dcmtkpp_MAJOR_VERSION 0)
-+set(dcmtkpp_MINOR_VERSION 2)
-+set(dcmtkpp_PATCH_VERSION 1)
-+set(dcmtkpp_VERSION
-+ ${dcmtkpp_MAJOR_VERSION}.${dcmtkpp_MINOR_VERSION}.${dcmtkpp_PATCH_VERSION})
-
- option(BUILD_EXAMPLES "Build the examples directory." ON)
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -17,5 +17,7 @@
- install(FILES ${headers} ${templates} DESTINATION include/dcmtkpp)
-
- target_link_libraries(dcmtkpp ${DCMTK_LIBRARIES} jsoncpp ${ICU_LIBRARIES})
--
-+set_target_properties(dcmtkpp PROPERTIES
-+ VERSION ${dcmtkpp_VERSION}
-+ SOVERSION ${dcmtkpp_MAJOR_VERSION})
-
diff --git a/debian/patches/fix-tests-boost1.56.patch b/debian/patches/fix-tests-boost1.56.patch
deleted file mode 100644
index ef38982..0000000
--- a/debian/patches/fix-tests-boost1.56.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: Fix unit tests due to change in the API of Boost 1.56
-Origin: https://github.com/lamyj/dcmtkpp/commit/ff05c0a391d4d1a3b28b61146b8065cbb41985b4
---- a/tests/code/xml_converter.cpp
-+++ b/tests/code/xml_converter.cpp
-@@ -3,8 +3,6 @@
-
- #include "dcmtkpp/xml_converter.h"
-
--#include <boost/property_tree/xml_parser.hpp>
--
- void check_attributes(boost::property_tree::ptree const & xml,
- std::string const & tag,
- std::string const & vr,
-@@ -896,11 +894,6 @@ BOOST_AUTO_TEST_CASE(AsDataSetDataSets)
- boost::property_tree::ptree dataset_xml;
- dataset_xml.add_child("NativeDicomModel", nativedicommodel);
-
-- std::stringstream xmldataset;
-- boost::property_tree::xml_writer_settings<char> settings(' ', 4);
-- boost::property_tree::write_xml(xmldataset, dataset_xml, settings);
--
-- std::cout << xmldataset.str() << std::endl;
- dcmtkpp::DataSet const data_set = dcmtkpp::as_dataset(dataset_xml);
- BOOST_REQUIRE_EQUAL(data_set.size(), 1);
- BOOST_REQUIRE(data_set.has("00101002"));
-
diff --git a/debian/patches/fix-xml-converter-wrapper.patch b/debian/patches/fix-xml-converter-wrapper.patch
deleted file mode 100644
index 27d98f7..0000000
--- a/debian/patches/fix-xml-converter-wrapper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: debian/wrappers/xml_converter.cpp
-Forwarded: https://github.com/lamyj/dcmtkpp/commit/518d401b203515393f19d0dd83640689713ed278
-===================================================================
---- debian.orig/wrappers/xml_converter.cpp 2016-04-08 18:25:31.159664311 +0200
-+++ debian/wrappers/xml_converter.cpp 2016-04-13 18:59:51.894461748 +0200
-@@ -8,6 +8,7 @@
-
- #include <boost/property_tree/xml_parser.hpp>
- #include <boost/python.hpp>
-+#include <boost/version.hpp>
-
- #include "odil/DataSet.h"
- #include "odil/xml_converter.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/odil.git
More information about the debian-med-commit
mailing list