[SCM] Paraview packaging branch, experimental, updated. debian/3.98.0-1_exp1-5-g08a2ada

Anton Gladky gladky.anton at gmail.com
Tue Feb 12 21:14:47 UTC 2013


The following commit has been merged in the experimental branch:
commit 1215b9ecd03731b8c0e116611fb2100e593ab828
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Feb 12 21:35:46 2013 +0100

    Remove some patches.

diff --git a/debian/patches/fix_format_not_a_string_FTBFS.patch b/debian/patches/fix_format_not_a_string_FTBFS.patch
deleted file mode 100644
index 4c84b2f..0000000
--- a/debian/patches/fix_format_not_a_string_FTBFS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix FTBFS "format not a string literal and no format arg"
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-10-14
-
---- a/Utilities/mpi4py/Library/mpi4py_MPI.c
-+++ b/Utilities/mpi4py/Library/mpi4py_MPI.c
-@@ -3619,7 +3619,7 @@
-  *                                   "cleanup with Py_AtExit()")
-  *         return 0
-  */
--        PySys_WriteStderr(__pyx_k_109);
-+        PySys_WriteStderr("%s",__pyx_k_109);
-         goto __pyx_L5;
-       }
-       __pyx_L5:;
-@@ -3874,7 +3874,7 @@
-  *                           "cleanup with Py_AtExit()")
-  *     return 0
-  */
--    PySys_WriteStderr(__pyx_k_112);
-+    PySys_WriteStderr("%s",__pyx_k_112);
-     goto __pyx_L11;
-   }
-   __pyx_L11:;
diff --git a/debian/patches/series b/debian/patches/series
index 80b5bd4..12c90db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-fix_format_not_a_string_FTBFS.patch
-workaround_strict-aliasing_in_mpi4py_MPI.patch
 fix_manpages_errors.patch
diff --git a/debian/patches/workaround_strict-aliasing_in_mpi4py_MPI.patch b/debian/patches/workaround_strict-aliasing_in_mpi4py_MPI.patch
deleted file mode 100644
index 2e630e0..0000000
--- a/debian/patches/workaround_strict-aliasing_in_mpi4py_MPI.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fixes the following FTBFS: 
- warning: dereferencing type-punned pointer will break strict-aliasing 
- rules [-Wstrict-aliasing]
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-11-24
-
---- a/Utilities/mpi4py/Library/CMakeLists.txt
-+++ b/Utilities/mpi4py/Library/CMakeLists.txt
-@@ -1,6 +1,6 @@
- FIND_PACKAGE(MPI)
- include(vtkPythonWrapping)
--
-+SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing")
- INCLUDE_DIRECTORIES(
-   ${MPI_INCLUDE_PATH}
-   ${PYTHON_INCLUDE_PATH}

-- 
Paraview packaging



More information about the debian-science-commits mailing list