[med-svn] [itksnap] 03/15: start packaging new upstream
Gert Wollny
gert-guest at moszumanska.debian.org
Wed Jan 14 15:57:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository itksnap.
commit aecff422a82a96026f2423a4a5b8263414c1e423
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Wed Jan 14 15:30:02 2015 +0100
start packaging new upstream
---
CMakeLists.txt | 8 +++
debian/changelog | 17 ++++--
debian/compat | 2 +-
debian/control | 14 ++++-
debian/copyright | 8 ---
debian/itksnap.dirs | 6 +-
.../01_add_required_vtklibraries_and_gdcm.patch | 42 ++++++++++++++
debian/patches/debian_path_cfg | 16 ------
debian/patches/gcc-4.7.patch | 67 ----------------------
debian/patches/no_find_package_version | 18 ------
debian/patches/series | 4 +-
debian/rules | 28 +--------
12 files changed, 82 insertions(+), 148 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8350e69..35461ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -824,6 +824,8 @@ ENDIF( CMAKE_GENERATOR MATCHES "^NMake" OR CMAKE_GENERATOR MATCHES "^Visual Stud
# ITK Libraries
SET(SNAP_ITK_LIBS ${ITK_LIBRARIES})
+FIND_PACKAGE(GDCM REQUIRED)
+INCLUDE (${GDCM_USE_FILE})
# Core VTK libraries
SET(SNAP_VTK_LIBS
@@ -831,8 +833,10 @@ SET(SNAP_VTK_LIBS
vtkCommonCore
vtkRenderingCore
vtkRenderingFreeType
+ vtkRenderingFreeTypeFontConfig
vtkRenderingFreeTypeOpenGL
vtkRenderingOpenGL
+ vtkRenderingMatplotlib
vtkRenderingVolume
vtkRenderingVolumeOpenGL
vtkFiltersCore
@@ -843,6 +847,9 @@ SET(SNAP_VTK_LIBS
vtkIOExport
vtkIOGeometry
vtkIOLegacy
+ vtkIOImage
+ vtkIOMPIImage
+ vtkIOMPIParallel
)
# System libraries
@@ -850,6 +857,7 @@ SET(SNAP_SYSTEM_LIBS
${OPENGL_LIBRARIES}
${OPENGL_glu_LIBRARY}
${SYSTEM_LIBS}
+ gdcmCommon
)
# Designate the external libraries used by SNAP
diff --git a/debian/changelog b/debian/changelog
index 2a73bc8..462ebdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-itksnap (2.2.0-2) UNRELEASED; urgency=low
-
- * Add debian/upstream with citation information.
-
- -- Michael Hanke <mih at debian.org> Sun, 24 Jun 2012 17:43:18 +0200
+itksnap (3.2.0-1) UNRELEASED; urgency=low
+
+ [ Gert Wollny ]
+ * new upstream release
+ * change dependencies to new requirements for ITK, VTK, and QT
+ * clean rules file
+ * add patch to include vtk and gdcm libraries that are required for
+ linking on Debian
+ * update standards version to 3.9.6
+ * Set debhelper compatibility to 9
+
+ -- Gert Wollny <gw.fossdev at gmail.com> Wed, 14 Jan 2015 15:20:25 +0100
itksnap (2.2.0-1.1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 8a18f62..8d69589 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,18 @@ Source: itksnap
Priority: extra
Maintainer: NeuroDebian Team <team at neuro.debian.net>
Uploaders: Michael Hanke <mih at debian.org>, Yaroslav Halchenko <debian at onerussian.com>
-Build-Depends: debhelper (>= 7.0.50~), cmake, imagemagick, libvtk5-dev, libinsighttoolkit3-dev, libgdcm2-dev, libfltk1.1-dev, fluid, libopenjpeg-dev, libfftw3-dev, uuid-dev, libxinerama-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9.0.0),
+ cmake,
+ libvtk6-dev,
+ libinsighttoolkit4-dev,
+ libgdcm2-dev,
+ libdcmtk2-dev,
+ qtbase5-dev, # QT5 also required by vtk6 but not pulled in by its dev package
+ libqt5webkit5-dev,
+ libqt5opengl5-dev,
+ qttools5-private-dev
+
+Standards-Version: 3.9.6
Section: science
Homepage: http://www.itksnap.org
XS-DM-Upload-Allowed: yes
diff --git a/debian/copyright b/debian/copyright
index 3feb741..3755863 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,14 +11,6 @@ License: GPL-3
On Debian systems the full text of the GNU General Public License can be found
in the `/usr/share/common-licenses/GPL-3' file.
-
-Files: Utilities/FLTK/Fl_Native_File_Chooser/*
-Copyright: Copyright 2004-2005 by Greg Ercolanoa, Nathan Vander Wilt
-License: LGPL
- On Debian systems the full text of the GNU Library General Public License can
- be found in the `/usr/share/common-licenses/LGPL-2' file.
-
-
Files: debian/*
Copyright: Copyright 2010, Michael Hanke <michael.hanke at gmail.com>
License: GPL-3
diff --git a/debian/itksnap.dirs b/debian/itksnap.dirs
index a360420..abdbf4c 100644
--- a/debian/itksnap.dirs
+++ b/debian/itksnap.dirs
@@ -1,3 +1,3 @@
-usr/lib/itksnap
-usr/share/itksnap
-usr/share/pixmaps
+usr/lib/
+usr/bin/
+
diff --git a/debian/patches/01_add_required_vtklibraries_and_gdcm.patch b/debian/patches/01_add_required_vtklibraries_and_gdcm.patch
new file mode 100644
index 0000000..b59ced3
--- /dev/null
+++ b/debian/patches/01_add_required_vtklibraries_and_gdcm.patch
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8350e69..35461ea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -824,6 +824,8 @@ ENDIF( CMAKE_GENERATOR MATCHES "^NMake" OR CMAKE_GENERATOR MATCHES "^Visual Stud
+
+ # ITK Libraries
+ SET(SNAP_ITK_LIBS ${ITK_LIBRARIES})
++FIND_PACKAGE(GDCM REQUIRED)
++INCLUDE (${GDCM_USE_FILE})
+
+ # Core VTK libraries
+ SET(SNAP_VTK_LIBS
+@@ -831,8 +833,10 @@ SET(SNAP_VTK_LIBS
+ vtkCommonCore
+ vtkRenderingCore
+ vtkRenderingFreeType
++ vtkRenderingFreeTypeFontConfig
+ vtkRenderingFreeTypeOpenGL
+ vtkRenderingOpenGL
++ vtkRenderingMatplotlib
+ vtkRenderingVolume
+ vtkRenderingVolumeOpenGL
+ vtkFiltersCore
+@@ -843,6 +847,9 @@ SET(SNAP_VTK_LIBS
+ vtkIOExport
+ vtkIOGeometry
+ vtkIOLegacy
++ vtkIOImage
++ vtkIOMPIImage
++ vtkIOMPIParallel
+ )
+
+ # System libraries
+@@ -850,6 +857,7 @@ SET(SNAP_SYSTEM_LIBS
+ ${OPENGL_LIBRARIES}
+ ${OPENGL_glu_LIBRARY}
+ ${SYSTEM_LIBS}
++ gdcmCommon
+ )
+
+ # Designate the external libraries used by SNAP
diff --git a/debian/patches/debian_path_cfg b/debian/patches/debian_path_cfg
deleted file mode 100644
index fa76d6b..0000000
--- a/debian/patches/debian_path_cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Patch to set proper data paths
- By default itksnap wants all data to be relavtive to its install directory.
- On Debian systems, however, it is located in /usr/share/itksnap.
-Forwarded: not-needed
-Author: Michael Hanke <michael.hanke at gmail.com>
---- a/Common/SystemInterface.cxx
-+++ b/Common/SystemInterface.cxx
-@@ -221,7 +221,7 @@
- vPathList.push_back(
- SystemTools::GetFilenamePath(
- SystemTools::GetFilenamePath(sExeFullPath)) +
-- "/share/snap/ProgramData");
-+ "/share/itksnap/ProgramData");
-
- // Search for the token file in the path list
- StringType sFoundFile =
diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch
deleted file mode 100644
index dbd22ea..0000000
--- a/debian/patches/gcc-4.7.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: add this-> qualifier to avoid FTBFS with gcc 4.7
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/667211
-Forwarded: no
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2012-05-04
-
---- a/Logic/LevelSet/SNAPAdvectionFieldImageFilter.txx
-+++ b/Logic/LevelSet/SNAPAdvectionFieldImageFilter.txx
-@@ -85,7 +85,7 @@
-
- // graft the mini-pipeline output back onto this filter's output.
- // this is needed to get the appropriate regions passed back.
-- GraftOutput( fltPipeEnd->GetOutput() );
-+ this->GraftOutput( fltPipeEnd->GetOutput() );
- }
-
- template<class TInputImage, class TOutputValueType>
---- a/Logic/Preprocessing/EdgePreprocessingImageFilter.txx
-+++ b/Logic/Preprocessing/EdgePreprocessingImageFilter.txx
-@@ -117,7 +117,7 @@
-
- // graft the mini-pipeline output back onto this filter's output.
- // this is needed to get the appropriate regions passed back.
-- GraftOutput( m_RemappingFilter->GetOutput() );
-+ this->GraftOutput( m_RemappingFilter->GetOutput() );
-
- }
-
---- a/Logic/Preprocessing/SmoothBinaryThresholdImageFilter.txx
-+++ b/Logic/Preprocessing/SmoothBinaryThresholdImageFilter.txx
-@@ -85,7 +85,7 @@
-
- // graft the mini-pipeline output back onto this filter's output.
- // this is needed to get the appropriate regions passed back.
-- GraftOutput( m_ThresholdFilter->GetOutput() );
-+ this->GraftOutput( m_ThresholdFilter->GetOutput() );
- }
-
- template<typename TInputImage,typename TOutputImage>
---- a/UserInterface/BasicComponents/FLTKWidgetActivationManager.h
-+++ b/UserInterface/BasicComponents/FLTKWidgetActivationManager.h
-@@ -295,21 +295,21 @@
- void AddWidget(Fl_Widget *widget, TFlag flag)
- {
- typedef GenericWidgetWrapper<Fl_Widget,TFlag> WrapperType;
-- AddWidgetWrapper(new WrapperType(widget), flag);
-+ this->AddWidgetWrapper(new WrapperType(widget), flag);
- }
-
- /** Associate an FLTK menu item with a flag */
- void AddMenuItem(Fl_Menu_Item *menu, TFlag flag)
- {
- typedef GenericWidgetWrapper<Fl_Menu_Item,TFlag> WrapperType;
-- AddWidgetWrapper(new WrapperType(menu), flag);
-+ this->AddWidgetWrapper(new WrapperType(menu), flag);
- }
-
- /** Associate an FLTK checkbox with a flag and two values */
- void AddCheckBox(Fl_Check_Button *cb, TFlag flag, bool onState, bool offState)
- {
- typedef ValuatorWidgetWrapper<Fl_Check_Button, int, TFlag> WrapperType;
-- AddWidgetWrapper(new WrapperType(cb,onState ? 1 : 0,offState ? 1 : 0), flag);
-+ this->AddWidgetWrapper(new WrapperType(cb,onState ? 1 : 0,offState ? 1 : 0), flag);
- }
-
- protected:
diff --git a/debian/patches/no_find_package_version b/debian/patches/no_find_package_version
deleted file mode 100644
index cc302df..0000000
--- a/debian/patches/no_find_package_version
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMake/standalone.cmake
-+++ b/CMake/standalone.cmake
-@@ -1,13 +1,13 @@
- #############################################
- # REQUIRE ITK 3.20 OR LATER #
- #############################################
--FIND_PACKAGE(ITK 3.20 REQUIRED)
-+FIND_PACKAGE(ITK REQUIRED)
- INCLUDE(${ITK_USE_FILE})
-
- #############################################
- # REQUIRE VTK #
- #############################################
--FIND_PACKAGE(VTK 5.6 REQUIRED)
-+FIND_PACKAGE(VTK REQUIRED)
- INCLUDE (${VTK_USE_FILE})
-
- #############################################
diff --git a/debian/patches/series b/debian/patches/series
index 81b5792..08a50c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-debian_path_cfg
-no_find_package_version
-gcc-4.7.patch
+01_add_required_vtklibraries_and_gdcm.patch
diff --git a/debian/rules b/debian/rules
index 2797976..17413d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
-srcpkg = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Source:' | cut -d ' ' -f 2,2)
-upstreamver = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Version:' | cut -d ' ' -f 2,2 | cut -d '-' -f 1,1)
-
-
-export LDFLAGS = -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_CXXFLAGS_MAINT_APPEND = -fPIC
# one ring to rule them all ...
%:
@@ -13,30 +10,11 @@ export LDFLAGS = -Wl,--as-needed
override_dh_auto_configure:
- dh_auto_configure -- -DSNAP_USE_FLTK_1_1:BOOL=ON
+ dh_auto_configure -- -DSNAP_PACKAGES_QT_PLUGINS=OFF
override_dh_auto_install:
dh_auto_install
- # move data files to /usr/share
- mv $(CURDIR)/debian/itksnap/usr/lib/snap*/ProgramData \
- $(CURDIR)/debian/itksnap/usr/share/itksnap/
- # get rid of application "forwarder"
- mv $(CURDIR)/debian/itksnap/usr/lib/snap*/InsightSNAP \
- $(CURDIR)/debian/itksnap/usr/bin/itksnap
- # remove left-overs
- rm -r $(CURDIR)/debian/itksnap/usr/lib
- # use one of the pix as an icon
convert $(CURDIR)/ProgramData/Images2D/EdgeForcesExample.png -resize 32x32 \
$(CURDIR)/debian/itksnap/usr/share/pixmaps/itksnap.xpm
- # strip useless CMakeLists
- find $(CURDIR)/debian/itksnap/usr -name 'CMakeLists.txt' -delete
-
-get-orig-source:
- # orig tarball, turn directory into something nicer
- touch $(srcpkg)_$(upstreamver).orig.tar.gz
- tar --exclude='.git*' --exclude=debian --exclude=.pc \
- --exclude=$(srcpkg)_$(upstreamver).orig.tar.gz \
- --transform 's,^,$(srcpkg)-$(upstreamver)/,' \
- -cvzf $(srcpkg)_$(upstreamver).orig.tar.gz .
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/itksnap.git
More information about the debian-med-commit
mailing list