[Debian-l10n-commits] [translate-toolkit] 03/15: Refresh patches for new upstream version
Stuart Prescott
stuart at moszumanska.debian.org
Sun Feb 23 14:02:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
stuart pushed a commit to branch master
in repository translate-toolkit.
commit 1c7d11d16c14dbce30b4ee55021f994f6a234870
Author: Stuart Prescott <stuart at debian.org>
Date: Mon Feb 24 00:15:23 2014 +1100
Refresh patches for new upstream version
---
debian/patches/disable-sphinx-theme.patch | 28 +++++++++++++++++++++++++++
debian/patches/manpage-hyphen.patch | 18 -----------------
debian/patches/manpage-rst-note.patch | 26 -------------------------
debian/patches/po2web2py_missing_import.patch | 15 ++++++++++++++
debian/patches/poterminology_defaultstopfile | 2 +-
debian/patches/series | 5 ++---
6 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/debian/patches/disable-sphinx-theme.patch b/debian/patches/disable-sphinx-theme.patch
new file mode 100644
index 0000000..0bddecf
--- /dev/null
+++ b/debian/patches/disable-sphinx-theme.patch
@@ -0,0 +1,28 @@
+Description: don't use sphinx-bootstrap theme for building documentation
+Author: Stuart Prescott <stuart at debian.org>
+Forwarded: http://bugs.locamotion.org/show_bug.cgi?id=2796
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -152,17 +152,17 @@
+
+ # The theme to use for HTML and HTML Help pages. See the documentation for
+ # a list of builtin themes.
+-html_theme = 'sphinx-bootstrap'
++#html_theme = 'sphinx-bootstrap'
+
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further. For a list of options available for each theme, see the
+ # documentation.
+-html_theme_options = {
+- 'nosidebar': True,
+-}
++#html_theme_options = {
++ #'nosidebar': True,
++#}
+
+ # Add any paths that contain custom themes here, relative to this directory.
+-html_theme_path = ['_themes']
++#html_theme_path = ['_themes']
+
+ # The name for this set of Sphinx documents. If None, it defaults to
+ # "<project> v<release> documentation".
diff --git a/debian/patches/manpage-hyphen.patch b/debian/patches/manpage-hyphen.patch
deleted file mode 100644
index 7c6b7c1..0000000
--- a/debian/patches/manpage-hyphen.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Correctly escape "-" in options in man page
- Autogenerated man pages are using - instead of \- for the options.
- Change the option formatter to escape - correctly.
-Author: Stuart Prescott <stuart at debian.org>
-Bug: http://bugs.locamotion.org/attachment.cgi?bugid=2798
---- a/translate/misc/optrecurse.py
-+++ b/translate/misc/optrecurse.py
-@@ -136,8 +136,8 @@
- result.append('.PP\n')
- for option in self.option_list:
- result.append('.TP\n')
-- result.append('%s\n' % option)
-- result.append('%s\n' % option.help)
-+ result.append('%s\n' % str(option).replace('-', '\-'))
-+ result.append('%s\n' % option.help.replace('-', '\-'))
- return "".join(result)
-
- def print_manpage(self, file=None):
diff --git a/debian/patches/manpage-rst-note.patch b/debian/patches/manpage-rst-note.patch
deleted file mode 100644
index afad5ba..0000000
--- a/debian/patches/manpage-rst-note.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Scrub extra rst markup from man pages
- Many tools have a --manpage option that generates a man page using an
- autoformatter of the --help output. The output may contain some raw rst
- constructs that are groff errors, so filtering them out makes man happier.
-Author: Stuart Prescott <stuart at debian.org>
-Bug: http://bugs.locamotion.org/attachment.cgi?bugid=2798
---- a/translate/misc/optrecurse.py
-+++ b/translate/misc/optrecurse.py
-@@ -18,6 +18,7 @@
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-+import re
- import sys
- import os.path
- import fnmatch
-@@ -128,7 +129,8 @@
- description_lines = self.description.split('\n\n')[1:]
- if description_lines:
- result.append('.SH DESCRIPTION\n')
-- result.append('\n'.join(description_lines))
-+ result.append('\n'.join([re.sub('\.\. note::', 'Note:', l)
-+ for l in description_lines]))
- result.append('.SH OPTIONS\n')
- ManHelpFormatter().store_option_strings(self)
- result.append('.PP\n')
diff --git a/debian/patches/po2web2py_missing_import.patch b/debian/patches/po2web2py_missing_import.patch
new file mode 100644
index 0000000..56fd44b
--- /dev/null
+++ b/debian/patches/po2web2py_missing_import.patch
@@ -0,0 +1,15 @@
+Description: Fix missing import of convert
+Author: Leandro Regueiro <leandro.regueiro at gmail.com>
+Origin: upstream, https://github.com/translate/translate/commit/0debbfd86812c8c947115310119119771fb811b5.patch
+Bug: http://bugs.locamotion.org/show_bug.cgi?id=3174
+
+--- a/translate/convert/po2web2py.py
++++ b/translate/convert/po2web2py.py
+@@ -26,6 +26,7 @@
+ for examples and usage instructions.
+ """
+
++from translate.convert import convert
+ from translate.storage import factory
+
+
diff --git a/debian/patches/poterminology_defaultstopfile b/debian/patches/poterminology_defaultstopfile
index 016371c..da69d0b 100644
--- a/debian/patches/poterminology_defaultstopfile
+++ b/debian/patches/poterminology_defaultstopfile
@@ -5,7 +5,7 @@ Status wrt upstream: Debian specific as long as the manpages are only
--- a/translate/tools/poterminology.py
+++ b/translate/tools/poterminology.py
-@@ -470,7 +470,7 @@
+@@ -472,7 +472,7 @@
parser.add_option("-S", "--stopword-list", type="string", metavar="STOPFILE", dest="stopfile",
help="read stopword (term exclusion) list from STOPFILE (default %s)" %
diff --git a/debian/patches/series b/debian/patches/series
index 06e75fe..5a112f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
-zip-encoding.patch
-manpage-rst-note.patch
-manpage-hyphen.patch
+disable-sphinx-theme.patch
+po2web2py_missing_import.patch
storage_bzr
poterminology_defaultstopfile
langmodels-relocate.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-l10n/translate-toolkit.git
More information about the Debian-l10n-commits
mailing list