[Reproducible-commits] [doxygen] 01/01: Imported Debian patch 1.8.11-2

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository doxygen.

commit b8cb30779e0ffb0aeca48e93715239aeab5bfd1b
Author: Matthias Klose <doko at debian.org>
Date:   Wed Jun 15 08:44:59 2016 +0200

    Imported Debian patch 1.8.11-2
---
 debian/changelog              | 6 ++++++
 debian/control                | 2 +-
 debian/patches/pyversion.diff | 4 ++--
 doc/.gitignore                | 1 -
 winbuild/.gitignore           | 0
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8db0f72..f9c0e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+doxygen (1.8.11-2) unstable; urgency=medium
+
+  * Fix python version number extraction for python release candidate builds.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 15 Jun 2016 08:44:59 +0200
+
 doxygen (1.8.11-1) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 836ee84..2a32f3f 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends-Indep: texlive-fonts-recommended,
   graphviz,
   latex-xcolor,
   rdfind
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.stack.nl/~dimitri/doxygen/
 XS-Testsuite: autopkgtest
 
diff --git a/debian/patches/pyversion.diff b/debian/patches/pyversion.diff
index ef8d775..fbae62c 100644
--- a/debian/patches/pyversion.diff
+++ b/debian/patches/pyversion.diff
@@ -7,7 +7,7 @@ Index: b/doc/translator.py
      '''
  
 -    major, minor, patch = (int(e) for e in platform.python_version_tuple())
-+    major, minor, patch = (int(e.strip('+')) for e in platform.python_version_tuple())
++    major, minor, patch = sys.version_info[:3]
      if major == 2:
          return open(fname, mode=mode) # Python 2 without encoding
      else:
@@ -16,7 +16,7 @@ Index: b/doc/translator.py
  
      # The Python 2.6+ or 3.3+ is required.
 -    major, minor, patch = (int(e) for e in platform.python_version_tuple())
-+    major, minor, patch = (int(e.strip('+')) for e in platform.python_version_tuple())
++    major, minor, patch = sys.version_info[:3]
      if (major == 2 and minor < 6) or (major == 3 and minor < 0):
          print('Python 2.6+ or Python 3.0+ are required for the script')
          sys.exit(1)
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 751553b..0000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.bak
diff --git a/winbuild/.gitignore b/winbuild/.gitignore
deleted file mode 100644
index e69de29..0000000

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/doxygen.git