[med-svn] r7392 - in trunk/packages/gofigure2/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Mon Aug 8 10:21:50 UTC 2011
Author: tille
Date: 2011-08-08 10:21:50 +0000 (Mon, 08 Aug 2011)
New Revision: 7392
Removed:
trunk/packages/gofigure2/trunk/debian/patches/qreal_getrgb.patch
Modified:
trunk/packages/gofigure2/trunk/debian/changelog
trunk/packages/gofigure2/trunk/debian/control
trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch
trunk/packages/gofigure2/trunk/debian/patches/series
trunk/packages/gofigure2/trunk/debian/rules
Log:
Updated packaging to new upstream version. However, the package does not build yet because of the vtk multiarch issues
Modified: trunk/packages/gofigure2/trunk/debian/changelog
===================================================================
--- trunk/packages/gofigure2/trunk/debian/changelog 2011-08-08 09:34:56 UTC (rev 7391)
+++ trunk/packages/gofigure2/trunk/debian/changelog 2011-08-08 10:21:50 UTC (rev 7392)
@@ -1,13 +1,19 @@
-gofigure2 (0.8.1-3) UNRELEASED; urgency=low
+gofigure2 (0.8.2-1) UNRELEASED; urgency=low
- -- The FTBFS issue (#629815) is somehow connected to multiarch transition
- and is discussed on debian-mentors list
- * Added myself to Uploaders
- * Standards-Version: 3.9.2 (no changes needed)
+-- The FTBFS issue (#629815) is somehow connected to multiarch transition
+ of vtk and is discussed on mailing list
+ * New upstream version
+ debian/patches/qreal_getrgb.patch: removed because applied upstream
+ debian/patches/apple_bundle_fix.patch: adapted to new version
+ * debian/control:
+ - Added myself to Uploaders
+ - Standards-Version: 3.9.2 (no changes needed)
+ - Build-Depends: libfftw3-dev which is needed in new version
* Debhelper 8 (control+compat)
* Remove wrongly placed file libgofigure0.lintian-overrides
+ * debian/rules: --parallel option needs to be added in the end
- -- Andreas Tille <tille at debian.org> Thu, 23 Jun 2011 13:01:27 +0200
+ -- Andreas Tille <tille at debian.org> Mon, 08 Aug 2011 11:45:09 +0200
gofigure2 (0.8.1-2) unstable; urgency=low
Modified: trunk/packages/gofigure2/trunk/debian/control
===================================================================
--- trunk/packages/gofigure2/trunk/debian/control 2011-08-08 09:34:56 UTC (rev 7391)
+++ trunk/packages/gofigure2/trunk/debian/control 2011-08-08 10:21:50 UTC (rev 7392)
@@ -5,7 +5,8 @@
DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>,
Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), cmake (>= 2.8.2), libboost-all-dev, libqt4-dev, libinsighttoolkit3-dev (>= 3.20), libvtk5-qt4-dev (>= 5.6),
+Build-Depends: debhelper (>= 8), cmake (>= 2.8.2), libboost-all-dev, libqt4-dev,
+ libinsighttoolkit3-dev (>= 3.20), libvtk5-qt4-dev (>= 5.6), libfftw3-dev,
libgdcm2-dev (>= 2.0.16), libqtwebkit-dev | libqt4-dev (<< 4.7)
Standards-Version: 3.9.2
Homepage: http://gofigure2.sourceforge.net
Modified: trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch 2011-08-08 09:34:56 UTC (rev 7391)
+++ trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch 2011-08-08 10:21:50 UTC (rev 7392)
@@ -1,18 +1,16 @@
-Index: GoFigure2-v0.8.1/Main/CMakeLists.txt
-===================================================================
---- GoFigure2-v0.8.1.orig/Main/CMakeLists.txt 2011-03-29 21:41:05.000000000 +0200
-+++ GoFigure2-v0.8.1/Main/CMakeLists.txt 2011-04-19 08:27:48.000000000 +0200
-@@ -307,6 +307,7 @@
- # install(SCRIPT ...).
- # Note that the image plugins depend on QtSvg and QtXml, and it got those
- # copied over.
+--- GoFigure2-v0.8.2.orig/Main/CMakeLists.txt
++++ GoFigure2-v0.8.2/Main/CMakeLists.txt
+@@ -318,6 +318,7 @@
+ # install(SCRIPT ...).
+ # Note that the image plugins depend on QtSvg and QtXml, and it got those
+ # copied over.
+IF( APPLE )
- INSTALL( CODE "
- file( GLOB_RECURSE QTPLUGINS
- \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\" )
-@@ -315,7 +316,6 @@
- "
- COMPONENT Runtime )
+ INSTALL( CODE "
+ file( GLOB_RECURSE QTPLUGINS
+ \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\" )
+@@ -328,7 +329,6 @@
+ )
+ ENDIF( USE_BUNDLE_UTILITIES )
-IF( APPLE )
#---------------------------------------------------------------------------
Deleted: trunk/packages/gofigure2/trunk/debian/patches/qreal_getrgb.patch
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/qreal_getrgb.patch 2011-08-08 09:34:56 UTC (rev 7391)
+++ trunk/packages/gofigure2/trunk/debian/patches/qreal_getrgb.patch 2011-08-08 10:21:50 UTC (rev 7392)
@@ -1,104 +0,0 @@
-This has been acknowledge as upstream bug:
-
-https://github.com/gofigure2/GoFigure2/commit/48fdaed0d575ae71f017cef8033cede7c5135f9b
-Index: GoFigure2-v0.8.1/Code/GUI/lib/TraceContainerBase.txx
-===================================================================
---- GoFigure2-v0.8.1.orig/Code/GUI/lib/TraceContainerBase.txx 2011-04-26 13:57:18.000000000 +0200
-+++ GoFigure2-v0.8.1/Code/GUI/lib/TraceContainerBase.txx 2011-04-26 13:57:20.000000000 +0200
-@@ -466,7 +466,7 @@
- boost::tuples::tie(it0, it1) =
- m_Container.get< Highlighted >().equal_range(true);
-
-- double r(1.), g(1.), b(1.), a(1.);
-+ qreal r(1.), g(1.), b(1.), a(1.);
-
- if ( iColor.isValid() )
- {
-@@ -993,4 +993,4 @@
-
- //-------------------------------------------------------------------------
-
--#endif
-\ No newline at end of file
-+#endif
-Index: GoFigure2-v0.8.1/Code/GUI/lib/QGoImageView.cxx
-===================================================================
---- GoFigure2-v0.8.1.orig/Code/GUI/lib/QGoImageView.cxx 2011-04-26 13:57:18.000000000 +0200
-+++ GoFigure2-v0.8.1/Code/GUI/lib/QGoImageView.cxx 2011-04-26 13:57:20.000000000 +0200
-@@ -200,7 +200,7 @@
- void
- QGoImageView::SetBackgroundColor(const QColor & iColor)
- {
-- double r, g, b;
-+ qreal r, g, b;
-
- iColor.getRgbF(&r, &g, &b);
-
-@@ -704,13 +704,13 @@
- m_NodesColor = nodecolor;
- m_ActiveNodesColor = activenodecolor;
-
-- double rl, gl, bl;
-+ qreal rl, gl, bl;
- linecolor.getRgbF(&rl, &gl, &bl);
-
-- double rn, gn, bn;
-+ qreal rn, gn, bn;
- nodecolor.getRgbF(&rn, &gn, &bn);
-
-- double ra, ga, ba;
-+ qreal ra, ga, ba;
- activenodecolor.getRgbF(&ra, &ga, &ba);
-
- std::vector< vtkSmartPointer< vtkOrientedGlyphContourRepresentation > >::iterator
-@@ -761,4 +761,4 @@
- ++it;
- ++i;
- }
--}
-\ No newline at end of file
-+}
-Index: GoFigure2-v0.8.1/Code/GUI/lib/QGoTabImageView4D.cxx
-===================================================================
---- GoFigure2-v0.8.1.orig/Code/GUI/lib/QGoTabImageView4D.cxx 2011-04-26 13:57:18.000000000 +0200
-+++ GoFigure2-v0.8.1/Code/GUI/lib/QGoTabImageView4D.cxx 2011-04-26 13:57:20.000000000 +0200
-@@ -1097,14 +1097,14 @@
- QColor activenodecolor; // =
- // m_ManualSegmentationWidget->GetActiveNodesColor();
-
-- double rl, gl, bl;
-+ qreal rl, gl, bl;
-
- linecolor.getRgbF(&rl, &gl, &bl);
-
-- double rn, gn, bn;
-+ qreal rn, gn, bn;
- nodecolor.getRgbF(&rn, &gn, &bn);
-
-- double ra, ga, ba;
-+ qreal ra, ga, ba;
- activenodecolor.getRgbF(&ra, &ga, &ba);
-
- for ( unsigned int i = 0; i < m_ContourRepresentation.size(); i++ )
-Index: GoFigure2-v0.8.1/Code/GUI/lib/QGoTabImageViewElementBase.cxx
-===================================================================
---- GoFigure2-v0.8.1.orig/Code/GUI/lib/QGoTabImageViewElementBase.cxx 2011-04-26 13:57:18.000000000 +0200
-+++ GoFigure2-v0.8.1/Code/GUI/lib/QGoTabImageViewElementBase.cxx 2011-04-26 13:57:20.000000000 +0200
-@@ -127,14 +127,14 @@
- QColor nodecolor = m_NodesColor;
- QColor activenodecolor = m_ActiveNodesColor;
-
-- double rl, gl, bl;
-+ qreal rl, gl, bl;
-
- linecolor.getRgbF(&rl, &gl, &bl);
-
-- double rn, gn, bn;
-+ qreal rn, gn, bn;
- nodecolor.getRgbF(&rn, &gn, &bn);
-
-- double ra, ga, ba;
-+ qreal ra, ga, ba;
- activenodecolor.getRgbF(&ra, &ga, &ba);
-
- for ( unsigned int i = 0; i < m_ContourRepresentation.size(); i++ )
Modified: trunk/packages/gofigure2/trunk/debian/patches/series
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/series 2011-08-08 09:34:56 UTC (rev 7391)
+++ trunk/packages/gofigure2/trunk/debian/patches/series 2011-08-08 10:21:50 UTC (rev 7392)
@@ -1,2 +1 @@
apple_bundle_fix.patch
-qreal_getrgb.patch
Modified: trunk/packages/gofigure2/trunk/debian/rules
===================================================================
--- trunk/packages/gofigure2/trunk/debian/rules 2011-08-08 09:34:56 UTC (rev 7391)
+++ trunk/packages/gofigure2/trunk/debian/rules 2011-08-08 10:21:50 UTC (rev 7392)
@@ -4,7 +4,7 @@
#export DH_VERBOSE=1
%:
- dh --parallel $@
+ dh $@ --parallel
override_dh_auto_configure:
dh_auto_configure -- -DGOFIGURE2_INSTALL_LIB_DIR:STRING=lib -DCMAKE_BUILD_TYPE:STRING=Release
More information about the debian-med-commit
mailing list