[med-svn] r10690 - in trunk/packages/imagevis3d/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-05-04 13:30:40 +0000 (Fri, 04 May 2012)
New Revision: 10690

Added:
   trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch
Modified:
   trunk/packages/imagevis3d/trunk/debian/changelog
   trunk/packages/imagevis3d/trunk/debian/control
   trunk/packages/imagevis3d/trunk/debian/copyright
   trunk/packages/imagevis3d/trunk/debian/patches/series
   trunk/packages/imagevis3d/trunk/debian/rules
Log:
Prepare next upload

Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog	2012-05-04 12:57:49 UTC (rev 10689)
+++ trunk/packages/imagevis3d/trunk/debian/changelog	2012-05-04 13:30:40 UTC (rev 10690)
@@ -1,3 +1,13 @@
+imagevis3d (2.0.1-5) UNRELEASED; urgency=low
+
+  * Use my @d.o alias
+  * Fix compilation with gcc 4.7. Closes: #667208 
+  * Fix potential issue with libtiff5
+  * Use hardening flags for compilation
+  * Bump Std-Vers to 3.9.3, no changes needed
+
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 04 May 2012 15:22:38 +0200
+
 imagevis3d (2.0.1-4) unstable; urgency=low
 
   * Fix compilation errors on hurd/kFreeBSD.

Modified: trunk/packages/imagevis3d/trunk/debian/control
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/control	2012-05-04 12:57:49 UTC (rev 10689)
+++ trunk/packages/imagevis3d/trunk/debian/control	2012-05-04 13:30:40 UTC (rev 10690)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Uploaders: Mathieu Malaterre <malat at debian.org>
 Build-Depends: debhelper (>= 8), libqt4-dev, libqt4-opengl-dev, qt4-qmake, libtclap-dev, libglew-dev, libz-dev,
- libbz2-dev, libjpeg-dev, libtiff-dev, libboost-all-dev
-Standards-Version: 3.9.2
+ libbz2-dev, libjpeg-dev, libtiff5-dev | libtiff-dev, libboost-all-dev
+Standards-Version: 3.9.3
 Homepage: http://www.imagevis3d.com
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/imagevis3d/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/imagevis3d/trunk/

Modified: trunk/packages/imagevis3d/trunk/debian/copyright
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/copyright	2012-05-04 12:57:49 UTC (rev 10689)
+++ trunk/packages/imagevis3d/trunk/debian/copyright	2012-05-04 13:30:40 UTC (rev 10690)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ImageVis3D
 Upstream-Contact: Tom Fogal
 Source: http://www.imagevis3d.com
@@ -30,6 +30,6 @@
  DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
-Copyright: 2011; Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Copyright: 2011; Mathieu Malaterre <malat at debian.org>
 License: MIT
  Same as above

Added: trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/gcc47.patch	2012-05-04 13:30:40 UTC (rev 10690)
@@ -0,0 +1,24 @@
+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
+Bug-Debian: http://bugs.debian.org/667208
+Author: James Hughes <jhughes at sci.utah.edu>
+
+Index: imagevis3d-2.0.1/UVFReader/main.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/UVFReader/main.cpp	2011-12-12 12:16:18.000000000 +0100
++++ imagevis3d-2.0.1/UVFReader/main.cpp	2012-05-04 15:18:46.768847625 +0200
+@@ -431,11 +431,11 @@
+               uvfFile.Close();
+               return EXIT_FAILURE;
+             }
+-            size_t j = 0;
++            size_t jj = 0;
+             for (size_t y = 0;y<ulTransformDimension;y++) {
+               cout << "        ";
+               for (size_t x = 0;x<ulTransformDimension;x++) {
+-                cout << " " << b->dDomainTransformation[j++];
++                cout << " " << b->dDomainTransformation[jj++];
+               }
+               cout << endl;
+             }

Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series	2012-05-04 12:57:49 UTC (rev 10689)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series	2012-05-04 13:30:40 UTC (rev 10690)
@@ -15,3 +15,4 @@
 warning.patch
 manual.patch
 kfreebsd.patch
+gcc47.patch

Modified: trunk/packages/imagevis3d/trunk/debian/rules
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/rules	2012-05-04 12:57:49 UTC (rev 10689)
+++ trunk/packages/imagevis3d/trunk/debian/rules	2012-05-04 13:30:40 UTC (rev 10690)
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+export LDFLAGS=-Wl,--as-needed
+
 %:
 	dh $@  --parallel