[Pkg-sugar-commit] [sugar-toolkit] 03/04: Refresh patches with shortening quilt options --no-timestamps --no-index -pab.

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.86.2-4
in repository sugar-toolkit.

commit 384d0c1445cc5d1b4c23959bb2294fbf2d8118b9
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 24 00:04:52 2010 +0100

    Refresh patches with shortening quilt options --no-timestamps --no-index -pab.
---
 debian/patches/1001_danish_l10n.patch               |  1 -
 .../2002_ignore_debian_and_quilt-patches.patch      |  3 +--
 .../2003_bundlebuilder_exit_nonzero_on_error.patch  | 21 ++++++++++-----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/debian/patches/1001_danish_l10n.patch b/debian/patches/1001_danish_l10n.patch
index 5c654d4..acdb834 100644
--- a/debian/patches/1001_danish_l10n.patch
+++ b/debian/patches/1001_danish_l10n.patch
@@ -1,7 +1,6 @@
 Description: Danish l10n of upstream strings
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2010-02-08
-diff --git a/po/da.po b/po/da.po
 --- /dev/null
 +++ b/po/da.po
 @@ -0,0 +1,186 @@
diff --git a/debian/patches/2002_ignore_debian_and_quilt-patches.patch b/debian/patches/2002_ignore_debian_and_quilt-patches.patch
index 2f1cfad..c70a99a 100644
--- a/debian/patches/2002_ignore_debian_and_quilt-patches.patch
+++ b/debian/patches/2002_ignore_debian_and_quilt-patches.patch
@@ -1,10 +1,9 @@
 Description: Ignore Debian-specific packaging dirs debian/ and .pc/ 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
-@@ -35,7 +35,7 @@ from sugar import env
+@@ -35,7 +35,7 @@
  from sugar.bundle.activitybundle import ActivityBundle
  
  
diff --git a/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch b/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
index 0f3bf9b..4730945 100644
--- a/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
+++ b/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
@@ -1,10 +1,9 @@
 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
-@@ -132,6 +132,7 @@ class Builder(object):
+@@ -132,6 +132,7 @@
              retcode = subprocess.call(args)
              if retcode:
                  print 'ERROR - msgfmt failed with return code %i.' % retcode
@@ -12,7 +11,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)
-@@ -144,7 +145,7 @@ class Builder(object):
+@@ -144,7 +145,7 @@
          files = self.config.bundle.get_files()
  
          if not files:
@@ -21,7 +20,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
              self.fix_manifest()
              files = self.config.bundle.get_files()
  
-@@ -279,8 +280,9 @@ def cmd_dev(config, args):
+@@ -279,8 +280,9 @@
      '''Setup for development'''
  
      if args:
@@ -32,7 +31,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):
-@@ -293,14 +295,16 @@ def cmd_dev(config, args):
+@@ -293,14 +295,16 @@
              print 'ERROR - The bundle has been already setup for development.'
          else:
              print 'ERROR - A bundle with the same name is already installed.'
@@ -50,7 +49,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
  
      packager = XOPackager(Builder(config))
      packager.package()
-@@ -310,8 +314,9 @@ def cmd_fix_manifest(config, args):
+@@ -310,8 +314,9 @@
      '''Add missing files to the manifest'''
  
      if args:
@@ -61,7 +60,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
  
      builder = Builder(config)
      builder.fix_manifest()
-@@ -321,8 +326,9 @@ def cmd_dist_source(config, args):
+@@ -321,8 +326,9 @@
      '''Create a tar source package'''
  
      if args:
@@ -72,7 +71,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
  
      packager = SourcePackager(config)
      packager.package()
-@@ -336,8 +342,9 @@ def cmd_install(config, args):
+@@ -336,8 +342,9 @@
                        help='Prefix to install files to')
      (suboptions, subargs) = parser.parse_args(args)
      if subargs:
@@ -83,7 +82,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
  
      installer = Installer(Builder(config))
      installer.install(suboptions.prefix)
-@@ -347,8 +354,9 @@ def cmd_genpot(config, args):
+@@ -347,8 +354,9 @@
      '''Generate the gettext pot file'''
  
      if args:
@@ -94,7 +93,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):
-@@ -380,14 +388,16 @@ def cmd_genpot(config, args):
+@@ -380,14 +388,16 @@
      retcode = subprocess.call(args)
      if retcode:
          print 'ERROR - xgettext failed with return code %i.' % retcode
@@ -112,7 +111,7 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuil
  
      builder = Builder(config)
      builder.build()
-@@ -417,7 +427,9 @@ def start(bundle_name=None):
+@@ -417,7 +427,9 @@
      try:
          globals()['cmd_' + args[0]](config, args[1:])
      except (KeyError, IndexError):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit.git