[xdmf] 03/04: Merge branch 'debian/master' of ssh://git.debian.org/git/debian-science/packages/xdmf into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 25 15:24:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository xdmf.
commit 97e5c8dad520fa21e3dc8e593a20541bf3daac4a
Merge: de1ec1b 8f8eee1
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Sep 19 19:53:57 2017 +0100
Merge branch 'debian/master' of ssh://git.debian.org/git/debian-science/packages/xdmf into debian/master
CMake/CVS/Entries | 8 -
CMake/CVS/Repository | 1 -
CMake/CVS/Root | 1 -
CMake/TestingSuite/TestingSetup.cmake | 18 +-
CMake/VersionSuite/SetUpVersion.cmake | 4 +-
CMakeLists.txt | 155 +-
CTestConfig.cmake | 0
CVS/Entries | 13 -
CVS/Repository | 1 -
CVS/Root | 1 -
Data/Baseline/CVS/Entries | 3 -
Data/Baseline/CVS/Repository | 1 -
Data/Baseline/CVS/Root | 1 -
Data/CVS/Entries | 2 -
Data/CVS/Repository | 1 -
Data/CVS/Root | 1 -
Data/Data/CVS/Entries | 11 -
Data/Data/CVS/Repository | 1 -
Data/Data/CVS/Root | 1 -
Data/Data/Iron Protein/CVS/Entries | 2 -
Data/Data/Iron Protein/CVS/Repository | 1 -
Data/Data/Iron Protein/CVS/Root | 1 -
Data/Data/Shapes/CVS/Entries | 3 -
Data/Data/Shapes/CVS/Repository | 1 -
Data/Data/Shapes/CVS/Root | 1 -
Data/Data/Testing/CVS/Entries | 4 -
Data/Data/Testing/CVS/Repository | 1 -
Data/Data/Testing/CVS/Root | 1 -
Examples/CVS/Entries | 3 -
Examples/CVS/Repository | 1 -
Examples/CVS/Root | 1 -
Examples/Cxx/CVS/Entries | 15 -
Examples/Cxx/CVS/Repository | 1 -
Examples/Cxx/CVS/Root | 1 -
Examples/Data/CVS/Entries | 6 -
Examples/Data/CVS/Repository | 1 -
Examples/Data/CVS/Root | 1 -
Examples/Python/CVS/Entries | 31 -
Examples/Python/CVS/Repository | 1 -
Examples/Python/CVS/Root | 1 -
Ice/CVS/Entries | 2 -
Ice/CVS/Repository | 1 -
Ice/CVS/Root | 1 -
Ice/libsrc/CVS/Entries | 1 -
Ice/libsrc/CVS/Repository | 1 -
Ice/libsrc/CVS/Root | 1 -
Ice/sh/CVS/Entries | 1 -
Ice/sh/CVS/Repository | 1 -
Ice/sh/CVS/Root | 1 -
Utilities/CVS/Entries | 8 -
Utilities/CVS/Repository | 1 -
Utilities/CVS/Root | 1 -
Utilities/Doxygen/CVS/Entries | 5 -
Utilities/Doxygen/CVS/Repository | 1 -
Utilities/Doxygen/CVS/Root | 1 -
Utilities/hdf5/CMake/CVS/Entries | 4 -
Utilities/hdf5/CMake/CVS/Repository | 1 -
Utilities/hdf5/CMake/CVS/Root | 1 -
Utilities/hdf5/CVS/Entries | 201 ---
Utilities/hdf5/CVS/Repository | 1 -
Utilities/hdf5/CVS/Root | 1 -
Utilities/hdf5/HDF5Tests/CVS/Entries | 1 -
Utilities/hdf5/HDF5Tests/CVS/Repository | 1 -
Utilities/hdf5/HDF5Tests/CVS/Root | 1 -
Utilities/vtkexodus2/CVS/Entries | 167 --
Utilities/vtkexodus2/CVS/Repository | 1 -
Utilities/vtkexodus2/CVS/Root | 1 -
Utilities/vtkexodus2/include/CVS/Entries | 8 -
Utilities/vtkexodus2/include/CVS/Repository | 1 -
Utilities/vtkexodus2/include/CVS/Root | 1 -
Utilities/vtkexodus2/test/CVS/Entries | 4 -
Utilities/vtkexodus2/test/CVS/Repository | 1 -
Utilities/vtkexodus2/test/CVS/Root | 1 -
Utilities/vtklibxml2/CVS/Entries | 69 -
Utilities/vtklibxml2/CVS/Repository | 1 -
Utilities/vtklibxml2/CVS/Root | 1 -
Utilities/vtklibxml2/include/CVS/Entries | 2 -
Utilities/vtklibxml2/include/CVS/Repository | 1 -
Utilities/vtklibxml2/include/CVS/Root | 1 -
Utilities/vtklibxml2/include/libxml/CVS/Entries | 50 -
Utilities/vtklibxml2/include/libxml/CVS/Repository | 1 -
Utilities/vtklibxml2/include/libxml/CVS/Root | 1 -
Utilities/vtknetcdf/CVS/Entries | 37 -
Utilities/vtknetcdf/CVS/Repository | 1 -
Utilities/vtknetcdf/CVS/Root | 1 -
Utilities/vtkzlib/CVS/Entries | 33 -
Utilities/vtkzlib/CVS/Repository | 1 -
Utilities/vtkzlib/CVS/Root | 1 -
Xdmf.hpp | 34 +-
XdmfAggregate.cpp | 1 -
XdmfAttribute.cpp | 6 +-
XdmfCurvilinearGrid.cpp | 4 +-
XdmfGeometry.cpp | 21 +-
XdmfGraph.cpp | 2 +-
XdmfGrid.cpp | 2 +-
XdmfGridTemplate.cpp | 2 -
XdmfItemFactory.cpp | 16 +-
XdmfRectilinearGrid.cpp | 4 +-
XdmfRegularGrid.cpp | 6 +-
XdmfSet.cpp | 2 +-
XdmfTemplate.cpp | 28 +-
XdmfTopology.cpp | 6 +-
XdmfTopology.hpp | 2 +-
XdmfUnstructuredGrid.cpp | 4 +-
binsrc/CVS/Entries | 1 -
binsrc/CVS/Repository | 1 -
binsrc/CVS/Root | 1 -
core/CMakeLists.txt | 128 +-
core/XdmfArray.cpp | 1101 +++++--------
core/XdmfArray.hpp | 153 +-
core/XdmfArray.tpp | 1718 ++++++++++++++++----
core/XdmfArrayReference.cpp | 1 -
core/XdmfArrayType.cpp | 1 -
core/XdmfConfig.hpp.in | 1 +
core/XdmfCore.hpp | 9 +-
core/XdmfCore.i | 41 +-
core/XdmfCoreConfig.hpp.in | 3 +
core/XdmfCoreItemFactory.cpp | 227 ++-
core/XdmfCoreReader.cpp | 35 +-
core/XdmfError.hpp | 2 +-
core/XdmfFunction.cpp | 64 +-
core/XdmfHDF5Controller.cpp | 6 +-
core/XdmfHDF5Writer.cpp | 8 +-
core/XdmfHeavyDataDescription.cpp | 2 +
core/XdmfInformation.hpp | 2 +-
core/XdmfItem.cpp | 2 +-
core/XdmfItem.hpp | 12 +-
core/XdmfItemProperty.cpp | 35 +
core/XdmfSharedPtr.hpp | 23 +-
core/XdmfSubset.cpp | 55 +-
core/XdmfWriter.cpp | 12 +-
core/dsm/CMakeLists.txt | 60 +-
core/dsm/XdmfDSM.hpp | 21 +-
core/dsm/XdmfDSMItemFactory.cpp | 70 +-
core/dsm/tests/CMakeLists.txt | 2 +
core/tests/C/CTestXdmfArray.c | 45 +-
core/tests/CMakeLists.txt | 2 +
core/tests/Cxx/TestXdmfArray.cpp | 60 +-
core/tests/Cxx/TestXdmfArrayInsert.cpp | 1 +
.../Cxx/TestXdmfArrayMultiDimensionalInsert.cpp | 1 +
core/tests/Cxx/TestXdmfArrayMultidimensional.cpp | 11 +-
core/tests/Cxx/TestXdmfArrayWriteRead.cpp | 9 +-
.../tests/Cxx/TestXdmfArrayWriteReadHyperSlabs.cpp | 1 +
core/tests/Cxx/TestXdmfHDF5Controller.cpp | 1 +
core/tests/Cxx/TestXdmfHDF5Writer.cpp | 1 +
core/tests/Cxx/TestXdmfHDF5WriterTree.cpp | 1 +
core/tests/Cxx/TestXdmfInformation.cpp | 1 +
core/tests/Cxx/TestXdmfSparseMatrix.cpp | 1 +
core/tests/Python/TestXdmfArrayMultidimensional.py | 2 +-
debian/changelog | 8 +
debian/control | 4 +-
debian/patches/c++11.patch | 12 +-
debian/patches/exodus.patch | 6 +-
debian/patches/gzstream.patch | 12 +-
debian/patches/hdf5-1.10.patch | 6 +-
debian/patches/header-fix.patch | 6 +-
debian/patches/python-install-dir.patch | 6 +-
debian/patches/python3.patch | 180 +-
debian/patches/reproducible-build.patch | 6 +-
debian/patches/soname.patch | 40 +-
libsrc/CVS/Entries | 100 --
libsrc/CVS/Repository | 1 -
libsrc/CVS/Root | 1 -
libsrc/test/CVS/Entries | 9 -
libsrc/test/CVS/Repository | 1 -
libsrc/test/CVS/Root | 1 -
libsrc/utils/CVS/Entries | 19 -
libsrc/utils/CVS/Repository | 1 -
libsrc/utils/CVS/Root | 1 -
python/CVS/Entries | 1 -
python/CVS/Repository | 1 -
python/CVS/Root | 1 -
tests/CMakeLists.txt | 2 +
tests/Cxx/HugeWriteArray.cpp | 1 +
tests/Cxx/TestXdmfAggregate.cpp | 1 +
tests/Cxx/TestXdmfAttribute.cpp | 1 +
tests/Cxx/TestXdmfBinaryController.cpp | 1 +
tests/Cxx/TestXdmfCurvilinearGrid.cpp | 3 +-
tests/Cxx/TestXdmfFunction.cpp | 1 +
tests/Cxx/TestXdmfGeometry.cpp | 1 +
tests/Cxx/TestXdmfGraph.cpp | 1 +
tests/Cxx/TestXdmfGridCollection.cpp | 1 +
tests/Cxx/TestXdmfGridController.cpp | 1 +
tests/Cxx/TestXdmfGridTemplate.cpp | 1 +
tests/Cxx/TestXdmfHDF5Hyperslab.cpp | 1 +
tests/Cxx/TestXdmfHDF5Visit.cpp | 11 +-
tests/Cxx/TestXdmfMap.cpp | 1 +
tests/Cxx/TestXdmfMultiOpen.cpp | 1 +
tests/Cxx/TestXdmfMultiXPath.cpp | 1 +
tests/Cxx/TestXdmfReader.cpp | 1 +
tests/Cxx/TestXdmfRectilinearGrid.cpp | 7 +-
tests/Cxx/TestXdmfRegularGrid.cpp | 1 +
tests/Cxx/TestXdmfSet.cpp | 1 +
tests/Cxx/TestXdmfSubset.cpp | 1 +
tests/Cxx/TestXdmfTIFFReadWriteCompressed.cpp | 19 +-
tests/Cxx/TestXdmfTemplate.cpp | 1 +
tests/Cxx/TestXdmfTime.cpp | 1 +
tests/Cxx/TestXdmfTopology.cpp | 1 +
tests/Cxx/TestXdmfTopologyMixed.cpp | 1 +
tests/Cxx/TestXdmfUnstructuredGrid.cpp | 1 +
tests/Cxx/TestXdmfVisitorValueCounter.cpp | 1 +
tests/Cxx/TestXdmfWriter.cpp | 1 +
tests/Cxx/TestXdmfXPath.cpp | 1 +
tests/Cxx/TestXdmfXPointerReference.cpp | 1 +
tests/Cxx/XdmfFileConnectTest.cpp | 1 +
tests/Cxx/XdmfPostFixCalc.cpp | 27 +-
utils/CMakeLists.txt | 39 +-
utils/XdmfDiff.cpp | 1 +
utils/XdmfFortran.cpp | 52 +-
utils/tests/CMakeLists.txt | 3 +
utils/tests/Cxx/TestXdmfDiff.cpp | 1 +
utils/tests/Cxx/TestXdmfGeometryConverter.cpp | 1 +
utils/tests/Cxx/TestXdmfTopologyConverter.cpp | 1 +
vtk/CVS/Entries | 18 -
vtk/CVS/Repository | 1 -
vtk/CVS/Root | 1 -
vtk/Testing/CVS/Entries | 4 -
vtk/Testing/CVS/Repository | 1 -
vtk/Testing/CVS/Root | 1 -
vtk/Testing/Cxx/CVS/Entries | 3 -
vtk/Testing/Cxx/CVS/Repository | 1 -
vtk/Testing/Cxx/CVS/Root | 1 -
vtk/Testing/Python/CVS/Entries | 1 -
vtk/Testing/Python/CVS/Repository | 1 -
vtk/Testing/Python/CVS/Root | 1 -
vtk/Testing/Tcl/CVS/Entries | 1 -
vtk/Testing/Tcl/CVS/Repository | 1 -
vtk/Testing/Tcl/CVS/Root | 1 -
228 files changed, 3138 insertions(+), 2518 deletions(-)
diff --cc debian/changelog
index 311588b,8d48768..a8861a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
-xdmf (3.0+git20170413-1) experimental; urgency=medium
++xdmf (3.0+git20170413-1) UNRELEASED; urgency=medium
+
- * Pull latest tree from git to test building VTK7. Closes: #860231
- * Update SONAME patch to use ${XDMF_MAJOR_VERSION} rather than '3'
- * Add Build-Conflicts: libxdmf-dev
++ * New upstream pick
++ * Standards-Version: 4.1.0
++ * Mark libxdmf3 as MultiArch: same
+
- -- Alastair McKinstry <mckinstry at debian.org> Thu, 13 Apr 2017 16:50:02 +0100
++ -- Alastair McKinstry <mckinstry at debian.org> Sat, 29 Jul 2017 15:27:58 +0100
++
+xdmf (3.0+git20160803-3) unstable; urgency=medium
+
+ * Fix FTBFS when building with multiple versions of python3.
+ Closes: #863000
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 18 May 2017 08:30:05 +0100
xdmf (3.0+git20160803-2) unstable; urgency=medium
diff --cc debian/control
index f66aabb,c14d734..f1a03df
--- a/debian/control
+++ b/debian/control
@@@ -11,7 -11,8 +11,8 @@@ Build-Depends: debhelper (>= 10), cmake
libgzstream-dev,
libmetis-dev,
chrpath
- Standards-Version: 3.9.8
+ Build-Conflicts: libxdmf-dev
-Standards-Version: 3.9.8
++Standards-Version: 4.1.0
Homepage: http://www.xdmf.org/
Vcs-Git: git://anonscm.debian.org/debian-science/packages/xdmf.git
X-Python-Version: 2.7
@@@ -20,6 -21,6 +21,7 @@@ X-Python3-Version: 3.4
Package: libxdmf3
Section: libs
Architecture: any
++Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: eXtensible Data Model and Format library
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/xdmf.git
More information about the debian-science-commits
mailing list