From 5576e08e1cce10a232970a5988bdd1dad45397599caf17340961f3df9c44eb32 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 22 Sep 2009 21:50:21 +0000
Subject: [PATCH] Accepting request 20707 from devel:tools:scm

Copy from devel:tools:scm/quilt based on submit request 20707 from user jdelvare

OBS-URL: https://build.opensuse.org/request/show/20707
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quilt?expand=0&rev=24
---
 fix-fr-import-message.diff | 18 ++++++++++++++++++
 quilt.changes              |  6 ++++++
 quilt.spec                 |  5 +++--
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 fix-fr-import-message.diff

diff --git a/fix-fr-import-message.diff b/fix-fr-import-message.diff
new file mode 100644
index 0000000..cb02570
--- /dev/null
+++ b/fix-fr-import-message.diff
@@ -0,0 +1,18 @@
+Fix French translation which was saying the exact opposite of the
+original message. Rather confusing...
+
+---
+ po/fr.po |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- quilt-0.48.orig/po/fr.po
++++ quilt-0.48/po/fr.po
+@@ -690,7 +690,7 @@ msgstr ""
+ 
+ #: quilt/import.in:169
+ msgid "Patch %s is applied\\n"
+-msgstr "Le patch %s n'est pas appliqué\\n"
++msgstr "Le patch %s est appliqué\\n"
+ 
+ #: quilt/import.in:178
+ msgid "Patch %s already exists in series.\\n"
diff --git a/quilt.changes b/quilt.changes
index a35d82f..6318ef9 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep  9 11:41:28 CEST 2009 - jdelvare@suse.de
+
+- Fix a French translation that was saying the exact opposite of
+  the original message.
+
 -------------------------------------------------------------------
 Wed Jul 29 14:25:16 CEST 2009 - jdelvare@suse.de
 
diff --git a/quilt.spec b/quilt.spec
index e3b150f..617176f 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -24,7 +24,7 @@ Summary:        A Tool for Working with Many Patches
 License:        GPL v2 or later
 Group:          Productivity/Text/Utilities
 Version:        0.48
-Release:        2
+Release:        3
 Requires:       coreutils diffutils patch gzip bzip2 perl mktemp diffstat
 %if %{suse_version} > 910
 Recommends:     procmail
@@ -39,6 +39,7 @@ Patch4:         fix-test-create-delete.diff
 Patch5:         hide-git-desc-error.diff
 Patch6:         mail-dont-use-equal-tilde.diff
 Patch7:         revert-should-not-hard-link.diff
+Patch8:         fix-fr-import-message.diff
 Url:            http://savannah.nongnu.org/projects/quilt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -58,7 +59,7 @@ Authors:
 
 %prep
 %setup -q
-%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7
+%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8
 
 %build
 autoconf