[med-svn] [gdcm] 03/07: Update package with new upstream version
Gert Wollny
gert-guest at moszumanska.debian.org
Fri Jan 8 21:08:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository gdcm.
commit 534870fb2ca96ec536abb92580982f9a3c09a99b
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Fri Jan 8 17:30:42 2016 +0100
Update package with new upstream version
---
debian/changelog | 7 +++
debian/control | 2 +-
debian/patches/05_cleanup_doxygen.patch | 66 ----------------------
.../06_fix_regression_with_ITK_test_suite.patch | 30 ----------
debian/patches/series | 2 -
5 files changed, 8 insertions(+), 99 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ea68925..4172ea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdcm (2.6.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * d/p: remove patches 05 and 06 since they were applied upstream
+
+ -- Gert Wollny <gw.fossdev at gmail.com> Fri, 08 Jan 2016 17:28:04 +0100
+
gdcm (2.6.1-3) unstable; urgency=medium
* Correctly set VCS path also in d/contol.in
diff --git a/debian/control b/debian/control
index 008a118..dbb6754 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Build-Depends-Indep: vtk6-doc,
doxygen-latex,
ghostscript,
graphviz
-Build-Conflicts: libopenjp2-7-dev
+Build-Conflicts: libopenjp2-7-dev
Standards-Version: 3.9.6
X-Python-Version: 2.7
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/gdcm.git
diff --git a/debian/patches/05_cleanup_doxygen.patch b/debian/patches/05_cleanup_doxygen.patch
deleted file mode 100644
index 03dbce0..0000000
--- a/debian/patches/05_cleanup_doxygen.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Clean out obsolete doxygen varieables.
- The doxygen tags SYMBOL_CACHE_SIZE, XML_SCHEMA, and XML_DTD
- are noe obsolete.
- Doxygen no longer ships with the FreeSans font.
-Author: Gert Wollny <gw.fossdev at gmail.com>
-
---- a/Utilities/doxygen/doxyfile.in
-+++ b/Utilities/doxygen/doxyfile.in
-@@ -319,22 +319,6 @@
-
- TYPEDEF_HIDES_STRUCT = NO
-
--# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
--# determine which symbols to keep in memory and which to flush to disk.
--# When the cache is full, less often used symbols will be written to disk.
--# For small to medium size projects (<1000 input files) the default value is
--# probably good enough. For larger projects a too small cache size can cause
--# doxygen to be busy swapping symbols to and from disk most of the time
--# causing a significant performance penalty.
--# If the system has enough physical memory increasing the cache will improve the
--# performance by keeping more symbols in memory. Note that the value works on
--# a logarithmic scale so increasing the size by one will roughly double the
--# memory usage. The cache size is given by this formula:
--# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
--# corresponding to a cache size of 2^16 = 65536 symbols.
--
--SYMBOL_CACHE_SIZE = 0
--
- # Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
- # set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
- # their name and scope. Since this can be an expensive process and often the
-@@ -1414,18 +1398,6 @@
-
- XML_OUTPUT = xml
-
--# The XML_SCHEMA tag can be used to specify an XML schema,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_SCHEMA =
--
--# The XML_DTD tag can be used to specify an XML DTD,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_DTD =
--
- # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
- # dump the program listings (including syntax highlighting
- # and cross-referencing information) to the XML output. Note that
-@@ -1631,15 +1603,6 @@
-
- DOT_NUM_THREADS = 1
-
--# By default doxygen will use the Helvetica font for all dot files that
--# doxygen generates. When you want a differently looking font you can specify
--# the font name using DOT_FONTNAME. You need to make sure dot is able to find
--# the font, which can be done by putting it in a standard location or by setting
--# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
--# directory containing the font.
--
--DOT_FONTNAME = FreeSans
--
- # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
- # The default size is 10pt.
-
diff --git a/debian/patches/06_fix_regression_with_ITK_test_suite.patch b/debian/patches/06_fix_regression_with_ITK_test_suite.patch
deleted file mode 100644
index 047d3b4..0000000
--- a/debian/patches/06_fix_regression_with_ITK_test_suite.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Sescription: Fix a regression that made ITK test suite fail
- We should not check for presence of Pixel Data at this point. This broke
- a test in ITK test suite.
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Origin: https://sourceforge.net/p/gdcm/gdcm/ci/11c5f4e8a6e8bc6368bdd04f1711f3be10c29a22/
-Forwarded: no
-Last-Update: 2015-12-21
-
---- a/Source/DataStructureAndEncodingDefinition/gdcmMediaStorage.cxx
-+++ b/Source/DataStructureAndEncodingDefinition/gdcmMediaStorage.cxx
-@@ -484,7 +484,9 @@
- bool MediaStorage::SetFromModality(DataSet const &ds)
- {
- // Ok let's try againg with little luck it contains a pixel data...
-- if( ds.FindDataElement( Tag(0x7fe0,0x0010) ) )
-+ // technically GDCM is called with a template DataSet before Pixel Data
-+ // is even set, so do not check for presence of this attribute at this point
-+ //if( ds.FindDataElement( Tag(0x7fe0,0x0010) ) )
- {
- // Pixel Data found !
- // Attempt to recover from the modality (0008,0060):
-@@ -512,7 +514,7 @@
- }
- return true;
- }
-- return false;
-+ //return false;
- }
-
- bool MediaStorage::SetFromFile(File const &file)
diff --git a/debian/patches/series b/debian/patches/series
index a8d8de3..9e084ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
02_fixhurd.patch
03_linkvtkdoc.patch
04_multiarch.patch
-05_cleanup_doxygen.patch
-06_fix_regression_with_ITK_test_suite.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git
More information about the debian-med-commit
mailing list