[python-escript] 02/03: Remove unused patches

Anton Gladky gladk at moszumanska.debian.org
Sat Dec 9 22:36:54 UTC 2017


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch debian
in repository python-escript.

commit 39dc2722aa9267de6a9e98af12c653da396961a0
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Dec 9 23:35:39 2017 +0100

    Remove unused patches
---
 debian/patches/fixFTBFS.patch | 24 ------------------------
 debian/patches/fixopenmpiconf | 17 -----------------
 debian/patches/rootintar      | 13 -------------
 debian/patches/series         |  6 ------
 4 files changed, 60 deletions(-)

diff --git a/debian/patches/fixFTBFS.patch b/debian/patches/fixFTBFS.patch
deleted file mode 100644
index 9bb193f..0000000
--- a/debian/patches/fixFTBFS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fixes FTBFS duew to the warnings-as-error hardening
-Author: Paul Dreik <debianbugs at pauldreik.se>
-Acked-By: Anton Gladky <gladk at debian.org>
-Bug-Debian: https://bugs.debian.org/860604
-Last-Update: 2017-04-19
-
---- python-escript-5.0.orig/escriptcore/src/BinaryDataReadyOps.cpp
-+++ python-escript-5.0/escriptcore/src/BinaryDataReadyOps.cpp
-@@ -312,6 +312,7 @@ inline void binaryOpDataReadyHelperEET(D
-   LSCALAR dummyl=0;
-   RSCALAR dummyr=0;
-   DataTypes::RealVectorType::size_type valcount=res.getNumDPPSample()*DataTypes::noValues(res.getShape());
-+  (void)valcount;
- 
-     escript::binaryOpVectorTagged(res.getTypedVectorRW(resdummy), 
- 			      res.getNumSamples(),res.getNumDPPSample(), DataTypes::noValues(res.getShape()), 
-@@ -370,6 +371,7 @@ inline void binaryOpDataReadyHelperETE(D
-   LSCALAR dummyl=0;
-   RSCALAR dummyr=0;
-   DataTypes::RealVectorType::size_type valcount=res.getNumDPPSample()*DataTypes::noValues(res.getShape());
-+  (void)valcount;
- 
-     escript::binaryOpVectorTagged(res.getTypedVectorRW(resdummy), 
- 			      res.getNumSamples(),res.getNumDPPSample(), DataTypes::noValues(res.getShape()), 
diff --git a/debian/patches/fixopenmpiconf b/debian/patches/fixopenmpiconf
deleted file mode 100644
index c61bb75..0000000
--- a/debian/patches/fixopenmpiconf
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fixopenmpiconf
-Find where the libraries actually are
---- a/scons/templates/sid_options.py
-+++ b/scons/templates/sid_options.py
-@@ -21,7 +21,11 @@ escript_opts_version = 203
- #cxx_extra = '-Wno-literal-suffix'
- openmp = True
- #mpi = 'OPENMPI'
--mpi_prefix = '/usr/lib/openmpi'
-+
-+import os
-+
-+d_mpi_path = '/usr/include/openmpi'
-+mpi_prefix = os.path.split(os.path.realpath(d_mpi_path))[0]
- mpi_libs = ['mpi_cxx', 'mpi']
- netcdf = True
- #umfpack = True
diff --git a/debian/patches/rootintar b/debian/patches/rootintar
deleted file mode 100644
index ef9dd8f..0000000
--- a/debian/patches/rootintar
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Rootintar
-Make sure files are owned by root
---- a/doc/SConscript
-+++ b/doc/SConscript
-@@ -199,7 +199,7 @@ env.Alias('examples_zipfile', zip)
- 
- tar_path=os.path.join(release_dir, 'escript_examples.tar')
- targz_path=os.path.join(release_dir, 'escript_examples.tar.gz')
--tar = local_env.Command(tar_path, None, dir_cmd+"tar -cf "+tar_path+" "+" ".join(ex2))
-+tar = local_env.Command(tar_path, None, dir_cmd+"tar --owner=root --group=root --numeric-owner -cf "+tar_path+" "+" ".join(ex2))
- targz = local_env.Command(targz_path, tar, "gzip -n -9 "+tar_path)
- env.Alias('examples_tarfile', targz)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 717a27d..574439c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
-#release-sanity
-#mpi-gaol
-#grammar-errors
-#relocating-debian-dir
-#dateless-gz
-#rootintar
 manspelling
 fixmathjax
 fixsphinxversion

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-escript.git



More information about the debian-science-commits mailing list