[Pkg-sugar-commit] [sugar-toolkit] 99/118: 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.84.10-1
in repository sugar-toolkit.

commit 4ff7baa164f0f8ffc7c299e35125fe76dc508c87
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 -
 debian/patches/2002_ignore_debian_and_quilt-patches.patch     | 3 +--
 debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch | 6 ++----
 debian/patches/2991_enable_danish_l10n.patch                  | 6 ++----
 4 files changed, 5 insertions(+), 11 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 10a7557..95a3938 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
-@@ -34,7 +34,7 @@ from fnmatch import fnmatch
+@@ -34,7 +34,7 @@
  from sugar import env
  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 e63b354..b165dcb 100644
--- a/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
+++ b/debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
@@ -1,10 +1,8 @@
 Description: Fail (exit with errorcode 1) on fatal errors in bundlebuilder.py
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2010-02-08
-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
+--- a/src/sugar/activity/bundlebuilder.py
++++ b/src/sugar/activity/bundlebuilder.py
 @@ -126,6 +126,7 @@
              retcode = subprocess.call(args)
              if retcode:
diff --git a/debian/patches/2991_enable_danish_l10n.patch b/debian/patches/2991_enable_danish_l10n.patch
index 6588c71..67bbb40 100644
--- a/debian/patches/2991_enable_danish_l10n.patch
+++ b/debian/patches/2991_enable_danish_l10n.patch
@@ -1,7 +1,5 @@
-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
+--- a/configure
++++ b/configure
 @@ -11797,7 +11797,7 @@
  
  # Setup GETTEXT

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