[python-demgengeo] branch master updated (cd3eccf -> 4c1aad9)

Anton Gladky gladk at moszumanska.debian.org
Sat Jul 11 20:52:43 UTC 2015


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

gladk pushed a change to branch master
in repository python-demgengeo.

      from  cd3eccf   Update changelog.
       new  5282dfa   Enable gcc5-patch. Typo in previous upload.
       new  664b493   Update changelog.
      adds  5e4a914   Imported Upstream version 1.2
       new  cf35e74   Merge tag 'upstream/1.2'
       new  bcb72c0   Modify git-orig script.
       new  eed48bf   Clean in patches.
       new  301c7c4   Fix doc path.
       new  bd48e8f   Fix rpath-issue.
       new  4c1aad9   Update changelog.

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Doxyfile                                           |   2 +-
 {build/Epydoc => Epydoc}/AuScopeBanner.gif         | Bin
 .../AuScopeBannerCropped739x70.gif                 | Bin
 {build/Epydoc => Epydoc}/Makefile.am               |   0
 {build/Epydoc => Epydoc}/accessBlue.css            |   0
 Makefile.am                                        | 260 ++++++
 Python/AVolume2DPy.h                               |   6 +-
 Python/AVolume3DPy.h                               |   2 +-
 Python/BoxWithJointSetPy.h                         |   4 +-
 Python/BoxWithLines2DPy.cc                         |   2 +-
 Python/BoxWithLines2DPy.h                          |   2 +-
 Python/BoxWithLines2DSubVolPy.cc                   |   2 +-
 Python/BoxWithLines2DSubVolPy.h                    |   2 +-
 Python/BoxWithPlanes3DPy.h                         |   4 +-
 Python/CircMNTable2DPy.h                           |   2 +-
 Python/CircMNTable3DPy.h                           |   2 +-
 Python/CircMNTableXY2DPy.h                         |   2 +-
 Python/CircleVolPy.h                               |   2 +-
 Python/ClippedCircleVolPy.h                        |   2 +-
 Python/ClippedSphereVolPy.h                        |   2 +-
 Python/ConvexPolyhedronPy.h                        |   6 +-
 Python/CylinderVolPy.h                             |   2 +-
 Python/CylinderWithJointSetPy.h                    |   2 +-
 Python/DifferenceVolPy.h                           |   2 +-
 Python/DogBonePy.h                                 |   2 +-
 Python/EllipsoidVolPy.h                            |   2 +-
 Python/ExportModuleUtil.cc                         |   4 +
 Python/FullCircMNTable3DPy.h                       |   2 +-
 Python/HGrainGenerator2DPy.h                       |   2 +-
 Python/HexAggregateInsertGenerator2DPy.h           |   4 +-
 Python/HexAggregateInsertGenerator3DPy.h           |   2 +-
 Python/HexAggregateShapePy.h                       |   2 +-
 Python/InsertGenerator2DPy.h                       |   6 +-
 Python/InsertGenerator3DPy.h                       |   6 +-
 Python/IntersectionVolPy.h                         |   2 +-
 Python/Line2DPy.h                                  |   2 +-
 Python/LineSegment2DPy.h                           |   2 +-
 Python/MNTable2DPy.h                               |   6 +-
 Python/MNTable3DPy.cc                              |  41 +-
 Python/MNTable3DPy.h                               |   2 +-
 .../{MeshVolumePy.cc => MeshVolWithJointSetPy.cc}  |  19 +-
 ...BoxWithPlanes3DPy.h => MeshVolWithJointSetPy.h} |  11 +-
 Python/MeshVolumePy.h                              |   2 +-
 Python/PlanePy.h                                   |   2 +-
 Python/PolygonWithLines2DPy.cc                     |   2 +-
 Python/PolygonWithLines2DPy.h                      |   2 +-
 Python/ShapeListPy.h                               |   2 +-
 Python/ShapePy.h                                   |   2 +-
 Python/SphereObjPy.h                               |   2 +-
 Python/SpherePy.h                                  |   2 +-
 Python/SphereSectionVolPy.h                        |   2 +-
 Python/SphereVolPy.h                               |   2 +-
 ...edSphereVolPy.cc => SphereVolWithJointSetPy.cc} |  22 +-
 ...CircMNTable2DPy.h => SphereVolWithJointSetPy.h} |   8 +-
 Python/TriBoxPy.h                                  |   4 +-
 Python/TriPatchSetPy.h                             |   2 +-
 Python/TriWithLines2DPy.cc                         |   2 +-
 Python/TriWithLines2DPy.h                          |   2 +-
 Python/UnionVolPy.h                                |   2 +-
 Python/Vector3Py.h                                 |   2 +-
 build/autogen.sh => autogen.sh                     |   0
 build/AUTHORS                                      |   1 -
 build/COPYING                                      |   1 -
 build/ChangeLog                                    |   1 -
 build/INSTALL                                      |   1 -
 build/Makefile.am                                  | 252 ------
 build/NEWS                                         |   1 -
 build/README                                       |   1 -
 {build/config => config}/Cpp.am                    |   0
 {build/config => config}/Python.am                 |   0
 build/configure.ac => configure.ac                 |  15 +-
 debian/changelog                                   |  16 +
 debian/control                                     |   1 +
 debian/patches/{gcc5.patch => 10_gcc5.patch}       |   8 +-
 debian/patches/fix-rpath.patch                     |  15 -
 debian/patches/replace_cerr_by_cout.patch          | 940 ---------------------
 debian/patches/series                              |   4 +-
 debian/python-demgengeo.docs                       |   2 +-
 debian/rules                                       |   8 +-
 debian/scripts/get_orig_src.sh                     |   2 +-
 geometry/AGeometricObject.h                        |   2 +-
 geometry/Cylinder.h                                |   2 +-
 geometry/Line2D.h                                  |   2 +-
 geometry/Plane.h                                   |   2 +-
 geometry/Sphere.h                                  |   2 +-
 geometry/SphereIn.h                                |   2 +-
 geometry/Torus.h                                   |   2 +-
 geometry/Triangle3D.cc                             |   4 +-
 geometry/Triangle3D.h                              |   2 +-
 {build/m4 => m4}/boost.m4                          | 752 +++++++++++++----
 {build/m4 => m4}/python.m4                         |  82 +-
 sphere_fitting/Sphere2DFitter.cc                   |   6 +-
 sphere_fitting/Sphere2DFitter.h                    |   4 +-
 sphere_fitting/Sphere3DFitter.cc                   |   6 +-
 sphere_fitting/Sphere3DFitter.h                    |   4 +-
 sphere_fitting/fit_2d_sphere.h                     |   8 +-
 sphere_fitting/fit_3d_sphere.h                     |   8 +-
 .../fit_functions/fit_2d_sphere_2lines.h           |   6 +-
 sphere_fitting/fit_functions/fit_2d_sphere_line.h  |   6 +-
 .../fit_functions/fit_3d_1sphere_3lines.h          |   6 +-
 .../fit_functions/fit_3d_2spheres_2lines.h         |   6 +-
 .../fit_functions/fit_3d_3spheres_1line.h          |   6 +-
 src/AVolume.h                                      |   4 +-
 src/AVolume2D.h                                    |   2 +-
 src/AVolume3D.h                                    |   2 +-
 src/BoxWithJointSet.h                              |   2 +-
 src/BoxWithLines2DSubVol.cc                        |   2 +-
 src/BoxWithPlanes3D.h                              |   2 +-
 src/CircMNTable2D.cc                               |  28 +-
 src/CircMNTable3D.cc                               |  95 ++-
 src/CircMNTableXY2D.cc                             |   6 +-
 src/CircleVol.h                                    |   2 +-
 src/ClippedCircleVol.h                             |   2 +-
 src/ClippedSphereVol.h                             |   2 +-
 src/ConvexPolyhedron.h                             |   2 +-
 src/CylinderVol.h                                  |   4 +-
 src/CylinderWithJointSet.h                         |   4 +-
 src/DifferenceVol.cc                               |   4 +-
 src/DogBone.cc                                     |   2 +-
 src/DogBone.h                                      |   6 +-
 src/FullCircMNTable3D.cc                           | 210 +++--
 src/GenericShape.cc                                |   2 +-
 src/GenericShape.h                                 |   2 +-
 src/HGrainGenerator.cc                             |   2 +-
 src/HexAggregateInsertGenerator2D.cc               |  10 +-
 src/HexAggregateInsertGenerator2DRand.cc           |  10 +-
 src/HexAggregateInsertGenerator3D.cc               |  10 +-
 src/HexAggregateShape.h                            |   2 +-
 src/InsertGenerator2D.cc                           |   8 +-
 src/InsertGenerator3D.cc                           |  36 +-
 src/IntersectionVol.cc                             |   4 +-
 src/JointSet.h                                     |   2 +-
 src/MNTCell.cc                                     |  36 +-
 src/MNTCell.h                                      |   4 +-
 src/MNTable2D.cc                                   |   8 +-
 src/MNTable2D.h                                    |   6 +-
 src/MNTable3D.cc                                   | 179 +++-
 src/MNTable3D.h                                    |  36 +-
 src/{MeshVolume.cc => MeshVolWithJointSet.cc}      |  91 +-
 src/{MeshVolume.h => MeshVolWithJointSet.h}        |  33 +-
 src/MeshVolume.cc                                  |   2 +-
 src/MeshVolume.h                                   |   2 +-
 src/Model2D.h                                      |   6 +-
 src/PolygonWithLines2D.cc                          |   4 +-
 src/Shape.h                                        |   2 +-
 src/ShapeList.cc                                   |   2 +-
 src/ShapeList.h                                    |   2 +-
 src/SphereObj.h                                    |   2 +-
 src/SphereSectionVol.h                             |   2 +-
 src/SphereVol.h                                    |   2 +-
 ...derWithJointSet.cc => SphereVolWithJointSet.cc} |  51 +-
 ...inderWithJointSet.h => SphereVolWithJointSet.h} |  28 +-
 src/TriBox.cc                                      |   8 +-
 src/TriBox.h                                       |   2 +-
 src/TriPatchSet.cc                                 |   2 +-
 src/TriPatchSet.h                                  |   4 +-
 src/UnionVol.cc                                    |   4 +-
 src/granular_gouge.cc                              |   4 +-
 src/main.cc                                        |  18 +-
 src/main_gouge.cc                                  |   6 +-
 src/main_hlayer.cc                                 |   6 +-
 src/main_layered.cc                                |   6 +-
 src/main_sbx.cc                                    |  14 +-
 163 files changed, 1774 insertions(+), 1947 deletions(-)
 rename {build/Epydoc => Epydoc}/AuScopeBanner.gif (100%)
 rename {build/Epydoc => Epydoc}/AuScopeBannerCropped739x70.gif (100%)
 rename {build/Epydoc => Epydoc}/Makefile.am (100%)
 rename {build/Epydoc => Epydoc}/accessBlue.css (100%)
 create mode 100644 Makefile.am
 copy Python/{MeshVolumePy.cc => MeshVolWithJointSetPy.cc} (71%)
 copy Python/{BoxWithPlanes3DPy.h => MeshVolWithJointSetPy.h} (78%)
 copy Python/{ClippedSphereVolPy.cc => SphereVolWithJointSetPy.cc} (75%)
 copy Python/{CircMNTable2DPy.h => SphereVolWithJointSetPy.h} (82%)
 rename build/autogen.sh => autogen.sh (100%)
 delete mode 120000 build/AUTHORS
 delete mode 120000 build/COPYING
 delete mode 120000 build/ChangeLog
 delete mode 120000 build/INSTALL
 delete mode 100644 build/Makefile.am
 delete mode 120000 build/NEWS
 delete mode 120000 build/README
 rename {build/config => config}/Cpp.am (100%)
 rename {build/config => config}/Python.am (100%)
 rename build/configure.ac => configure.ac (92%)
 rename debian/patches/{gcc5.patch => 10_gcc5.patch} (74%)
 delete mode 100644 debian/patches/fix-rpath.patch
 delete mode 100644 debian/patches/replace_cerr_by_cout.patch
 rename {build/m4 => m4}/boost.m4 (60%)
 rename {build/m4 => m4}/python.m4 (65%)
 copy src/{MeshVolume.cc => MeshVolWithJointSet.cc} (61%)
 copy src/{MeshVolume.h => MeshVolWithJointSet.h} (71%)
 copy src/{CylinderWithJointSet.cc => SphereVolWithJointSet.cc} (67%)
 copy src/{CylinderWithJointSet.h => SphereVolWithJointSet.h} (68%)

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



More information about the debian-science-commits mailing list