[silo-llnl] 61/96: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository silo-llnl.
commit 3885461527890026712d2065766a4d041633c94f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Mar 4 14:25:11 2014 +0000
refresh patches
---
debian/patches/python3.patch | 24 ++++++++++++------------
debian/patches/qt-version.patch | 19 -------------------
debian/patches/spell.patch | 12 ++++++------
3 files changed, 18 insertions(+), 37 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 1c0f3d5..80302ce 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1,7 +1,7 @@
-Index: silo-llnl-4.8/tests/test_error.py
+Index: silo-llnl-4.9.1/tests/test_error.py
===================================================================
---- silo-llnl-4.8.orig/tests/test_error.py 2013-06-11 20:21:50.000000000 +0100
-+++ silo-llnl-4.8/tests/test_error.py 2013-06-21 15:52:17.000000000 +0100
+--- silo-llnl-4.9.1.orig/tests/test_error.py 2014-03-04 14:24:49.134860050 +0000
++++ silo-llnl-4.9.1/tests/test_error.py 2014-03-04 14:24:49.130860278 +0000
@@ -47,6 +47,7 @@
# reflect those of the United States Government or Lawrence Livermore
# National Security, LLC, and shall not be used for advertising or
@@ -55,10 +55,10 @@ Index: silo-llnl-4.8/tests/test_error.py
except:
- print " -- Caught error"
+ print (" -- Caught error")
-Index: silo-llnl-4.8/tests/test_read.py
+Index: silo-llnl-4.9.1/tests/test_read.py
===================================================================
---- silo-llnl-4.8.orig/tests/test_read.py 2013-06-11 20:21:50.000000000 +0100
-+++ silo-llnl-4.8/tests/test_read.py 2013-06-21 15:59:31.000000000 +0100
+--- silo-llnl-4.9.1.orig/tests/test_read.py 2014-03-04 14:24:49.134860050 +0000
++++ silo-llnl-4.9.1/tests/test_read.py 2014-03-04 14:24:49.130860278 +0000
@@ -47,6 +47,7 @@
# reflect those of the United States Government or Lawrence Livermore
# National Security, LLC, and shall not be used for advertising or
@@ -144,10 +144,10 @@ Index: silo-llnl-4.8/tests/test_read.py
db.SetDir("/")
toc = db.GetToc()
-Index: silo-llnl-4.8/tests/test_write.py
+Index: silo-llnl-4.9.1/tests/test_write.py
===================================================================
---- silo-llnl-4.8.orig/tests/test_write.py 2013-06-21 15:27:27.000000000 +0100
-+++ silo-llnl-4.8/tests/test_write.py 2013-06-21 15:55:30.000000000 +0100
+--- silo-llnl-4.9.1.orig/tests/test_write.py 2014-03-04 14:24:49.134860050 +0000
++++ silo-llnl-4.9.1/tests/test_write.py 2014-03-04 14:24:49.130860278 +0000
@@ -47,6 +47,7 @@
# reflect those of the United States Government or Lawrence Livermore
# National Security, LLC, and shall not be used for advertising or
@@ -174,10 +174,10 @@ Index: silo-llnl-4.8/tests/test_write.py
+print ("t9=%s"%db2.GetVar("t9"))
+print ("#/t5= (1.2, 10.0)")
db2.Close()
-Index: silo-llnl-4.8/tools/python/pydbtoc.cpp
+Index: silo-llnl-4.9.1/tools/python/pydbtoc.cpp
===================================================================
---- silo-llnl-4.8.orig/tools/python/pydbtoc.cpp 2013-06-21 15:27:27.000000000 +0100
-+++ silo-llnl-4.8/tools/python/pydbtoc.cpp 2013-06-21 17:33:15.000000000 +0100
+--- silo-llnl-4.9.1.orig/tools/python/pydbtoc.cpp 2014-03-04 14:24:49.134860050 +0000
++++ silo-llnl-4.9.1/tools/python/pydbtoc.cpp 2014-03-04 14:24:49.130860278 +0000
@@ -48,6 +48,12 @@
// National Security, LLC, and shall not be used for advertising or
// product endorsement purposes.
diff --git a/debian/patches/qt-version.patch b/debian/patches/qt-version.patch
index 28fd3a7..ad28539 100644
--- a/debian/patches/qt-version.patch
+++ b/debian/patches/qt-version.patch
@@ -4,22 +4,3 @@ Last-Updated: 2013-06-12
Bug-Debian: #621781
Forwarded: no
-Index: silo-llnl-4.8/configure.ac
-===================================================================
---- silo-llnl-4.8.orig/configure.ac 2011-04-10 21:32:02.000000000 +0100
-+++ silo-llnl-4.8/configure.ac 2011-04-11 00:22:20.000000000 +0100
-@@ -1310,11 +1310,12 @@
- consumeCount=$((consumeCount-1))
- fi
- done
--
-+ AC_MSG_RESULT([Qt $QtVersion in $QT_INCUDE])
- ## Check for supported versions of Qt.
- for ver in 4.4.0 4.4.1 4.4.2 4.4.3 4.4.4 4.4.5 \
- 4.5.0 4.5.1 4.5.2 4.5.3 4.5.4 4.5.5 \
-- 4.6.0 4.6.1 4.6.2 4.6.3 4.6.4 4.6.5 ; do
-+ 4.6.0 4.6.1 4.6.2 4.6.3 4.6.4 4.6.5 \
-+ 4.7.0 4.7.1 4.7.2 4.7.3 4.7.4 4.8.1 4.8.2 4.8.4 4.8.5 4.8.6 ; do
- if test "$QtVersion2" == "$ver"; then
- QtVersion=$ver
- break
diff --git a/debian/patches/spell.patch b/debian/patches/spell.patch
index e9b5a8b..1c938d4 100644
--- a/debian/patches/spell.patch
+++ b/debian/patches/spell.patch
@@ -3,16 +3,16 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2013-01-13
Forwarded: no
-Index: silo-llnl-4.8/src/silo/silo.c
+Index: silo-llnl-4.9.1/src/silo/silo.c
===================================================================
---- silo-llnl-4.8.orig/src/silo/silo.c 2013-01-13 17:07:54.000000000 +0000
-+++ silo-llnl-4.8/src/silo/silo.c 2013-01-13 17:38:15.000000000 +0000
-@@ -182,7 +182,7 @@
+--- silo-llnl-4.9.1.orig/src/silo/silo.c 2014-03-04 14:16:05.729622812 +0000
++++ silo-llnl-4.9.1/src/silo/silo.c 2014-03-04 14:24:44.538740778 +0000
+@@ -179,7 +179,7 @@
"You need to configure the Silo library using the\n"
"--with-hdf5=<INC,LIB> option and re-compile and\n"
"re-install Silo. If you do not have an installation\n"
- "of HDF5 already on your sytem, you will also need\n"
+ "of HDF5 already on your system, you will also need\n"
- "to obtain HDF5 from www.hdfgroup.org and install it." /* 33 */
+ "to obtain HDF5 from www.hdfgroup.org and install it.", /* 33 */
+ "Empty objects not permitted. See DBSetAllowEmptyObjects()." /* 34 */
};
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git
More information about the debian-science-commits
mailing list