[med-svn] r10691 - trunk/packages/imagevis3d/trunk/debian/patches
Mathieu Malaterre
malat at alioth.debian.org
Fri May 4 13:44:51 UTC 2012
Author: malat
Date: 2012-05-04 13:44:50 +0000 (Fri, 04 May 2012)
New Revision: 10691
Modified:
trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch
trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch
trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch
trunk/packages/imagevis3d/trunk/debian/patches/glew.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch
trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch
trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch
trunk/packages/imagevis3d/trunk/debian/patches/manual.patch
trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch
trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch
trunk/packages/imagevis3d/trunk/debian/patches/remove_convenientlibs.patch
trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch
trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch
trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch
trunk/packages/imagevis3d/trunk/debian/patches/warning.patch
trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch
Log:
Use DEP3 for patches
Modified: trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Remove convenient jpeg copy
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.0.1/Tuvok/tvk.pro
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2011-12-09 09:51:15.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Allow compilation with system install bzip2 lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp
===================================================================
--- imagevis3d-2.1.0.orig/Tuvok/IO/RAWConverter.cpp 2011-12-08 18:11:45.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,6 +1,6 @@
Description: Fixed variable scoping issues to make GCC 4.7 happy.
Forwarded: not-needed
-Origin: vendor, https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=browse&path=/&view=rev&revision=1771
+Origin: upstream, https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=browse&path=/&view=rev&revision=1771
Bug-Debian: http://bugs.debian.org/667208
Author: James Hughes <jhughes at sci.utah.edu>
Modified: trunk/packages/imagevis3d/trunk/debian/patches/glew.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/glew.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/glew.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Remove convenient glew copy
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.0.1/Tuvok/tvk.pro
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2011-12-09 09:49:40.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Allow compilation with system install jpeg lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.0.1/Tuvok/IO/IOManager.cpp
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/IO/IOManager.cpp 2011-12-09 09:50:19.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Allow compilation with system install jpeg lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.0.1/Tuvok/IO/TuvokJPEG.cpp
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/IO/TuvokJPEG.cpp 2011-12-09 09:48:39.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Allow compilation with system install jpeg lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.1.0/ImageVis3D/UI/QDataRadioButton.cpp
===================================================================
--- imagevis3d-2.1.0.orig/ImageVis3D/UI/QDataRadioButton.cpp 2011-12-08 21:56:41.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,4 +1,8 @@
-https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=ScmCommitDetail&scm_commit_id=52110
+Description: Fix update issues on unsupported systems.
+Forwarded: not-needed
+Origin: upstream, https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=ScmCommitDetail&scm_commit_id=52110
+Author: tom fogal <tfogal at sci.utah.edu>
+
Index: imagevis3d-2.0.1/ImageVis3D/StdDefines.h
===================================================================
--- imagevis3d-2.0.1.orig/ImageVis3D/StdDefines.h 2011-12-20 13:56:23.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Add missing shared library links
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro
===================================================================
--- imagevis3d-2.0.1.orig/ImageVis3D/ImageVis3D.pro 2011-12-09 10:45:24.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/manual.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/manual.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/manual.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,4 +1,13 @@
-https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=ScmCommitDetail&scm_commit_id=52124
+Description: Use more portable Qt functions for opening manual.
+ .. or try to. Qt fails to open the damn thing sometimes, and even
+ worse it reports success even when it fails. Assuming it ever
+ actually fixes the error reporting, I left the code in to manually
+ launch a PDF viewer.
+ ref. https://bugreports.qt.nokia.com/browse/QTBUG-23123
+Forwarded: not-needed
+Origin: upstream, https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=ScmCommitDetail&scm_commit_id=52124
+Author: tom fogal <tfogal at sci.utah.edu>
+
Index: imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp
===================================================================
--- imagevis3d-2.0.1.orig/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-12 12:16:25.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,4 +1,10 @@
-https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52071
+Description: Add missing limits.h include.
+ Needed for PATH_MAX.
+ Reported-by: Mathieu Malaterre
+Forwarded: not-needed
+Origin: upstream, https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52071
+Author: tom fogal <tfogal at sci.utah.edu>
+
Index: imagevis3d-2.0.1/Tuvok/Basics/SysTools.cpp
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/Basics/SysTools.cpp 2011-12-09 15:49:51.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,4 +1,8 @@
-https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52089
+Description: Fix integer overflow issue.
+Forwarded: not-needed
+Origin: upstream, https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52089
+Author: tom fogal <tfogal at sci.utah.edu>
+
Index: imagevis3d-2.0.1/Tuvok/Basics/SystemInfo.cpp
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/Basics/SystemInfo.cpp 2011-12-09 15:48:07.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/remove_convenientlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/remove_convenientlibs.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/remove_convenientlibs.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Remove convenient libraries
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.1.0/Tuvok/IO/scio.pro
===================================================================
--- imagevis3d-2.1.0.orig/Tuvok/IO/scio.pro 2011-12-08 17:44:01.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Allow compilation with system install tiff lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.1.0/Tuvok/IO/StkConverter.cpp
===================================================================
--- imagevis3d-2.1.0.orig/Tuvok/IO/StkConverter.cpp 2011-12-08 21:40:24.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Allow compilation with system install tiff lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.0.1/Tuvok/tvk.pro
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2011-12-09 09:55:33.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,4 +1,10 @@
-https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52072
+Description: Make sure TUVOK_DETAILS always gets defined.
+ Even if it's just to say we have no idea what it should be. We'll
+ require this define later, so it needs to be *something*.
+Forwarded: not-needed
+Origin: upstream, https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52072
+Author: tom fogal <tfogal at sci.utah.edu>
+
Index: imagevis3d-2.0.1/Tuvok/Basics/StdDefines.h
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/Basics/StdDefines.h 2011-12-09 15:49:51.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/warning.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,4 +1,9 @@
-https://gforge.sci.utah.edu/gf/project/scio/scmsvn/?action=ScmCommitDetail&scm_commit_id=52091
+Description: Get rid of some variables which were never actually used.
+ gcc has a warning about this in newer versions.
+Forwarded: not-needed
+Origin: upstream, https://gforge.sci.utah.edu/gf/project/scio/scmsvn/?action=ScmCommitDetail&scm_commit_id=52091
+Author: tom fogal <tfogal at sci.utah.edu>
+
Index: imagevis3d-2.0.1/Tuvok/IO/AbstrGeoConverter.cpp
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/IO/AbstrGeoConverter.cpp 2011-12-09 15:49:57.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch 2012-05-04 13:30:40 UTC (rev 10690)
+++ trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch 2012-05-04 13:44:50 UTC (rev 10691)
@@ -1,3 +1,7 @@
+Description: Remove convenient zlib copy
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
Index: imagevis3d-2.0.1/Tuvok/IO/scio.pro
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/IO/scio.pro 2011-12-09 09:50:51.000000000 +0100
More information about the debian-med-commit
mailing list