[Pkg-sugar-commit] [sugar-toolkit] 87/118: Refresh patches 2003 and 2991.
Jonas Smedegaard
dr at jones.dk
Thu Apr 16 18:49:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.84.10-1
in repository sugar-toolkit.
commit 1738d64159c10ceab7d9cdf49355a65eef5cf12a
Author: Jonas Smedegaard <dr at jones.dk>
Date: Mon Feb 8 20:07:14 2010 +0100
Refresh patches 2003 and 2991.
---
.../2003_bundlebuilder_exit_nonzero_on_error.patch | 27 +++++++++++-----------
debian/patches/2991_enable_danish_l10n.patch | 11 +++++----
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch b/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
index b7b6605..e63b354 100644
--- a/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
+++ b/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
@@ -1,10 +1,11 @@
Description: Fail (exit with errorcode 1) on fatal errors in bundlebuilder.py
Author: Jonas Smedegaard <dr at jones.dk>
Last-Update: 2010-02-08
-diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py
---- a/src/sugar/activity/bundlebuilder.py
-+++ b/src/sugar/activity/bundlebuilder.py
-@@ -124,6 +124,7 @@ class Builder(object):
+Index: sugar-toolkit/src/sugar/activity/bundlebuilder.py
+===================================================================
+--- sugar-toolkit.orig/src/sugar/activity/bundlebuilder.py 2010-02-08 20:05:20.000000000 +0100
++++ sugar-toolkit/src/sugar/activity/bundlebuilder.py 2010-02-08 20:05:26.000000000 +0100
+@@ -126,6 +126,7 @@
retcode = subprocess.call(args)
if retcode:
print 'ERROR - msgfmt failed with return code %i.' % retcode
@@ -12,7 +13,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
cat = gettext.GNUTranslations(open(mo_file, 'r'))
translated_name = cat.gettext(self.config.activity_name)
-@@ -136,7 +137,7 @@ class Builder(object):
+@@ -138,7 +139,7 @@
files = self.config.bundle.get_files()
if not files:
@@ -21,7 +22,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
self.fix_manifest()
files = self.config.bundle.get_files()
-@@ -263,8 +264,9 @@ def cmd_dev(config, args):
+@@ -265,8 +266,9 @@
'''Setup for development'''
if args:
@@ -32,7 +33,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
bundle_path = env.get_user_activities_path()
if not os.path.isdir(bundle_path):
-@@ -277,13 +279,15 @@ def cmd_dev(config, args):
+@@ -279,13 +281,15 @@
print 'ERROR - The bundle has been already setup for development.'
else:
print 'ERROR - A bundle with the same name is already installed.'
@@ -49,7 +50,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
packager = XOPackager(Builder(config))
packager.package()
-@@ -292,8 +296,9 @@ def cmd_fix_manifest(config, args):
+@@ -294,8 +298,9 @@
'''Add missing files to the manifest'''
if args:
@@ -60,7 +61,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
builder = Builder(config)
builder.fix_manifest()
-@@ -302,8 +307,9 @@ def cmd_dist_source(config, args):
+@@ -304,8 +309,9 @@
'''Create a tar source package'''
if args:
@@ -71,7 +72,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
packager = SourcePackager(config)
packager.package()
-@@ -316,8 +322,9 @@ def cmd_install(config, args):
+@@ -318,8 +324,9 @@
help='Prefix to install files to')
(suboptions, subargs) = parser.parse_args(args)
if subargs:
@@ -82,7 +83,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
installer = Installer(Builder(config))
installer.install(suboptions.prefix)
-@@ -326,8 +333,9 @@ def cmd_genpot(config, args):
+@@ -328,8 +335,9 @@
'''Generate the gettext pot file'''
if args:
@@ -93,7 +94,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
po_path = os.path.join(config.source_dir, 'po')
if not os.path.isdir(po_path):
-@@ -359,13 +367,15 @@ def cmd_genpot(config, args):
+@@ -361,13 +369,15 @@
retcode = subprocess.call(args)
if retcode:
print 'ERROR - xgettext failed with return code %i.' % retcode
@@ -110,7 +111,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
builder = Builder(config)
builder.build()
-@@ -393,7 +403,9 @@ def start(bundle_name=None):
+@@ -395,7 +405,9 @@
try:
globals()['cmd_' + args[0]](config, args[1:])
except (KeyError, IndexError):
diff --git a/debian/patches/2991_enable_danish_l10n.patch b/debian/patches/2991_enable_danish_l10n.patch
index 87028f7..6588c71 100644
--- a/debian/patches/2991_enable_danish_l10n.patch
+++ b/debian/patches/2991_enable_danish_l10n.patch
@@ -1,7 +1,8 @@
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -11489,7 +11489,7 @@ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+Index: sugar-toolkit/configure
+===================================================================
+--- sugar-toolkit.orig/configure 2010-02-08 20:05:14.000000000 +0100
++++ sugar-toolkit/configure 2010-02-08 20:06:02.000000000 +0100
+@@ -11797,7 +11797,7 @@
# Setup GETTEXT
#
@@ -9,4 +10,4 @@ diff --git a/configure b/configure
+ALL_LINGUAS="af am ar ay bg bn bn_IN ca da de dz el en es fa fa_AF ff fr gu ha hi ht ig is it ja km ko mk ml mn mr mvo nb ne nl pa pap pis pl ps pt pt_BR qu ro ru rw sd si sl te th tpi tr ur vi yo zh_CN zh_TW"
GETTEXT_PACKAGE=sugar-toolkit
- { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+ { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit.git
More information about the pkg-sugar-commit
mailing list