[SCM] Paraview packaging branch, master, updated. upstream/3.12.0-109-g0717536

Anton Gladky gladky.anton at gmail.com
Thu Nov 10 20:28:47 UTC 2011


The following commit has been merged in the master branch:
commit 57d464c3cfb433a3bda1789d862c0a739fb8e960
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Nov 10 21:17:49 2011 +0100

    Remove stddef_ptrdiff.patch. Applied by upsteam

diff --git a/debian/patches/series b/debian/patches/series
index 24de8e0..cc3d3d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 removegitcheck.patch
-stddef_ptrdiff.patch
 fix_manpages_errors.patch
 change_std_parameter_for_compiler.patch
 paraview-fix-libav07-compat.patch
diff --git a/debian/patches/stddef_ptrdiff.patch b/debian/patches/stddef_ptrdiff.patch
deleted file mode 100644
index 82b5b15..0000000
--- a/debian/patches/stddef_ptrdiff.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: fix compilation with gcc-4.6
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>, Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-06-21
-
---- a/VTK/Utilities/vtkmetaio/metaUtils.cxx
-+++ b/VTK/Utilities/vtkmetaio/metaUtils.cxx
-@@ -18,6 +18,7 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <stddef.h>
- 
- #include <sys/stat.h>
- #include <fcntl.h>
---- a/VTK/Wrapping/Python/PyVTKObject.cxx
-+++ b/VTK/Wrapping/Python/PyVTKObject.cxx
-@@ -32,7 +32,7 @@
- #include "vtkPythonUtil.h"
- #include "vtkObjectBase.h"
- #include "vtkDataArray.h"
--
-+#include <stddef.h>
- #include <vtksys/ios/sstream>
- 
- //--------------------------------------------------------------------

-- 
Paraview packaging



More information about the debian-science-commits mailing list