[Python-modules-commits] r29381 - in packages/breathe/trunk/debian (7 files)

Wed Jun 18 15:47:52 UTC 2014

Date: Wednesday, June 18, 2014 @ 15:47:51
  Author: sramacher
Revision: 29381

New upstream release

Added:
  packages/breathe/trunk/debian/patches/conf.py-version.patch
Modified:
  packages/breathe/trunk/debian/changelog
  packages/breathe/trunk/debian/control
  packages/breathe/trunk/debian/patches/packaged-mathjax.patch
  packages/breathe/trunk/debian/patches/series
  packages/breathe/trunk/debian/rules
Deleted:
  packages/breathe/trunk/debian/patches/undefined-names.patch

Modified: packages/breathe/trunk/debian/changelog
===================================================================

--- packages/breathe/trunk/debian/changelog	2014-06-18 15:26:27 UTC (rev 29380)
+++ packages/breathe/trunk/debian/changelog	2014-06-18 15:47:51 UTC (rev 29381)
@@ -1,8 +1,14 @@
-breathe (1.2.0-2) UNRELEASED; urgency=medium
+breathe (2.0.0-1) UNRELEASED; urgency=medium
 
-  * debian/control: Add Suggests: breathe-doc to python{,3}-breathe. (Closes:
-    #743781)
+  * New upstream release.
+  * debian/control:
+    - Add Suggests: breathe-doc to python{,3}-breathe. (Closes: #743781)
+    - Point Homepage to upstream repository.
   * debian/rules: Call pybuild with --test instead of --build to run tests.
+  * debian/patches:
+    - undefined-names.patch: Removed, applied upstream.
+    - conf.py-version.patch: Hardcode version for documentation instead of
+      running git describe.
 
  -- Sebastian Ramacher <sramacher at debian.org>  Wed, 18 Jun 2014 17:23:01 +0200
 

Modified: packages/breathe/trunk/debian/control
===================================================================
--- packages/breathe/trunk/debian/control	2014-06-18 15:26:27 UTC (rev 29380)
+++ packages/breathe/trunk/debian/control	2014-06-18 15:47:51 UTC (rev 29381)
@@ -18,7 +18,7 @@
 Standards-Version: 3.9.5
 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://michaeljones.github.io/breathe/
+Homepage: http://github.com/michaeljones/breathe/
 
 Package: python-breathe
 Architecture: all

Added: packages/breathe/trunk/debian/patches/conf.py-version.patch
===================================================================
--- packages/breathe/trunk/debian/patches/conf.py-version.patch	                        (rev 0)
+++ packages/breathe/trunk/debian/patches/conf.py-version.patch	2014-06-18 15:47:51 UTC (rev 29381)
@@ -0,0 +1,15 @@
+Description: Hardcode version instead of running git describe --tags
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2014-06-18
+
+--- a/documentation/source/conf.py
++++ b/documentation/source/conf.py
+@@ -34,7 +34,7 @@ extensions = [ 'breathe', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig' ]
+ read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
+ 
+ # 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:
+ 

Modified: packages/breathe/trunk/debian/patches/packaged-mathjax.patch
===================================================================
--- packages/breathe/trunk/debian/patches/packaged-mathjax.patch	2014-06-18 15:26:27 UTC (rev 29380)
+++ packages/breathe/trunk/debian/patches/packaged-mathjax.patch	2014-06-18 15:47:51 UTC (rev 29381)
@@ -3,12 +3,15 @@
 Forwarded: not-needed
 Last-Update: 2014-02-02
 
---- a/testsuite/source/conf.py
-+++ b/testsuite/source/conf.py
-@@ -237,4 +237,5 @@
-                              objname='configuration value',
-                              indextemplate='pair: %s; configuration value')
+--- a/documentation/source/conf.py
++++ b/documentation/source/conf.py
+@@ -110,8 +110,7 @@ spelling_lang='en_US'
+ # 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.
+-mathjax_path = 'https://c328740.ssl.cf1.rackcdn.com/' \
+-               'mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
++mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
  
--
-+# Use the packaged copy of MathJax
-+mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
+ 
+ # Add any paths that contain templates here, relative to this directory.

Modified: packages/breathe/trunk/debian/patches/series
===================================================================
--- packages/breathe/trunk/debian/patches/series	2014-06-18 15:26:27 UTC (rev 29380)
+++ packages/breathe/trunk/debian/patches/series	2014-06-18 15:47:51 UTC (rev 29381)
@@ -1,2 +1,2 @@
-undefined-names.patch
 packaged-mathjax.patch
+conf.py-version.patch

Deleted: packages/breathe/trunk/debian/patches/undefined-names.patch
===================================================================
--- packages/breathe/trunk/debian/patches/undefined-names.patch	2014-06-18 15:26:27 UTC (rev 29380)
+++ packages/breathe/trunk/debian/patches/undefined-names.patch	2014-06-18 15:47:51 UTC (rev 29381)
@@ -1,37 +0,0 @@
-Description: Fix undefined names
-Author: Sebastian Ramacher <sramacher at debian.org>
-Bug: https://github.com/michaeljones/breathe/issues/80
-Forwarded: https://github.com/michaeljones/breathe/pull/82
-Last-Update: 2014-02-02
-
---- a/breathe/directives.py
-+++ b/breathe/directives.py
-@@ -16,7 +16,7 @@
- from sphinx.domains.cpp import DefinitionParser
- 
- from breathe.finder import FinderFactory, NoMatchesError, MultipleMatchesError
--from breathe.parser import DoxygenParserFactory, CacheFactory, ParserError
-+from breathe.parser import DoxygenParserFactory, CacheFactory, ParserError, FileIOError
- from breathe.renderer.rst.doxygen import DoxygenToRstRendererFactoryCreatorConstructor, RstContentCreator
- from breathe.renderer.rst.doxygen import format_parser_error
- from breathe.renderer.rst.doxygen.domain import DomainHandlerFactoryCreator, NullDomainHandler
-@@ -51,6 +51,8 @@
- class NoDefaultProjectError(ProjectError):
-     pass
- 
-+class NodeNotFoundError(BreatheError):
-+    pass
- 
- class BaseDirective(rst.Directive):
- 
---- a/breathe/parser/doxygen/index.py
-+++ b/breathe/parser/doxygen/index.py
-@@ -5,7 +5,7 @@
- """
- 
- from xml.dom import minidom
--
-+from xml.parsers.expat import ExpatError
- 
- import indexsuper as supermod
- 

Modified: packages/breathe/trunk/debian/rules
===================================================================
--- packages/breathe/trunk/debian/rules	2014-06-18 15:26:27 UTC (rev 29380)
+++ packages/breathe/trunk/debian/rules	2014-06-18 15:47:51 UTC (rev 29381)
@@ -16,14 +16,14 @@
 	dh_auto_build
 	pybuild --system=custom -p $(PY3DEF) --build \
 		--build-args="env PYTHONPATH={build_dir} $(MAKE) SPHINXBUILD=$(SPHINXBUILD)"
-	mv testsuite/build/html html
+	mv documentation/build/html html
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	# We test breathe by building the documention. The documentation has already
 	# been built for the default Python 3 version, so we do not need to do this
 	# again. We just test with the default Python 2 version here.
-	pybuild --system=custom -p $(PY3DEF) --test \
+	pybuild --system=custom -p $(PYDEF) --test \
 		--test-args="env PYTHONPATH={build_dir} $(MAKE) SPHINXBUILD=$(SPHINXBUILD)"
 endif
 


