[Python-modules-commits] r31455 - in packages/breathe/trunk/debian (5 files)

[sramacher at users.alioth.debian.org]

    Date: Sunday, November 16, 2014 @ 14:19:08
  Author: sramacher
Revision: 31455

* New upstream release.
* debian/control: Bump Standards-Version, no changes required.
* debian/patches: Refresh patches.
* debian/rules: Export READTHEDOCS and TRAVIS_CI to control documentation
  build.

Modified:
  packages/breathe/trunk/debian/changelog
  packages/breathe/trunk/debian/control
  packages/breathe/trunk/debian/patches/conf.py-version.patch
  packages/breathe/trunk/debian/patches/packaged-mathjax.patch
  packages/breathe/trunk/debian/rules

Modified: packages/breathe/trunk/debian/changelog
===================================================================
--- packages/breathe/trunk/debian/changelog	2014-11-15 14:13:39 UTC (rev 31454)
+++ packages/breathe/trunk/debian/changelog	2014-11-16 14:19:08 UTC (rev 31455)
@@ -1,3 +1,13 @@
+breathe (3.2.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * debian/control: Bump Standards-Version, no changes required.
+  * debian/patches: Refresh patches.
+  * debian/rules: Export READTHEDOCS and TRAVIS_CI to control documentation
+    build.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Sun, 16 Nov 2014 15:16:08 +0100
+
 breathe (3.1.0-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/breathe/trunk/debian/control
===================================================================
--- packages/breathe/trunk/debian/control	2014-11-15 14:13:39 UTC (rev 31454)
+++ packages/breathe/trunk/debian/control	2014-11-16 14:19:08 UTC (rev 31455)
@@ -15,7 +15,7 @@
  python-sphinx,
  python3-sphinx,
  doxygen
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/breathe/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/breathe/trunk/
 Homepage: http://github.com/michaeljones/breathe/

Modified: packages/breathe/trunk/debian/patches/conf.py-version.patch
===================================================================
--- packages/breathe/trunk/debian/patches/conf.py-version.patch	2014-11-15 14:13:39 UTC (rev 31454)
+++ packages/breathe/trunk/debian/patches/conf.py-version.patch	2014-11-16 14:19:08 UTC (rev 31455)
@@ -1,21 +1,15 @@
 Description: Hardcode version instead of running git describe --tags
- Also build the readthedocs version that does not include warnings about
- unreleased API.
 Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2014-06-18
+Last-Update: 2014-11-16
 
 --- a/documentation/source/conf.py
 +++ b/documentation/source/conf.py
-@@ -31,10 +31,10 @@ import re
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = [ 'breathe', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig' ]
+@@ -35,7 +35,7 @@
+ travis_build = os.environ.get('TRAVIS_CI', None) == 'True'
  
--read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
-+read_the_docs_build = True
+ # Get a description of the current position. Use Popen for 2.6 compat
+-git_tag = subprocess.Popen(['git', 'describe', '--tags'], stdout=subprocess.PIPE).communicate()[0]
++git_tag = "v3.2.0"
  
- # Get a description of the current position
--git_tag = subprocess.check_output('git describe --tags', shell=True)
-+git_tag = "v2.0.0"
- 
- if read_the_docs_build:
- 
+ # Convert to unicode for python3
+ git_tag = unicode(git_tag)

Modified: packages/breathe/trunk/debian/patches/packaged-mathjax.patch
===================================================================
--- packages/breathe/trunk/debian/patches/packaged-mathjax.patch	2014-11-15 14:13:39 UTC (rev 31454)
+++ packages/breathe/trunk/debian/patches/packaged-mathjax.patch	2014-11-16 14:19:08 UTC (rev 31455)
@@ -1,11 +1,11 @@
 Description: Use packaged copy of MathJax
 Author: Sebastian Ramacher <sramacher at debian.org>
 Forwarded: not-needed
-Last-Update: 2014-06-18
+Last-Update: 2014-11-16
 
 --- a/documentation/source/conf.py
 +++ b/documentation/source/conf.py
-@@ -110,8 +110,7 @@ spelling_lang='en_US'
+@@ -123,8 +123,7 @@
  # Set path for mathjax js to a https URL as sometimes the Breathe docs are displayed under https
  # and we can't load an http mathjax file from an https view of the docs. So we change to a https
  # mathjax file which we can load from http or https. We break the url over two lines.

Modified: packages/breathe/trunk/debian/rules
===================================================================
--- packages/breathe/trunk/debian/rules	2014-11-15 14:13:39 UTC (rev 31454)
+++ packages/breathe/trunk/debian/rules	2014-11-16 14:19:08 UTC (rev 31455)
@@ -4,6 +4,11 @@
 PYDEF=$(shell pyversions -vd)
 SPHINXBUILD="/usr/share/sphinx/scripts/python{version.major}/sphinx-build"
 
+# Build documentation for readthedocs
+export READTHEDOCS=True
+# Do not build for Travis
+export TRAVIS_CI=False
+
 %:
 	dh $@ --with=python2,python3,sphinxdoc --buildsystem=pybuild