[Debian-l10n-commits] [translate-toolkit] 04/08: Update patches for new upstream version
Stuart Prescott
stuart at moszumanska.debian.org
Mon Aug 25 14:37:44 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 983d4a8c5941d1f660c4e24177f5bfb252767e59
Author: Stuart Prescott <stuart at debian.org>
Date: Tue Aug 26 00:23:13 2014 +1000
Update patches for new upstream version
---
debian/patches/disable-sphinx-theme.patch | 2 +-
debian/patches/langmodels-relocate.patch | 8 +++----
debian/patches/po2web2py_missing_import.patch | 15 -------------
debian/patches/series | 3 +--
debian/patches/sphinx-intersphinx.patch | 2 +-
debian/patches/storage_bzr | 32 +++++++++++++--------------
6 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/debian/patches/disable-sphinx-theme.patch b/debian/patches/disable-sphinx-theme.patch
index 0bddecf..7a2904d 100644
--- a/debian/patches/disable-sphinx-theme.patch
+++ b/debian/patches/disable-sphinx-theme.patch
@@ -3,7 +3,7 @@ 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 @@
+@@ -158,17 +158,17 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
diff --git a/debian/patches/langmodels-relocate.patch b/debian/patches/langmodels-relocate.patch
index afb48fc..5f09964 100644
--- a/debian/patches/langmodels-relocate.patch
+++ b/debian/patches/langmodels-relocate.patch
@@ -5,11 +5,11 @@ Author: Stuart Prescott <stuart at debian.org>
Forwarded: possibly Debian-specific; http://bugs.locamotion.org/show_bug.cgi?id=2793
--- a/translate/misc/file_discovery.py
+++ b/translate/misc/file_discovery.py
-@@ -54,6 +54,7 @@
- BASE_DIRS += os.environ['RESOURCEPATH'].split(os.path.pathsep)
+@@ -37,6 +37,7 @@
+ path_parts = [path_parts]
DATA_DIRS = [
+ ["/usr/share/translate/"],
- ["..", "..", "share"],
["..", "share"],
- ["share"],
+ ]
+
diff --git a/debian/patches/po2web2py_missing_import.patch b/debian/patches/po2web2py_missing_import.patch
deleted file mode 100644
index 56fd44b..0000000
--- a/debian/patches/po2web2py_missing_import.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/series b/debian/patches/series
index 5a112f9..c565ee7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
disable-sphinx-theme.patch
-po2web2py_missing_import.patch
storage_bzr
poterminology_defaultstopfile
-langmodels-relocate.patch
sphinx-intersphinx.patch
+langmodels-relocate.patch
diff --git a/debian/patches/sphinx-intersphinx.patch b/debian/patches/sphinx-intersphinx.patch
index 95e2947..eed9ebf 100644
--- a/debian/patches/sphinx-intersphinx.patch
+++ b/debian/patches/sphinx-intersphinx.patch
@@ -9,6 +9,6 @@ Author: Stuart Prescott <stuart at debian.org>
'sphinx.ext.coverage',
'sphinx.ext.extlinks',
- 'sphinx.ext.intersphinx',
+ 'sphinx.ext.todo',
]
- # Add any paths that contain templates here, relative to this directory.
diff --git a/debian/patches/storage_bzr b/debian/patches/storage_bzr
index 5b4c1d1..cd35280 100644
--- a/debian/patches/storage_bzr
+++ b/debian/patches/storage_bzr
@@ -16,18 +16,18 @@ Should be forwarded upstream.
+ command = ["bzr", "revert", self.location_rel]
+ exitcode, output_revert, error = run_command(command, self.root_dir)
if exitcode != 0:
- raise IOError("[BZR] revert of '%s' failed: %s" \
-- % (self.location_abs, error))
-+ % (self.location_rel, error))
+ raise IOError("[BZR] revert of '%s' failed: %s" % (
+- self.location_abs, error))
++ self.location_rel, error))
# bzr pull
command = ["bzr", "pull"]
- exitcode, output_pull, error = run_command(command)
-+ exitcode, output_revert, error = run_command(command, self.root_dir)
++ exitcode, output_pull, error = run_command(command, self.root_dir)
if exitcode != 0:
- raise IOError("[BZR] pull of '%s' failed: %s" \
-- % (self.location_abs, error))
-+ % (self.root_dir, error))
+ raise IOError("[BZR] pull of '%s' failed: %s" % (
+- self.location_abs, error))
++ self.root_dir, error))
return output_revert + output_pull
def add(self, files, message=None, author=None):
@@ -40,17 +40,17 @@ Should be forwarded upstream.
+ command.append(self.location_rel)
+ exitcode, output_commit, error = run_command(command, self.root_dir)
if exitcode != 0:
- raise IOError("[BZR] commit of '%s' failed: %s" \
-- % (self.location_abs, error))
-+ % (self.location_rel, error))
+ raise IOError("[BZR] commit of '%s' failed: %s" % (
+- self.location_abs, error))
++ self.location_rel, error))
# bzr push
command = ["bzr", "push"]
- exitcode, output_push, error = run_command(command)
+ exitcode, output_push, error = run_command(command, self.root_dir)
if exitcode != 0:
- raise IOError("[BZR] push of '%s' failed: %s" \
-- % (self.location_abs, error))
-+ % (self.root_dir, error))
+ raise IOError("[BZR] push of '%s' failed: %s" % (
+- self.location_abs, error))
++ self.root_dir, error))
return output_commit + output_push
def getcleanfile(self, revision=None):
@@ -61,7 +61,7 @@ Should be forwarded upstream.
+ command = ["bzr", "cat", self.location_rel]
+ exitcode, output, error = run_command(command, self.root_dir)
if exitcode != 0:
- raise IOError("[BZR] cat failed for '%s': %s" \
-- % (self.location_abs, error))
-+ % (self.location_rel, error))
+ raise IOError("[BZR] cat failed for '%s': %s" % (
+- self.location_abs, error))
++ self.location_rel, error))
return output
--
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