[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=dcb1fbd

The following commit has been merged in the master branch:
commit dcb1fbd95bcd15cc1a66aaedc4bd71a4462b4e55
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Tue Dec 20 23:40:42 2011 +0000

    4.7.90 packaging
---
 debian/.gitattributes                 |  1 -
 debian/changelog                      |  6 ++++++
 debian/control                        |  2 +-
 debian/konsole.install                |  1 +
 debian/patches/debian-T-addition.diff | 10 ++++++----
 debian/source/local-options           |  1 -
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index b579e13..07006e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+konsole (4:4.7.90-0ubuntu1) precise; urgency=low
+
+  * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 16 Dec 2011 13:14:43 +0000
+
 konsole (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d962725..c658eca 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>,
 Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
  kdelibs5-dev (>= 4:4.7), libphonon-dev (>= 4:4.3.0),
- libxkbfile-dev
+ libxkbfile-dev, libkonq5-dev
 Standards-Version: 3.9.2
 Homepage: http://www.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/konsole/ubuntu
diff --git a/debian/konsole.install b/debian/konsole.install
index 54b27d6..bf746c3 100644
--- a/debian/konsole.install
+++ b/debian/konsole.install
@@ -26,3 +26,4 @@ usr/share/kde4/apps/konsole/solaris.keytab
 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
diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
index 09a38cb..619a01d 100644
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@ -1,10 +1,12 @@
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -105,6 +105,7 @@
+Index: konsole-4.7.90/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)"));
 +    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)."));
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
konsole packaging