[Python-modules-commits] r18338 - in packages/sphinx-issuetracker/trunk/debian (9 files)

Thu Aug 25 18:45:30 UTC 2011

Date: Thursday, August 25, 2011 @ 18:45:29
  Author: fladi-guest
Revision: 18338

New upstream release.

Added:
  packages/sphinx-issuetracker/trunk/debian/patches/do_not_build_license.patch
Modified:
  packages/sphinx-issuetracker/trunk/debian/changelog
  packages/sphinx-issuetracker/trunk/debian/control
  packages/sphinx-issuetracker/trunk/debian/docs
  packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch
  packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch
  packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch
  packages/sphinx-issuetracker/trunk/debian/patches/series
  packages/sphinx-issuetracker/trunk/debian/rules

Modified: packages/sphinx-issuetracker/trunk/debian/changelog
===================================================================

--- packages/sphinx-issuetracker/trunk/debian/changelog	2011-08-25 18:29:33 UTC (rev 18337)
+++ packages/sphinx-issuetracker/trunk/debian/changelog	2011-08-25 18:45:29 UTC (rev 18338)
@@ -1,22 +1,25 @@
-sphinx-issuetracker (0.7.2-1) unstable; urgency=low
+sphinx-issuetracker (0.8-1) unstable; urgency=low
 
   * New upstream version.
   * Upload to unstable.
   * Fix object.inv location for python-sphinx.
   * Recommend python-debianbts as patch has been included upstream.
-  * Move python-launchpadlib and python-lxml to Recommends as they are
-    optional.
+  * Move python-launchpadlib to Recommends as it is optional.
   * Add patch to conditionaly add intersphinx mappings, depending on the
     presence of files.
   * Add patch to disable issuetracker integration during build to prevent
     network access.
   * Add patch to gracefully handle exceptions caused by missing
     packages.
-  * Bump sphinx dependency to (>= 1.0.7).
+  * Bump sphinx dependency to (>= 1.0.7+dfsg-1~)
   * Bumped Standards-Version to 3.9.2 (no change necessary).
   * Clean up debian/* using wrap-and-sort.
+  * Use dh_sphinxdoc.
+  * Mention JIRA as supported issuetracker.
+  * Add patch to disable inclusion of license text in sphinx build.
+  * Remove python-lxml from Recommends as it is no longer used.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Sun, 12 Jun 2011 21:42:56 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Thu, 25 Aug 2011 20:41:12 +0200
 
 sphinx-issuetracker (0.5.4-1) experimental; urgency=low
 

Modified: packages/sphinx-issuetracker/trunk/debian/control
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/control	2011-08-25 18:29:33 UTC (rev 18337)
+++ packages/sphinx-issuetracker/trunk/debian/control	2011-08-25 18:45:29 UTC (rev 18338)
@@ -6,11 +6,10 @@
 Build-Depends: debhelper (>= 7.0.50~),
                python-all (>=2.6),
                python-doc,
-               python-lxml,
                python-mock (>= 0.7.0),
                python-py,
                python-setuptools,
-               python-sphinx (>=1.0.7),
+               python-sphinx (>= 1.0.7+dfsg-1~),
                python-support
 XS-Python-Version: >= 2.6
 Standards-Version: 3.9.2
@@ -22,7 +21,7 @@
 Architecture: all
 Depends: python-sphinx (>=1.0.7), ${misc:Depends}, ${python:Depends}
 Provides: ${python:Provides}
-Recommends: python-debianbts, python-launchpadlib, python-lxml
+Recommends: python-debianbts, python-launchpadlib
 Description: Sphinx integration with different issuetrackers
  This extension for Sphinx 1.0 parses textual issue references like #10, looks
  up the issue in the configured issue tracker, and includes a link to the issue.
@@ -33,5 +32,6 @@
   * Launchpad
   * Google Code
   * Debian BTS
+  * JIRA
  .
  Furthermore this extension provides a simple API to add other issue trackers.

Modified: packages/sphinx-issuetracker/trunk/debian/docs
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/docs	2011-08-25 18:29:33 UTC (rev 18337)
+++ packages/sphinx-issuetracker/trunk/debian/docs	2011-08-25 18:45:29 UTC (rev 18338)
@@ -1,2 +1,2 @@
 README
-.build/html/
+doc/.build/html/

Modified: packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch	2011-08-25 18:29:33 UTC (rev 18337)
+++ packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch	2011-08-25 18:45:29 UTC (rev 18338)
@@ -4,18 +4,15 @@
 Last-Update: 2011-03-03
 Forwarded: not-needed
 
-Index: sphinxcontrib-issuetracker-0.7.1/doc/conf.py
-===================================================================
---- sphinxcontrib-issuetracker-0.7.1.orig/doc/conf.py	2011-03-03 15:44:22.481617721 +0100
-+++ sphinxcontrib-issuetracker-0.7.1/doc/conf.py	2011-03-03 15:44:48.309278045 +0100
-@@ -70,9 +70,7 @@
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -70,8 +70,7 @@
                                               '/usr/share/doc/python-sphinx/html/objects.inv'))
  
  
 -issuetracker = 'bitbucket'
--issuetracker_project = 'sphinx-contrib'
--issuetracker_user = 'birkenfeld'
+-issuetracker_project = 'birkenfeld/sphinx-contrib'
 +issuetracker = None
  
- 
  event_sig_re = re.compile(r'([a-zA-Z-]+)\s*\((.*)\)')
+ 

Added: packages/sphinx-issuetracker/trunk/debian/patches/do_not_build_license.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/do_not_build_license.patch	                        (rev 0)
+++ packages/sphinx-issuetracker/trunk/debian/patches/do_not_build_license.patch	2011-08-25 18:45:29 UTC (rev 18338)
@@ -0,0 +1,28 @@
+Description: Remove license.txt from TOC.
+ For Debian the license is shipped in the copyright file. It is not necessary to
+ ship it again as part of the HTMl documentation. this patch removes the license
+ file from the TOC.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Last-Update: 2011-08-25
+Forwarded: not-needed
+
+--- a/doc/index.rst
++++ b/doc/index.rst
+@@ -7,8 +7,7 @@
+ A Sphinx_ extension to turn textual issue ids like ``#10`` into real references
+ to these issues in an issue tracker.
+ 
+-The extension is available under the terms of the BSD license, see
+-:doc:`license` for more information.
++The extension is available under the terms of the BSD license.
+ 
+ 
+ Installation
+@@ -206,7 +205,6 @@
+    :hidden:
+ 
+    changes.rst
+-   license.rst
+ 
+ 
+ .. _Sphinx: http://sphinx.pocoo.org/

Modified: packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch	2011-08-25 18:29:33 UTC (rev 18337)
+++ packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch	2011-08-25 18:45:29 UTC (rev 18338)
@@ -5,26 +5,12 @@
 Last-Update: 2011-03-03
 Forwarded: not-needed
 
-Index: sphinxcontrib-issuetracker-0.7.1/sphinxcontrib/issuetracker.py
-===================================================================
---- sphinxcontrib-issuetracker-0.7.1.orig/sphinxcontrib/issuetracker.py	2011-03-03 15:28:58.017782406 +0100
-+++ sphinxcontrib-issuetracker-0.7.1/sphinxcontrib/issuetracker.py	2011-03-03 15:44:53.357211648 +0100
-@@ -75,7 +75,10 @@
+--- a/sphinxcontrib/issuetracker.py
++++ b/sphinxcontrib/issuetracker.py
+@@ -160,7 +160,10 @@
+ DEBIAN_URL = 'http://bugs.debian.org/cgi-bin/bugreport.cgi?bug={0}'
  
- 
- def get_bitbucket_issue_information(app, project, user, issue_id):
--    from lxml.html import parse
-+    try:
-+        from lxml.html import parse
-+    except ImportError, e:
-+        raise ImportError("%s (install package python-lxml)" % e)
- 
-     uri = BITBUCKET_URL % locals()
-     with closing(urllib.urlopen(uri)) as response:
-@@ -94,7 +97,10 @@
- 
- 
- def get_debian_issue_information(app, project, user, issue_id):
+ def lookup_debian_issue(app, tracker_config, issue_id):
 -    import debianbts
 +    try:
 +        import debianbts
@@ -32,9 +18,9 @@
 +        raise ImportError("%s (install package python-debianbts)" % e)
      try:
          # get the bug
-         bug = debianbts.get_status(debianbts.get_bugs("bugs", issue_id))[0]
-@@ -112,7 +118,10 @@
- def get_launchpad_issue_information(app, project, user, issue_id):
+         bug = debianbts.get_status(issue_id)[0]
+@@ -180,7 +183,10 @@
+ def lookup_launchpad_issue(app, tracker_config, issue_id):
      launchpad = getattr(app.env, 'issuetracker_launchpad', None)
      if not launchpad:
 -        from launchpadlib.launchpad import Launchpad
@@ -45,3 +31,4 @@
          launchpad = Launchpad.login_anonymously(
              'sphinxcontrib.issuetracker', service_root='production')
          app.env.issuetracker_launchpad = launchpad
+

Modified: packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch	2011-08-25 18:29:33 UTC (rev 18337)
+++ packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch	2011-08-25 18:45:29 UTC (rev 18338)
@@ -7,10 +7,8 @@
 Forwarded: not-needed
 Last-Update: 2011-03-03
 
-Index: sphinxcontrib-issuetracker-0.7.1/doc/conf.py
-===================================================================
---- sphinxcontrib-issuetracker-0.7.1.orig/doc/conf.py	2011-03-03 15:28:58.169780404 +0100
-+++ sphinxcontrib-issuetracker-0.7.1/doc/conf.py	2011-03-03 15:44:22.481617721 +0100
+--- a/doc/conf.py
++++ b/doc/conf.py
 @@ -54,8 +54,21 @@
  html_theme = 'default'
  html_static_path = []
@@ -34,4 +32,4 @@
 +
  
  issuetracker = 'bitbucket'
- issuetracker_project = 'sphinx-contrib'
+ issuetracker_project = 'birkenfeld/sphinx-contrib'

Modified: packages/sphinx-issuetracker/trunk/debian/patches/series
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/series	2011-08-25 18:29:33 UTC (rev 18337)
+++ packages/sphinx-issuetracker/trunk/debian/patches/series	2011-08-25 18:45:29 UTC (rev 18338)
@@ -1,3 +1,4 @@
 intersphinx_mapping.patch
 disable_issuetracker.patch
 handle_missing_packages.patch
+do_not_build_license.patch

Modified: packages/sphinx-issuetracker/trunk/debian/rules
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/rules	2011-08-25 18:29:33 UTC (rev 18337)
+++ packages/sphinx-issuetracker/trunk/debian/rules	2011-08-25 18:45:29 UTC (rev 18338)
@@ -1,15 +1,12 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with=sphinxdoc
 
 .PHONY: override_dh_installdocs
 override_dh_installdocs:
-	PYTHONPATH=.:$$PYTHONPATH sphinx-build -b html -d .build/.doctrees -N doc .build/html
-	dh_installdocs
-	rm -rf .build
-	rm debian/python-sphinx-issuetracker/usr/share/doc/python-sphinx-issuetracker/html/_static/jquery.js
-	ln -s ../../../../javascript/jquery/jquery.js debian/python-sphinx-issuetracker/usr/share/doc/python-sphinx-issuetracker/html/_static/jquery.js
+	PYTHONPATH=.:$$PYTHONPATH sphinx-build -b html -d doc/.build/.doctrees -N doc doc/.build/html
+	dh_installdocs -X license.txt -X license.html
 
 .PHONY: override_dh_compress
 override_dh_compress:
@@ -24,3 +21,11 @@
 	done
 endif
 
+.PHONY: override_dh_clean
+override_dh_clean:
+	rm -rf doc/.build
+	dh_clean
+
+.PHONY: override_dh_sphinxdoc
+override_dh_sphinxdoc:
+	dh_sphinxdoc -X license.html -X license.txt


