[rivet] 03/03: Imported Debian patch 1.8.3-1.3

Mattia Rizzolo mattia at debian.org
Mon Jun 13 17:24:08 UTC 2016


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

mattia pushed a commit to branch master
in repository rivet.

commit b741b82e984935b0618e832779d53b5046aef375
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Dec 12 11:07:59 2015 +0000

    Imported Debian patch 1.8.3-1.3
---
 debian/changelog                         | 17 +++++++++++++++++
 debian/control                           |  4 ++--
 debian/patches/reproducible-builds.patch | 18 ++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  2 +-
 5 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 501b7e9..49e2896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+rivet (1.8.3-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Bas Couwenberg ]
+  * Update build dependencies for GSL 2, change libgsl0-dev to libgsl-dev.
+    Closes: #807224
+
+  [ Mattia Rizzolo ]
+  * Move from python-support to dh-python.  Closes: #786266
+  * Make python-rivet depend on ${python:Depends}, to automatically get the
+    correct python dependency.
+  * Apply patch from the Reproducible Builds team to assure reproducible build
+    of the documentation.  Closes: #788955
+
+ -- Mattia Rizzolo <mattia at debian.org>  Sat, 12 Dec 2015 11:07:59 +0000
+
 rivet (1.8.3-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 53ad8ad..8238b96 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, libhepmc-dev, libfastjet-dev (>= 3.0.6+dfsg-1.1~), libfastjetplugins-dev, libfastjettools-dev, libyaml-cpp-dev, dh-autoreconf, libgsl0-dev, libtinyxml-dev, chrpath, libboost-dev, python-dev, python-support, swig, gfortran
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, libhepmc-dev, libfastjet-dev (>= 3.0.6+dfsg-1.1~), libfastjetplugins-dev, libfastjettools-dev, libyaml-cpp-dev, dh-autoreconf, libgsl-dev, libtinyxml-dev, chrpath, libboost-dev, python-dev, dh-python, swig, gfortran
 Build-Depends-Indep: texlive-science, doxygen-latex
 Standards-Version: 3.9.3
 Homepage: http://rivet.hepforge.org/
@@ -146,7 +146,7 @@ Section: python
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
-Depends: python-support (>= 0.90), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Description: Python bindings of Rivet
  Rivet is a toolkit for validation of Monte Carlo event generators. Using 
  a computationally efficient model for observable computations, Rivet
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
new file mode 100644
index 0000000..5c39818
--- /dev/null
+++ b/debian/patches/reproducible-builds.patch
@@ -0,0 +1,18 @@
+Description: assure reproducible build by removing the timestamp from the html
+ documentation.
+Author: Maria Valentina Marin <marivalenm at gmail.com>
+Last-Update: 2015-12-12
+Acked-By: Mattia Rizzolo <mattia at debian.org>
+Forwarded: no
+
+--- a/Doxyfile.in
++++ b/Doxyfile.in
+@@ -944,7 +944,7 @@
+ # page will contain the date and time when the page was generated. Setting
+ # this to NO can help when comparing the output of multiple runs.
+ 
+-HTML_TIMESTAMP         = YES
++HTML_TIMESTAMP         = NO
+ 
+ # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+ # documentation will contain sections that can be hidden and shown after the
diff --git a/debian/patches/series b/debian/patches/series
index 3d2c896..85771de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ siscone.patch
 fix-analysis-plugin-path.patch
 path-max.patch
 yaml-cpp-v5-support.patch
+reproducible-builds.patch
diff --git a/debian/rules b/debian/rules
index 4086626..4b6d591 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,4 +36,4 @@ override_dh_auto_build-indep:
 	$(MAKE) dox
 
 %:
-	dh $@ --with autoreconf --parallel
+	dh $@ --with autoreconf,python2 --parallel

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



More information about the debian-science-commits mailing list