[SCM] konsole packaging branch, master, updated. debian/4.13.1-1-129-gef8d535

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git;a=commitdiff;h=421bddd

The following commit has been merged in the master branch:
commit 421bddd3d4fb672b46e99b830fec34075ccfe84f
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Wed Jun 6 14:40:50 2012 +0100

    new upstream release
---
 debian/changelog                      |  6 ++++++
 debian/konsole.install                | 11 ++++++++---
 debian/patches/debian-T-addition.diff | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3eb34fa..e445f51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+konsole (4:4.8.80-0ubuntu1~ppa1) quantal; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 06 Jun 2012 14:29:24 +0100
+
 konsole (4:4.8.3-0ubuntu1) quantal; urgency=low
 
   * New upstream release
diff --git a/debian/konsole.install b/debian/konsole.install
index bf746c3..e84a522 100644
--- a/debian/konsole.install
+++ b/debian/konsole.install
@@ -7,15 +7,15 @@ usr/share/applications/kde4/konsole.desktop
 usr/share/doc/kde/HTML/en/konsole/common
 usr/share/doc/kde/HTML/en/konsole/index.cache.bz2
 usr/share/doc/kde/HTML/en/konsole/index.docbook
-usr/share/kde4/apps/konsole/BlackOnLightYellow.schema
+usr/share/kde4/apps/konsole/BlackOnLightYellow.colorscheme
 usr/share/kde4/apps/konsole/BlackOnRandomLight.colorscheme
-usr/share/kde4/apps/konsole/BlackOnWhite.schema
+usr/share/kde4/apps/konsole/BlackOnWhite.colorscheme
 usr/share/kde4/apps/konsole/DarkPastels.colorscheme
 usr/share/kde4/apps/konsole/GreenOnBlack.colorscheme
 usr/share/kde4/apps/konsole/Linux.colorscheme
 usr/share/kde4/apps/konsole/README.KeyTab
 usr/share/kde4/apps/konsole/Shell.profile
-usr/share/kde4/apps/konsole/WhiteOnBlack.schema
+usr/share/kde4/apps/konsole/WhiteOnBlack.colorscheme
 usr/share/kde4/apps/konsole/default.keytab
 usr/share/kde4/apps/konsole/konsole.notifyrc
 usr/share/kde4/apps/konsole/konsoleui.rc
@@ -27,3 +27,8 @@ usr/share/kde4/services/ServiceMenus/konsolehere.desktop
 usr/share/kde4/services/konsolepart.desktop
 usr/share/kde4/servicetypes/terminalemulator.desktop
 usr/share/kde4/apps/konsole/Solarized.colorscheme
+usr/share/kde4/apps/kconf_update/konsole.upd
+usr/share/kde4/apps/kconf_update/konsole-2.9.0-global-options.sh
+usr/share/kde4/apps/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh
+usr/share/kde4/apps/konsole/RedOnBlack.colorscheme
+usr/share/kde4/apps/konsole/BlueOnBlack.colorscheme
diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
index 619a01d..1b63334 100644
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@ -1,12 +1,12 @@
-Index: konsole-4.7.90/src/main.cpp
+Index: konsole-4.8.80/src/main.cpp
 ===================================================================
---- konsole-4.7.90.orig/src/main.cpp	2011-11-17 20:57:16.000000000 +0000
-+++ konsole-4.7.90/src/main.cpp	2011-12-16 16:00:21.000000000 +0000
-@@ -117,6 +117,7 @@
-     // TODO - Document this option more clearly
-     options.add("p <property=value>",ki18n("Change the value of a profile property."));
-     options.add("list-profile-properties", ki18n("List all the profile properties names and their type (for use with -p)"));
+--- konsole-4.8.80.orig/src/main.cpp	2012-05-24 08:12:37.000000000 +0100
++++ konsole-4.8.80/src/main.cpp	2012-06-06 14:30:31.999789567 +0100
+@@ -176,6 +176,7 @@
+     options.add("list-profile-properties",
+                 ki18n("List all the profile properties names and their type"
+                       " (for use with -p)"));
 +    options.add("T <value>", ki18n("Debian policy compatibility, not used"));
-     options.add("!e <cmd>",ki18n("Command to execute"));
-     options.add("+[args]",ki18n("Arguments passed to command"));
-     options.add("", ki18n("Use --nofork to run in the foreground (helpful with the -e option)."));
+     options.add("p <property=value>",
+                 ki18n("Change the value of a profile property."));
+     options.add("!e <cmd>",

-- 
konsole packaging