[Python-modules-commits] r30256 - in packages/sphinx-issuetracker/trunk/debian (10 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Tue Aug 26 17:29:35 UTC 2014
Date: Tuesday, August 26, 2014 @ 17:29:35
Author: mitya57-guest
Revision: 30256
* Team upload.
* New upstream release.
+ Build-depend on python-requests.
+ Rebase all patches.
+ Update install and docs files.
* Use dh_python2 instead of dh_pysupport.
+ Build-depend on dh-python instead of python-support.
+ Use X-Python-Version instead of XS-Python-Version.
* Bump debhelper compatibility level to 9.
+ Update debhelper build-dependency.
+ Drop dh_compress override, not needed with new debhelper.
* Bump Standards-Version to 3.9.5, no changes needed.
* Update Homepage URL, the previous one is no longer working.
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/do_not_build_license.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/move_css.patch
packages/sphinx-issuetracker/trunk/debian/python-sphinxcontrib.issuetracker.install
packages/sphinx-issuetracker/trunk/debian/rules
Modified: packages/sphinx-issuetracker/trunk/debian/changelog
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/changelog 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/changelog 2014-08-26 17:29:35 UTC (rev 30256)
@@ -1,9 +1,26 @@
-sphinx-issuetracker (0.9-2) UNRELEASED; urgency=low
+sphinx-issuetracker (0.11-1) UNRELEASED; urgency=low
+ * Team upload.
+
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:04:00 +0200
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ + Build-depend on python-requests.
+ + Rebase all patches.
+ + Update install and docs files.
+ * Use dh_python2 instead of dh_pysupport.
+ + Build-depend on dh-python instead of python-support.
+ + Use X-Python-Version instead of XS-Python-Version.
+ * Bump debhelper compatibility level to 9.
+ + Update debhelper build-dependency.
+ + Drop dh_compress override, not needed with new debhelper.
+ * Bump Standards-Version to 3.9.5, no changes needed.
+ * Update Homepage URL, the previous one is no longer working.
+ -- Dmitry Shachnev <mitya57 at gmail.com> Tue, 26 Aug 2014 20:57:18 +0400
+
sphinx-issuetracker (0.9-1) unstable; urgency=low
* New upstream release.
Modified: packages/sphinx-issuetracker/trunk/debian/control
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/control 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/control 2014-08-26 17:29:35 UTC (rev 30256)
@@ -4,16 +4,17 @@
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Fladischer Michael <FladischerMichael at fladi.at>
Build-Depends: debhelper (>= 7.0.50~),
+ dh-python,
python-all (>= 2.6),
python-doc,
python-mock (>= 0.7.0),
python-py,
+ python-requests (>= 1.1),
python-setuptools,
- python-sphinx (>= 1.0.7+dfsg-1~),
- python-support
-XS-Python-Version: >= 2.6
-Standards-Version: 3.9.2
-Homepage: http://packages.python.org/sphinxcontrib-issuetracker
+ python-sphinx (>= 1.1)
+X-Python-Version: >= 2.6
+Standards-Version: 3.9.5
+Homepage: https://github.com/lunaryorn/sphinxcontrib-issuetracker
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/sphinx-issuetracker/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/sphinx-issuetracker/trunk/
Modified: packages/sphinx-issuetracker/trunk/debian/docs
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/docs 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/docs 2014-08-26 17:29:35 UTC (rev 30256)
@@ -1,2 +1,2 @@
-README
+README.rst
doc/.build/html/
Modified: packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/patches/disable_issuetracker.patch 2014-08-26 17:29:35 UTC (rev 30256)
@@ -2,18 +2,18 @@
Disable the issue tracker integration to allow the package to be built without
network access.
Author: Fladischer Michael <FladischerMichael at fladi.at>
-Last-Update: 2011-08-26
+Last-Update: 2014-08-26
Forwarded: not-needed
--- a/doc/conf.py
+++ b/doc/conf.py
-@@ -70,8 +70,7 @@
+@@ -64,8 +64,7 @@
'/usr/share/doc/python-sphinx/html/objects.inv'))
--issuetracker = 'bitbucket'
--issuetracker_project = 'birkenfeld/sphinx-contrib'
+-issuetracker = 'github'
+-issuetracker_project = 'lunaryorn/sphinxcontrib-issuetracker'
+issuetracker = None
- event_sig_re = re.compile(r'([a-zA-Z-]+)\s*\((.*)\)')
+ EVENT_SIG_RE = re.compile(r'([a-zA-Z-]+)\s*\((.*)\)')
Modified: packages/sphinx-issuetracker/trunk/debian/patches/do_not_build_license.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/do_not_build_license.patch 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/patches/do_not_build_license.patch 2014-08-26 17:29:35 UTC (rev 30256)
@@ -3,26 +3,26 @@
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
+Last-Update: 2014-08-26
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.
+@@ -3,8 +3,7 @@
+ A Sphinx_ extension to reference 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
-@@ -271,7 +270,6 @@
- :hidden:
+@@ -99,7 +98,6 @@
+ configuration
+ customization
+ changes
+- license
- changes.rst
-- license.rst
-
-
+ .. _Github: https://github.com/lunaryorn/sphinxcontrib-issuetracker
.. _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 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch 2014-08-26 17:29:35 UTC (rev 30256)
@@ -3,14 +3,14 @@
ImportError exceptions related to those packages by giving hints on the
package names.
Author: Fladischer Michael <FladischerMichael at fladi.at>
-Last-Update: 2011-08-26
+Last-Update: 2014-08-26
Forwarded: not-needed
---- a/sphinxcontrib/issuetracker.py
-+++ b/sphinxcontrib/issuetracker.py
-@@ -164,7 +164,10 @@
- DEBIAN_URL = 'http://bugs.debian.org/cgi-bin/bugreport.cgi?bug={0}'
+--- a/sphinxcontrib/issuetracker/resolvers.py
++++ b/sphinxcontrib/issuetracker/resolvers.py
+@@ -133,7 +133,10 @@
+
def lookup_debian_issue(app, tracker_config, issue_id):
- import debianbts
+ try:
@@ -20,15 +20,15 @@
try:
# get the bug
bug = debianbts.get_status(issue_id)[0]
-@@ -182,7 +185,10 @@
- LAUNCHPAD_URL = 'https://bugs.launchpad.net/bugs/{0}'
+@@ -149,7 +152,10 @@
+
def lookup_launchpad_issue(app, tracker_config, issue_id):
- from launchpadlib.launchpad import Launchpad
+ try:
+ from launchpadlib.launchpad import Launchpad
+ except ImportError, e:
+ raise ImportError("%s (install package python-launchpadlib)" % e)
- launchpad = Launchpad.login_anonymously(
- 'sphinxcontrib.issuetracker', service_root='production')
+ launchpad = Launchpad.login_anonymously('sphinxcontrib.issuetracker')
try:
+ # get the bug
Modified: packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/patches/intersphinx_mapping.patch 2014-08-26 17:29:35 UTC (rev 30256)
@@ -6,11 +6,20 @@
a level of comfort for the reader of the documentation.
Author: Fladischer Michael <FladischerMichael at fladi.at>
Forwarded: not-needed
-Last-Update: 2011-03-03
+Last-Update: 2014-08-26
--- a/doc/conf.py
+++ b/doc/conf.py
-@@ -54,8 +54,21 @@
+@@ -25,6 +25,8 @@
+
+
+ import re
++import os.path
++import sys
+
+ from sphinx import addnodes
+
+@@ -48,8 +50,21 @@
html_theme = 'default'
html_static_path = []
@@ -32,5 +41,5 @@
+ '/usr/share/doc/python-sphinx/html/objects.inv'))
+
- issuetracker = 'bitbucket'
- issuetracker_project = 'birkenfeld/sphinx-contrib'
+ issuetracker = 'github'
+ issuetracker_project = 'lunaryorn/sphinxcontrib-issuetracker'
Modified: packages/sphinx-issuetracker/trunk/debian/patches/move_css.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/move_css.patch 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/patches/move_css.patch 2014-08-26 17:29:35 UTC (rev 30256)
@@ -2,23 +2,24 @@
This patch separates Python code from CSS by moving the issuetracker.css file
to an other path: /usr/share/sphinx/contrib/issuetracker/
Author: Fladischer Michael <FladischerMichael at fladi.at>
-Last-Update: 2011-08-28
+Last-Update: 2014-08-26
Forwarded: not-needed
---- a/sphinxcontrib/issuetracker.py
-+++ b/sphinxcontrib/issuetracker.py
-@@ -470,9 +470,13 @@
+--- a/sphinxcontrib/issuetracker/__init__.py
++++ b/sphinxcontrib/issuetracker/__init__.py
+@@ -303,9 +303,13 @@
return
app.info(bold('Copying issuetracker stylesheet... '), nonl=True)
dest = path.join(app.builder.outdir, '_static', 'issuetracker.css')
- source = path.join(path.abspath(path.dirname(__file__)),
+- 'issuetracker.css')
+- copyfile(source, dest)
+ source = '/usr/share/sphinx/contrib/issuetracker/issuetracker.css'
+ try:
+ copyfile(source, dest)
+ except IOError:
+ source = path.join(path.abspath(path.dirname(__file__)),
- 'issuetracker.css')
-- copyfile(source, dest)
++ 'issuetracker.css')
+ copyfile(source, dest)
app.info('done')
Modified: packages/sphinx-issuetracker/trunk/debian/python-sphinxcontrib.issuetracker.install
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/python-sphinxcontrib.issuetracker.install 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/python-sphinxcontrib.issuetracker.install 2014-08-26 17:29:35 UTC (rev 30256)
@@ -1,2 +1,2 @@
usr/
-sphinxcontrib/issuetracker.css usr/share/sphinx/contrib/issuetracker/
+sphinxcontrib/issuetracker/issuetracker.css usr/share/sphinx/contrib/issuetracker/
Modified: packages/sphinx-issuetracker/trunk/debian/rules
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/rules 2014-08-26 10:27:54 UTC (rev 30255)
+++ packages/sphinx-issuetracker/trunk/debian/rules 2014-08-26 17:29:35 UTC (rev 30256)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --with=sphinxdoc
+ dh $@ --with=python2,sphinxdoc
.PHONY: override_dh_auto_build
override_dh_auto_build:
@@ -9,10 +9,6 @@
rm -f doc/license.rst
PYTHONPATH=.:$$PYTHONPATH sphinx-build -b html -d doc/.build/.doctrees -N doc doc/.build/html
-.PHONY: override_dh_compress
-override_dh_compress:
- dh_compress -X .js -X .html -X objects.inv
-
.PHONY: override_dh_auto_test
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
More information about the Python-modules-commits
mailing list