[Python-modules-commits] [sphinx-issuetracker] 01/01: Convert patches to gbp-pq format.

Dmitry Shachnev mitya57 at moszumanska.debian.org
Tue Oct 3 15:22:31 UTC 2017


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

mitya57 pushed a commit to branch debian/master
in repository sphinx-issuetracker.

commit b82083ae4eb8f829cd98ed247d7c13340e44de29
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 3 22:14:26 2017 +0700

    Convert patches to gbp-pq format.
---
 debian/patches/disable_issuetracker.patch    | 19 +++++++++++++------
 debian/patches/do_not_build_license.patch    | 23 +++++++++++++++--------
 debian/patches/handle_missing_packages.patch | 23 +++++++++++++++--------
 debian/patches/intersphinx_mapping.patch     | 25 ++++++++++++++++---------
 debian/patches/move_css.patch                | 19 +++++++++++++------
 5 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/debian/patches/disable_issuetracker.patch b/debian/patches/disable_issuetracker.patch
index 692aebc..af5ba2f 100644
--- a/debian/patches/disable_issuetracker.patch
+++ b/debian/patches/disable_issuetracker.patch
@@ -1,13 +1,20 @@
-Description: Disable issue tracker integration during build.
- Disable the issue tracker integration to allow the package to be built without 
- network access.
-Author: Fladischer Michael <FladischerMichael at fladi.at>
-Last-Update: 2014-08-26
+From: Fladischer Michael <FladischerMichael at fladi.at>
+Date: Tue, 26 Aug 2014 17:29:35 +0000
+Subject: Disable issue tracker integration during build.
+
+Disable the issue tracker integration to allow the package to be built without
+network access.
+
 Forwarded: not-needed
+---
+ doc/conf.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
+diff --git a/doc/conf.py b/doc/conf.py
+index a7c5852..50cee89 100644
 --- a/doc/conf.py
 +++ b/doc/conf.py
-@@ -64,8 +64,7 @@
+@@ -66,8 +66,7 @@ intersphinx_mapping.update(check_object_path('sphinx',
                                               '/usr/share/doc/python-sphinx/html/objects.inv'))
  
  
diff --git a/debian/patches/do_not_build_license.patch b/debian/patches/do_not_build_license.patch
index d869931..2360bc6 100644
--- a/debian/patches/do_not_build_license.patch
+++ b/debian/patches/do_not_build_license.patch
@@ -1,14 +1,21 @@
-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: 2014-08-26
+From: Fladischer Michael <FladischerMichael at fladi.at>
+Date: Tue, 26 Aug 2014 17:29:35 +0000
+Subject: 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.
+
 Forwarded: not-needed
+---
+ doc/index.rst | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
+diff --git a/doc/index.rst b/doc/index.rst
+index 6de6d46..0c02e7d 100644
 --- a/doc/index.rst
 +++ b/doc/index.rst
-@@ -3,8 +3,7 @@
+@@ -3,8 +3,7 @@ sphinxcontrib.issuetracker -- Reference issues in issue trackers
  
  A Sphinx_ extension to reference issues in an issue tracker.
  
@@ -18,7 +25,7 @@ Forwarded: not-needed
  
  
  Installation
-@@ -99,7 +98,6 @@
+@@ -99,7 +98,6 @@ Contents
     configuration
     customization
     changes
diff --git a/debian/patches/handle_missing_packages.patch b/debian/patches/handle_missing_packages.patch
index 3ae7e32..598339b 100644
--- a/debian/patches/handle_missing_packages.patch
+++ b/debian/patches/handle_missing_packages.patch
@@ -1,14 +1,21 @@
-Description: Handle ImportError more gracefully
- To assist users who do not install the Recommends, enhance the message for 
- ImportError exceptions related to those packages by giving hints on the 
- package names.
-Author: Fladischer Michael <FladischerMichael at fladi.at>
-Last-Update: 2014-08-26
+From: Fladischer Michael <FladischerMichael at fladi.at>
+Date: Tue, 26 Aug 2014 17:29:35 +0000
+Subject: Handle ImportError more gracefully
+
+To assist users who do not install the Recommends, enhance the message for
+ImportError exceptions related to those packages by giving hints on the
+package names.
+
 Forwarded: not-needed
+---
+ sphinxcontrib/issuetracker/resolvers.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
+diff --git a/sphinxcontrib/issuetracker/resolvers.py b/sphinxcontrib/issuetracker/resolvers.py
+index ab3a54d..4bc5bb0 100644
 --- a/sphinxcontrib/issuetracker/resolvers.py
 +++ b/sphinxcontrib/issuetracker/resolvers.py
-@@ -133,7 +133,10 @@
+@@ -133,7 +133,10 @@ def lookup_bitbucket_issue(app, tracker_config, issue_id):
  
  
  def lookup_debian_issue(app, tracker_config, issue_id):
@@ -20,7 +27,7 @@ Forwarded: not-needed
      try:
          # get the bug
          bug = debianbts.get_status(issue_id)[0]
-@@ -149,7 +152,10 @@
+@@ -149,7 +152,10 @@ def lookup_debian_issue(app, tracker_config, issue_id):
  
  
  def lookup_launchpad_issue(app, tracker_config, issue_id):
diff --git a/debian/patches/intersphinx_mapping.patch b/debian/patches/intersphinx_mapping.patch
index a2a40a4..717c66f 100644
--- a/debian/patches/intersphinx_mapping.patch
+++ b/debian/patches/intersphinx_mapping.patch
@@ -1,13 +1,20 @@
-Description: Use local object inventory files for sphinx
- Use the local object inventory files to prevent sphinx-build from 
- downloading them during build.
- This patch makes the intersphinx mappings depend on the existence of 
- these files, thus passing Debian Policy 12.3 while still maintaining 
- a level of comfort for the reader of the documentation.
-Author: Fladischer Michael <FladischerMichael at fladi.at>
+From: Fladischer Michael <FladischerMichael at fladi.at>
+Date: Tue, 26 Aug 2014 17:29:35 +0000
+Subject: Use local object inventory files for sphinx
+
+Use the local object inventory files to prevent sphinx-build from
+downloading them during build.
+This patch makes the intersphinx mappings depend on the existence of
+these files, thus passing Debian Policy 12.3 while still maintaining
+a level of comfort for the reader of the documentation.
+
 Forwarded: not-needed
-Last-Update: 2014-08-26
+---
+ doc/conf.py | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
 
+diff --git a/doc/conf.py b/doc/conf.py
+index 668cba6..a7c5852 100644
 --- a/doc/conf.py
 +++ b/doc/conf.py
 @@ -25,6 +25,8 @@
@@ -19,7 +26,7 @@ Last-Update: 2014-08-26
  
  from sphinx import addnodes
  
-@@ -48,8 +50,21 @@
+@@ -48,8 +50,21 @@ exclude_patterns = ['_build/*']
  html_theme = 'default'
  html_static_path = []
  
diff --git a/debian/patches/move_css.patch b/debian/patches/move_css.patch
index 6c7b9b3..9c9fb48 100644
--- a/debian/patches/move_css.patch
+++ b/debian/patches/move_css.patch
@@ -1,13 +1,20 @@
-Description: Move CSS file out of python path.
- 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: 2014-08-26
+From: Fladischer Michael <FladischerMichael at fladi.at>
+Date: Tue, 26 Aug 2014 17:29:35 +0000
+Subject: Move CSS file out of python path.
+
+This patch separates Python code from CSS by moving the issuetracker.css file
+to an other path: /usr/share/sphinx/contrib/issuetracker/
+
 Forwarded: not-needed
+---
+ sphinxcontrib/issuetracker/__init__.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
 
+diff --git a/sphinxcontrib/issuetracker/__init__.py b/sphinxcontrib/issuetracker/__init__.py
+index 8681c6b..55cceba 100644
 --- a/sphinxcontrib/issuetracker/__init__.py
 +++ b/sphinxcontrib/issuetracker/__init__.py
-@@ -303,9 +303,13 @@
+@@ -303,9 +303,13 @@ def copy_stylesheet(app, exception):
          return
      app.info(bold('Copying issuetracker stylesheet... '), nonl=True)
      dest = path.join(app.builder.outdir, '_static', 'issuetracker.css')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx-issuetracker.git



More information about the Python-modules-commits mailing list