[clhep] 05/07: Merge branch 'master_new'

Ole Streicher olebole at moszumanska.debian.org
Tue Feb 7 11:25:30 UTC 2017


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

olebole pushed a commit to branch master
in repository clhep.

commit 26b78094a02a99f2646551a6068213d6aae09636
Merge: 5f74987 a85b690
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Feb 7 11:43:26 2017 +0100

    Merge branch 'master_new'

 CMakeLists.txt                                     |   4 +-
 Cast/Cast-config.in                                |   2 +-
 Cast/configure.ac                                  |   6 +-
 ChangeLog                                          |  40 +
 Evaluator/ChangeLog                                |  11 +
 Evaluator/Evaluator-config.in                      |   2 +-
 Evaluator/configure.ac                             |   6 +-
 Evaluator/src/setSystemOfUnits.cc                  |  13 +
 Exceptions/ChangeLog                               |   6 +
 Exceptions/Exceptions-config.in                    |   2 +-
 Exceptions/configure.ac                            |   6 +-
 Fields/ChangeLog                                   |   6 +
 Fields/Fields-config.in                            |   2 +-
 Fields/configure.ac                                |   6 +-
 GenericFunctions/ChangeLog                         |   6 +
 GenericFunctions/GenericFunctions-config.in        |   2 +-
 .../GenericFunctions/RungeKuttaClassicalSolver.hh  |   3 +-
 GenericFunctions/configure.ac                      |   6 +-
 GenericFunctions/doc/psfig.sty                     | 995 +++++++++++++++++++++
 GenericFunctions/src/AdaptiveRKStepper.cc          |  12 +-
 GenericFunctions/src/RungeKuttaClassicalSolver.cc  |  19 +-
 Geometry/ChangeLog                                 |   6 +
 Geometry/Geometry-config.in                        |   2 +-
 Geometry/configure.ac                              |   6 +-
 INSTALL.cmake                                      |   3 +
 Matrix/ChangeLog                                   |  11 +
 Matrix/Matrix-config.in                            |   2 +-
 Matrix/Matrix/DiagMatrix.h                         |  66 +-
 Matrix/Matrix/DiagMatrix.icc                       |   2 +-
 Matrix/Matrix/Matrix.h                             | 118 +--
 Matrix/Matrix/Matrix.icc                           |  10 +-
 Matrix/Matrix/SymMatrix.h                          |  70 +-
 Matrix/Matrix/SymMatrix.icc                        |   4 +-
 Matrix/Matrix/Vector.h                             |  20 +-
 Matrix/configure.ac                                |   6 +-
 Matrix/src/DiagMatrix.cc                           | 362 ++++----
 Matrix/src/GenMatrix.cc                            |  41 +-
 Matrix/src/Matrix.cc                               | 232 ++---
 Matrix/src/MatrixEqRotation.cc                     |  24 +-
 Matrix/src/MatrixLinear.cc                         |  70 +-
 Matrix/src/SymMatrix.cc                            | 424 ++++-----
 Matrix/src/Vector.cc                               | 224 ++---
 Random/ChangeLog                                   |  28 +
 Random/Random-config.in                            |   2 +-
 Random/Random/CMakeLists.txt                       |   2 +
 Random/Random/Makefile.am                          |   2 +
 Random/Random/RandExpZiggurat.h                    | 174 ++++
 Random/Random/RandGaussZiggurat.h                  | 153 ++++
 Random/Random/Randomize.h                          |   2 +
 Random/configure.ac                                |   6 +-
 Random/src/CMakeLists.txt                          |   5 +-
 Random/src/Makefile.am                             |   2 +
 Random/src/RandExpZiggurat.cc                      | 178 ++++
 Random/src/RandGaussZiggurat.cc                    | 189 ++++
 Random/test/CMakeLists.txt                         |  39 +-
 Random/test/Makefile.am                            |   5 +-
 Random/test/testAnonymousEngineRestore.cc          |  12 +-
 Random/test/testInstanceRestore.cc                 |  20 +-
 Random/test/testSaveSharedEngines.cc               |   8 +-
 Random/test/testStaticStreamSave.cc                |  20 +-
 Random/test/testZiggurat.cc                        |  63 ++
 RandomObjects/ChangeLog                            |   6 +
 RandomObjects/RandomObjects-config.in              |   2 +-
 RandomObjects/configure.ac                         |   2 +-
 RefCount/RefCount-config.in                        |   2 +-
 RefCount/configure.ac                              |   6 +-
 Units/ChangeLog                                    |  12 +
 Units/Units-config.in                              |   2 +-
 Units/Units/SystemOfUnits.h                        |  12 +
 Units/configure.ac                                 |   6 +-
 Units/test/testUnits.cc                            |   8 +-
 Utility/ChangeLog                                  |   6 +
 Utility/Utility-config.in                          |   2 +-
 Utility/configure.ac                               |   6 +-
 Vector/ChangeLog                                   |   6 +
 Vector/Vector-config.in                            |   2 +-
 Vector/configure.ac                                |   6 +-
 clhep-config.in                                    |   2 +-
 cmake/Modules/ClhepBuildTest.cmake                 |  25 +-
 cmake/Modules/ClhepBuildTex.cmake                  |   5 +-
 configure.ac                                       |   6 +-
 debian/changelog                                   |  26 +-
 debian/control                                     |  13 +-
 .../{libclhep2.1.install => libclhep2.1v5.install} |   0
 .../fix-double-comparision-in-testBug58950.patch   |  35 +
 debian/patches/series                              |   2 +
 debian/patches/tests.patch                         |  11 +
 doxygen.conf                                       |   2 +-
 88 files changed, 3009 insertions(+), 972 deletions(-)

diff --cc debian/changelog
index 8f1a17f,a9d7eee..3b3f0ee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,26 +1,36 @@@
- clhep (2.1.3.1+dfsg-1) UNRELEASED; urgency=medium
++clhep (2.1.4.1+dfsg-1) UNRELEASED; urgency=medium
 +
 +  * Team upload
 +  * Replace psfig by graphicx
 +    Closes: #820797
 +  * DEP5 copyright to enable using Files-Excluded: */psfig.sty
 +
 + -- Andreas Tille <tille at debian.org>  Fri, 20 Jan 2017 11:21:20 +0100
 +
+ clhep (2.1.4.1-1.2) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rename library packages for g++5 ABI transition (closes: 791001).
+ 
+  -- Julien Cristau <jcristau at debian.org>  Sun, 16 Aug 2015 17:33:27 +0200
+ 
+ clhep (2.1.4.1-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Fix broken double comparision in a testcase. (Closes: #733301)
+ 
+  -- Philipp Kern <pkern at debian.org>  Fri, 25 Apr 2014 23:56:31 +0200
+ 
+ clhep (2.1.4.1-1) unstable; urgency=low
+ 
+   * New upstream release. (Closes: #713377)
+   * Bump Standards-Version to 3.9.4.
+   * Remove obsolte DM-Upload-Allowed field.
+   * Canonical VCS-* fields.
+ 
+  -- Lifeng Sun <lifongsun at gmail.com>  Sat, 14 Dec 2013 16:33:36 +0800
++>>>>>>> master_new
+ 
  clhep (2.1.3.1-1) unstable; urgency=low
  
    * Upload to sid.
diff --cc debian/patches/series
index 6a932f2,3e08479..69e55bc
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,5 +1,6 @@@
  soname.patch
  doxygen.conf
  clhep-config.patch
+ tests.patch
+ fix-double-comparision-in-testBug58950.patch
 +replace_psfig_by_graphicx.patch

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



More information about the debian-science-commits mailing list