[med-svn] r15534 - in trunk/packages/elastix/tags: . 4.6-1/debian 4.6-1/debian/patches
Steven Michael Robbins
smr at moszumanska.debian.org
Sat Dec 14 12:31:04 UTC 2013
Author: smr
Date: 2013-12-14 12:31:03 +0000 (Sat, 14 Dec 2013)
New Revision: 15534
Added:
trunk/packages/elastix/tags/4.6-1/
trunk/packages/elastix/tags/4.6-1/debian/changelog
trunk/packages/elastix/tags/4.6-1/debian/control
trunk/packages/elastix/tags/4.6-1/debian/patches/disable-mevisdicomtiff.patch
trunk/packages/elastix/tags/4.6-1/debian/patches/series
trunk/packages/elastix/tags/4.6-1/debian/rules
Removed:
trunk/packages/elastix/tags/4.6-1/debian/changelog
trunk/packages/elastix/tags/4.6-1/debian/control
trunk/packages/elastix/tags/4.6-1/debian/patches/series
trunk/packages/elastix/tags/4.6-1/debian/rules
Log:
[svn-buildpackage] Tagging elastix 4.6-1
Deleted: trunk/packages/elastix/tags/4.6-1/debian/changelog
===================================================================
--- trunk/packages/elastix/trunk/debian/changelog 2013-12-07 22:52:12 UTC (rev 15460)
+++ trunk/packages/elastix/tags/4.6-1/debian/changelog 2013-12-14 12:31:03 UTC (rev 15534)
@@ -1,70 +0,0 @@
-elastix (4.5-4) unstable; urgency=low
-
- * Team upload.
- * Build-depend on libtiff-dev, instead of libtiff4-dev.
-
- -- Dmitrijs Ledkovs <xnox at ubuntu.com> Thu, 05 Dec 2013 23:10:56 +0000
-
-elastix (4.5-3) unstable; urgency=low
-
- * debian/control:
- - cme fix dpkg-copyright
- - debhelper 9
- - Build-Depends-Indep: latex-xcolor
- Closes: #713280
- - Remove duplicated "Section: science"
- - Duplicated long description
- * debian/rules: use xz compression
- * debian/copyright:
- s/GNU Lesser Public License/GNU Lesser General Public License/
-
- -- Andreas Tille <tille at debian.org> Tue, 25 Jun 2013 08:14:19 +0200
-
-elastix (4.5-2) unstable; urgency=low
-
- * debian/control:
- - Standards-Version: 3.9.3 (no changes needed)
- - Fixed Vcs fields
- - Build-Depends: s/libpng12-dev/libpng-dev/
- Closes: 662311
- * debian/upstream:
- - Tasks file had a slightly more precise information about author
- - Valid BibTeX authors field
- - More precise information (authors, pmid, doi)
- * debian/copyright: Rewritten to match DEP5. verified using
- cme fix dpkg-copyright
- * Note: Tried debhelper 9 (control+compat) but failed for a reason which
- is totally unclear to me. There seems to be an error return code in
- the middle of the build process without any visible error message
-
- -- Andreas Tille <tille at debian.org> Fri, 11 May 2012 13:50:29 +0200
-
-elastix (4.5-1) unstable; urgency=low
-
- * New upstream.
-
- -- Steve M. Robbins <smr at debian.org> Thu, 13 Oct 2011 01:52:26 -0500
-
-elastix (4.4-2) unstable; urgency=low
-
- [ Andreas Tille ]
- * debian/control:
- - Fix name of Debian Med team (without '-')
- - Added Vcs fields
- - Fix typo in description
- Closes: #613621
- * Added debian/upstream-metadata.yaml
- * Added debian/watch (Thanks to Paul Wise <pabs at debian.org>
- and Daniel Leidert <daniel.leidert at wgdd.de>)
-
- [ Steve M. Robbins ]
- * target upload to unstable.
-
- -- Steve M. Robbins <smr at debian.org> Mon, 21 Feb 2011 10:30:55 -0600
-
-elastix (4.4-1) experimental; urgency=low
-
- * New package. Closes: #607030.
-
- -- Steve M. Robbins <smr at debian.org> Mon, 27 Dec 2010 06:01:00 -0600
-
Copied: trunk/packages/elastix/tags/4.6-1/debian/changelog (from rev 15533, trunk/packages/elastix/trunk/debian/changelog)
===================================================================
--- trunk/packages/elastix/tags/4.6-1/debian/changelog (rev 0)
+++ trunk/packages/elastix/tags/4.6-1/debian/changelog 2013-12-14 12:31:03 UTC (rev 15534)
@@ -0,0 +1,85 @@
+elastix (4.6-1) unstable; urgency=low
+
+ * New upstream version.
+ * control: Build-depend on libinsighttoolkit4-dev (instead of ITK 3).
+ * control(elastix): Build only architectures amd64 and i386, following ITK 4.
+
+ * patches/disable-mevisdicomtiff.patch: New. Fix build system to honour
+ ELASTIX_USE_MEVISDICOMTIFF=false
+ * rules: Build with ELASTIX_USE_MEVISDICOMTIFF=false.
+
+ * control: Add build-dep-indep on texlive-fonts-recommended to build
+ docs. Remove build-dep on libgdcm2-dev. Closes: #731921.
+
+ -- Steve M. Robbins <smr at debian.org> Fri, 13 Dec 2013 23:26:15 -0600
+
+elastix (4.5-4) unstable; urgency=low
+
+ * Team upload.
+ * Build-depend on libtiff-dev, instead of libtiff4-dev.
+
+ -- Dmitrijs Ledkovs <xnox at ubuntu.com> Thu, 05 Dec 2013 23:10:56 +0000
+
+elastix (4.5-3) unstable; urgency=low
+
+ * debian/control:
+ - cme fix dpkg-copyright
+ - debhelper 9
+ - Build-Depends-Indep: latex-xcolor
+ Closes: #713280
+ - Remove duplicated "Section: science"
+ - Duplicated long description
+ * debian/rules: use xz compression
+ * debian/copyright:
+ s/GNU Lesser Public License/GNU Lesser General Public License/
+
+ -- Andreas Tille <tille at debian.org> Tue, 25 Jun 2013 08:14:19 +0200
+
+elastix (4.5-2) unstable; urgency=low
+
+ * debian/control:
+ - Standards-Version: 3.9.3 (no changes needed)
+ - Fixed Vcs fields
+ - Build-Depends: s/libpng12-dev/libpng-dev/
+ Closes: 662311
+ * debian/upstream:
+ - Tasks file had a slightly more precise information about author
+ - Valid BibTeX authors field
+ - More precise information (authors, pmid, doi)
+ * debian/copyright: Rewritten to match DEP5. verified using
+ cme fix dpkg-copyright
+ * Note: Tried debhelper 9 (control+compat) but failed for a reason which
+ is totally unclear to me. There seems to be an error return code in
+ the middle of the build process without any visible error message
+
+ -- Andreas Tille <tille at debian.org> Fri, 11 May 2012 13:50:29 +0200
+
+elastix (4.5-1) unstable; urgency=low
+
+ * New upstream.
+
+ -- Steve M. Robbins <smr at debian.org> Thu, 13 Oct 2011 01:52:26 -0500
+
+elastix (4.4-2) unstable; urgency=low
+
+ [ Andreas Tille ]
+ * debian/control:
+ - Fix name of Debian Med team (without '-')
+ - Added Vcs fields
+ - Fix typo in description
+ Closes: #613621
+ * Added debian/upstream-metadata.yaml
+ * Added debian/watch (Thanks to Paul Wise <pabs at debian.org>
+ and Daniel Leidert <daniel.leidert at wgdd.de>)
+
+ [ Steve M. Robbins ]
+ * target upload to unstable.
+
+ -- Steve M. Robbins <smr at debian.org> Mon, 21 Feb 2011 10:30:55 -0600
+
+elastix (4.4-1) experimental; urgency=low
+
+ * New package. Closes: #607030.
+
+ -- Steve M. Robbins <smr at debian.org> Mon, 27 Dec 2010 06:01:00 -0600
+
Deleted: trunk/packages/elastix/tags/4.6-1/debian/control
===================================================================
--- trunk/packages/elastix/trunk/debian/control 2013-12-07 22:52:12 UTC (rev 15460)
+++ trunk/packages/elastix/tags/4.6-1/debian/control 2013-12-14 12:31:03 UTC (rev 15534)
@@ -1,57 +0,0 @@
-Source: elastix
-Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Steve M. Robbins <smr at debian.org>,
- Andreas Tille <tille at debian.org>
-Section: science
-Priority: optional
-Build-Depends: debhelper (>= 9),
- cmake,
- libinsighttoolkit3-dev (>= 3.20.0-5),
- libgdcm2-dev,
- zlib1g-dev,
- libpng-dev,
- libtiff-dev
-Build-Depends-Indep: doxygen,
- graphviz,
- texlive-latex-base,
- texlive-latex-extra,
- texlive-latex-recommended,
- ghostscript,
- latex-xcolor
-Standards-Version: 3.9.4
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/elastix/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/elastix/trunk/
-Homepage: http://elastix.isi.uu.nl/
-
-Package: elastix
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Suggests: elastix-doc
-Description: toolbox for rigid and nonrigid registration of images
- Image registration based on the well-known Insight Segmentation and
- Registration Toolkit (ITK). The software consists of a collection of
- algorithms that are commonly used to solve (medical) image
- registration problems. The modular design of elastix allows the user
- to quickly configure, test, and compare different registration
- methods for a specific application. A command-line interface enables
- automated processing of large numbers of data sets, by means of
- scripting.
-
-Package: elastix-doc
-Architecture: all
-Section: doc
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: toolbox for rigid and nonrigid registration of images - docs
- Image registration based on the well-known Insight Segmentation and
- Registration Toolkit (ITK). The software consists of a collection of
- algorithms that are commonly used to solve (medical) image
- registration problems. The modular design of elastix allows the user
- to quickly configure, test, and compare different registration
- methods for a specific application. A command-line interface enables
- automated processing of large numbers of data sets, by means of
- scripting.
- .
- This package contains the elastix documentation.
-
Copied: trunk/packages/elastix/tags/4.6-1/debian/control (from rev 15533, trunk/packages/elastix/trunk/debian/control)
===================================================================
--- trunk/packages/elastix/tags/4.6-1/debian/control (rev 0)
+++ trunk/packages/elastix/tags/4.6-1/debian/control 2013-12-14 12:31:03 UTC (rev 15534)
@@ -0,0 +1,57 @@
+Source: elastix
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Steve M. Robbins <smr at debian.org>,
+ Andreas Tille <tille at debian.org>
+Section: science
+Priority: optional
+Build-Depends: debhelper (>= 9),
+ cmake,
+ libinsighttoolkit4-dev,
+ zlib1g-dev,
+ libpng-dev,
+ libtiff-dev
+Build-Depends-Indep: doxygen,
+ graphviz,
+ texlive-latex-base,
+ texlive-latex-extra,
+ texlive-latex-recommended,
+ texlive-fonts-recommended,
+ ghostscript,
+ latex-xcolor
+Standards-Version: 3.9.5
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/elastix/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/elastix/trunk/
+Homepage: http://elastix.isi.uu.nl/
+
+Package: elastix
+Architecture: amd64 i386
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: elastix-doc
+Description: toolbox for rigid and nonrigid registration of images
+ Image registration based on the well-known Insight Segmentation and
+ Registration Toolkit (ITK). The software consists of a collection of
+ algorithms that are commonly used to solve (medical) image
+ registration problems. The modular design of elastix allows the user
+ to quickly configure, test, and compare different registration
+ methods for a specific application. A command-line interface enables
+ automated processing of large numbers of data sets, by means of
+ scripting.
+
+Package: elastix-doc
+Architecture: all
+Section: doc
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: toolbox for rigid and nonrigid registration of images - docs
+ Image registration based on the well-known Insight Segmentation and
+ Registration Toolkit (ITK). The software consists of a collection of
+ algorithms that are commonly used to solve (medical) image
+ registration problems. The modular design of elastix allows the user
+ to quickly configure, test, and compare different registration
+ methods for a specific application. A command-line interface enables
+ automated processing of large numbers of data sets, by means of
+ scripting.
+ .
+ This package contains the elastix documentation.
+
Copied: trunk/packages/elastix/tags/4.6-1/debian/patches/disable-mevisdicomtiff.patch (from rev 15532, trunk/packages/elastix/trunk/debian/patches/disable-mevisdicomtiff.patch)
===================================================================
--- trunk/packages/elastix/tags/4.6-1/debian/patches/disable-mevisdicomtiff.patch (rev 0)
+++ trunk/packages/elastix/tags/4.6-1/debian/patches/disable-mevisdicomtiff.patch 2013-12-14 12:31:03 UTC (rev 15534)
@@ -0,0 +1,93 @@
+Description: Correct sources to honour ELASTIX_USE_MEVISDICOMTIFF=false
+Origin: https://bugs.gentoo.org/attachment.cgi?id=350734&action=diff
+Forwarded: no
+Author: Gert Wollny gw.fossdev at gmail.com
+Reviewed-by: Steve M. Robbins <smr at debian.org>
+
+
+--- elastix-4.6.orig/src/Common/MevisDicomTiff/CMakeLists.txt
++++ elastix-4.6/src/Common/MevisDicomTiff/CMakeLists.txt
+@@ -3,7 +3,7 @@
+
+ IF( ELASTIX_USE_MEVISDICOMTIFF )
+ ADD_DEFINITIONS( -D_ELASTIX_USE_MEVISDICOMTIFF )
+-ENDIF()
++
+
+ ADD_LIBRARY( mevisdcmtiff
+ itkMevisDicomTiffImageIO.cxx
+@@ -18,3 +18,4 @@
+
+ # add mevisdcmtiff to the list of target_link_libraries in your cmakelists.txt file.
+
++ENDIF()
+--- elastix-4.6.orig/src/Core/CMakeLists.txt
++++ elastix-4.6/src/Core/CMakeLists.txt
+@@ -142,7 +142,6 @@
+ xoutlib
+ elxCommon
+ elxCore
+- ${mevisdcmtifflib}
+ ${AllComponentLibs}
+ ${ITK_LIBRARIES}
+ )
+@@ -155,11 +154,14 @@
+ xoutlib
+ elxCommon
+ elxCore
+- ${mevisdcmtifflib}
+ ${AllComponentLibs}
+ ${ITK_LIBRARIES}
+ )
+
++IF( ELASTIX_USE_MEVISDICOMTIFF )
++ TARGET_LINK_LIBRARIES( elastix ${mevisdcmtifflib})
++ TARGET_LINK_LIBRARIES( transformix ${mevisdcmtifflib})
++ENDIF( ELASTIX_USE_MEVISDICOMTIFF )
+ #---------------------------------------------------------------------
+ # Define the install directory for elastix and transformix.
+
+--- elastix-4.6.orig/src/Core/Main/elastix.cxx
++++ elastix-4.6/src/Core/Main/elastix.cxx
+@@ -64,8 +64,10 @@
+ typedef std::queue< ArgPairType > ParameterFileListType;
+ typedef ParameterFileListType::value_type ParameterFileListEntryType;
+
++#ifdef _ELASTIX_USE_MEVISDICOMTIFF
+ /** Support Mevis Dicom Tiff (if selected in cmake) */
+ RegisterMevisDicomTiff();
++#endif
+
+ /** Some declarations and initialisations. */
+ ElastixMainVectorType elastices;
+--- elastix-4.6.orig/src/Core/Main/transformix.cxx
++++ elastix-4.6/src/Core/Main/transformix.cxx
+@@ -55,9 +55,10 @@
+ typedef TransformixMainType::ArgumentMapType ArgumentMapType;
+ typedef ArgumentMapType::value_type ArgumentMapEntryType;
+
++#ifdef _ELASTIX_USE_MEVISDICOMTIFF
+ /** Support Mevis Dicom Tiff (if selected in cmake) */
+ RegisterMevisDicomTiff();
+-
++#endif
+ /** Declare an instance of the Transformix class. */
+ TransformixMainPointer transformix;
+
+--- elastix-4.6.orig/src/Testing/CMakeLists.txt
++++ elastix-4.6/src/Testing/CMakeLists.txt
+@@ -45,9 +45,13 @@
+ target_link_libraries( ${ELXTEST_EXECUTABLE_NAME}
+ elxCommon # needed for elxTimer
+ ${ITK_LIBRARIES}
+- ${mevisdcmtifflib}
+ )
+
++if( ELASTIX_USE_MEVISDICOMTIFF )
++ target_link_libraries( ${ELXTEST_EXECUTABLE_NAME} ${mevisdcmtifflib})
++endif( ELASTIX_USE_MEVISDICOMTIFF )
++
++
+ # Group in IDE's like Visual Studio
+ set_property( TARGET ${ELXTEST_EXECUTABLE_NAME} PROPERTY FOLDER "tests" )
+
Deleted: trunk/packages/elastix/tags/4.6-1/debian/patches/series
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/series 2013-12-07 22:52:12 UTC (rev 15460)
+++ trunk/packages/elastix/tags/4.6-1/debian/patches/series 2013-12-14 12:31:03 UTC (rev 15534)
@@ -1 +0,0 @@
-build-static-ann.patch
Copied: trunk/packages/elastix/tags/4.6-1/debian/patches/series (from rev 15532, trunk/packages/elastix/trunk/debian/patches/series)
===================================================================
--- trunk/packages/elastix/tags/4.6-1/debian/patches/series (rev 0)
+++ trunk/packages/elastix/tags/4.6-1/debian/patches/series 2013-12-14 12:31:03 UTC (rev 15534)
@@ -0,0 +1,2 @@
+disable-mevisdicomtiff.patch
+build-static-ann.patch
Deleted: trunk/packages/elastix/tags/4.6-1/debian/rules
===================================================================
--- trunk/packages/elastix/trunk/debian/rules 2013-12-07 22:52:12 UTC (rev 15460)
+++ trunk/packages/elastix/tags/4.6-1/debian/rules 2013-12-14 12:31:03 UTC (rev 15534)
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-
-%:
- dh $@ --sourcedirectory=src --parallel
-
-binary: binary-arch binary-indep
-
-binary-indep: doc-stamp
- dh $@ --sourcedirectory=src --parallel
-
-
-# Need -DUSE_KNNGraphAlphaMutualInformationMetric:BOOL=ON, otherwise
-# KNN is not built, and link of elastix fails.
-#
-DEB_CMAKE_EXTRA_FLAGS += \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=RELEASE \
- -DCMAKE_SKIP_RPATH=ON \
- -DUSE_KNNGraphAlphaMutualInformationMetric:BOOL=ON
-
-override_dh_auto_configure:
- dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
-
-override_dh_builddeb:
- dh_builddeb -- -Z xz
-
-doc: doc-stamp
-
-doc-stamp: help/html/index.html dox/manual/manual.pdf
- touch $@
-
-# build-deps: doxygen, latex, dot
-help/html/index.html: help/doxyfile.out
- doxygen $<
-
-dox/manual/manual.pdf: dox/manual/manual.tex
- cd dox/manual && latex manual && latex manual && dvipdf manual
-
Copied: trunk/packages/elastix/tags/4.6-1/debian/rules (from rev 15532, trunk/packages/elastix/trunk/debian/rules)
===================================================================
--- trunk/packages/elastix/tags/4.6-1/debian/rules (rev 0)
+++ trunk/packages/elastix/tags/4.6-1/debian/rules 2013-12-14 12:31:03 UTC (rev 15534)
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@ --sourcedirectory=src
+
+binary: binary-arch binary-indep
+
+binary-indep: doc-stamp
+ dh $@ --sourcedirectory=src --parallel
+
+
+# Need -DUSE_KNNGraphAlphaMutualInformationMetric:BOOL=ON, otherwise
+# KNN is not built, and link of elastix fails.
+#
+DEB_CMAKE_EXTRA_FLAGS += \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=RELEASE \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DELASTIX_USE_MEVISDICOMTIFF:BOOL=OFF \
+ -DUSE_KNNGraphAlphaMutualInformationMetric:BOOL=ON
+
+override_dh_auto_configure:
+ dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
+
+override_dh_builddeb:
+ dh_builddeb -- -Z xz
+
+doc: doc-stamp
+
+doc-stamp: help/html/index.html dox/manual/manual.pdf
+ touch $@
+
+# build-deps: doxygen, latex, dot
+help/html/index.html: help/doxyfile.out
+ doxygen $<
+
+dox/manual/manual.pdf: dox/manual/manual.tex
+ cd dox/manual && latex manual && latex manual && dvipdf manual
+
More information about the debian-med-commit
mailing list