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

The following commit has been merged in the master branch:
commit ebaa328e33bf042454e6644c9f037e9e4240a85e
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Fri Nov 25 18:54:33 2011 +0000

    * Merge with Debian Git, no changes
    * Initial release. Start from the Ubuntu packaging, thanks!
---
 debian/.gitattributes                 |  1 +
 debian/changelog                      | 11 +++++++++--
 debian/control                        | 15 ++++++++++-----
 debian/{not-install => not-installed} |  0
 debian/source/local-options           |  1 +
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 598267f..b579e13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-konsole (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
+konsole (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
+  * Merge with Debian Git, no changes
 
- -- Philip Muškovac <yofel at kubuntu.org>  Tue, 01 Nov 2011 14:40:10 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:47:03 +0000
+
+konsole (4:4.7.2-0r1) UNRELEASED; urgency=low
+
+  * Initial release. Start from the Ubuntu packaging, thanks!
+
+ -- Eshat Cakar <info at eshat.de>  Tue, 04 Oct 2011 17:46:40 +0200
 
 konsole (4:4.7.2-0ubuntu1) oneiric-proposed; urgency=low
 
diff --git a/debian/control b/debian/control
index 8bbd6ce..d962725 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,19 @@ Source: konsole
 Section: kde
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-Build-Depends: kde-sc-dev-latest (>= 4:4.7.3),
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>,
+ Eshat Cakar <info at eshat.de>
+Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.6.3), libphonon-dev (>= 4:4.3.0),
- libx11-dev
+ kdelibs5-dev (>= 4:4.7), libphonon-dev (>= 4:4.3.0),
+ libxkbfile-dev
 Standards-Version: 3.9.2
 Homepage: http://www.kde.org/
-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/konsole
-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/konsole
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/konsole/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/konsole/ubuntu
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git
+X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/konsole.git
 
 Package: konsole
 Architecture: any
diff --git a/debian/not-install b/debian/not-installed
similarity index 100%
rename from debian/not-install
rename to debian/not-installed
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes

-- 
konsole packaging