[SCM] KDE Localization module packaging branch, kde4.12, updated. debian/4.11.3-1-9-g59172fb

Maximiliano Curia maxy at moszumanska.debian.org
Sun Feb 9 15:34:49 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-l10n.git;a=commitdiff;h=59172fb

The following commit has been merged in the kde4.12 branch:
commit 59172fb4367545c941855602fd6b7833b2bb1c0b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Feb 9 15:12:34 2014 +0100

    Remove patch: konsole_fr_nofork_option.diff, applied upstream.
---
 debian/changelog                             |  1 +
 debian/patches/konsole_fr_nofork_option.diff | 13 -------------
 debian/patches/series                        |  1 -
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fb19edb..2fa6b97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kde-l10n (4:4.12.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Remove fa and tg packages, no longer distributed upstream.
+  * Remove patch: konsole_fr_nofork_option.diff, applied upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 09 Feb 2014 14:56:37 +0100
 
diff --git a/debian/patches/konsole_fr_nofork_option.diff b/debian/patches/konsole_fr_nofork_option.diff
deleted file mode 100644
index 5da24e3..0000000
--- a/debian/patches/konsole_fr_nofork_option.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kde-l10n/fr/messages/applications/konsole.po
-===================================================================
---- kde-l10n.orig/fr/messages/applications/konsole.po	2013-12-06 15:19:17.231310714 +0100
-+++ kde-l10n/fr/messages/applications/konsole.po	2013-12-06 15:19:17.227310631 +0100
-@@ -1339,7 +1339,7 @@
- msgctxt "@info:shell"
- msgid "Use --nofork to run in the foreground (helpful with the -e option)."
- msgstr ""
--"Utiliser « --no-fork » pour un lancement au premier plan (utile avec "
-+"Utiliser « --nofork » pour un lancement au premier plan (utile avec "
- "l'option « -e »). "
- 
- #: main.cpp:200
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e9f1610..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-konsole_fr_nofork_option.diff

-- 
KDE Localization module packaging



More information about the pkg-kde-commits mailing list