[SCM] konsole packaging branch, kde4.11, updated. debian/4.10.5-2-3-gabe90ee
Maximiliano Curia
maxy at alioth.debian.org
Thu Sep 26 13:17:20 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git;a=commitdiff;h=124853e
The following commit has been merged in the kde4.11 branch:
commit 124853e66491234c26a973898cc1799f3b5511eb
Author: Maximiliano Curia <maxy at debian.org>
Date: Thu Sep 26 13:04:36 2013 +0000
Refresh patches.
---
debian/changelog | 1 +
debian/patches/debian-T-addition.diff | 11 ++++++-----
debian/patches/hurd.diff | 8 +++++---
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f111aba..0d92e7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
konsole (4:4.11.1-0r0) UNRELEASED; urgency=low
* New upstream release.
+ * Refresh patches.
-- Maximiliano Curia <maxy at debian.org> Tue, 03 Sep 2013 20:20:23 +0200
diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
index 4c8900e..fb61327 100644
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@ -1,11 +1,12 @@
Index: konsole/src/main.cpp
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -184,6 +184,7 @@ void fillCommandLineOptions(KCmdLineOpti
+===================================================================
+--- konsole.orig/src/main.cpp 2013-09-26 13:02:46.456857435 +0000
++++ konsole/src/main.cpp 2013-09-26 13:03:25.331385762 +0000
+@@ -184,6 +184,7 @@
" (for use with -p)"));
options.add("p <property=value>",
- ki18n("Change the value of a profile property."));
+ ki18nc("@info:shell", "Change the value of a profile property."));
+ options.add("T <value>", ki18n("Debian policy compatibility, not used"));
options.add("!e <cmd>",
- ki18n("Command to execute. This option will catch all following"
+ ki18nc("@info:shell", "Command to execute. This option will catch all following"
" arguments, so use it as the last option."));
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
index 8c12c78..fa4461c 100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@ -4,9 +4,11 @@ Description: Quick fix to compile konsole on Hurd
Last-Update: 2013-07-13
Forwarded: not-needed
---- a/src/ProcessInfo.cpp
-+++ b/src/ProcessInfo.cpp
-@@ -67,6 +67,10 @@
+Index: konsole/src/ProcessInfo.cpp
+===================================================================
+--- konsole.orig/src/ProcessInfo.cpp 2013-09-26 13:03:44.354665475 +0000
++++ konsole/src/ProcessInfo.cpp 2013-09-26 13:03:44.350665627 +0000
+@@ -61,6 +61,10 @@
# endif
#endif
--
konsole packaging
More information about the pkg-kde-commits
mailing list