[SCM] ktouch packaging branch, master, updated. debian/4.13.1-2-119-g4daced9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/ktouch.git;a=commitdiff;h=2e11fa6

The following commit has been merged in the master branch:
commit 2e11fa60f99e0a639e0326716214c244be1420e2
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Tue Jun 17 17:02:37 2014 +0100

    merge with debian
---
 debian/.gitattributes       |  1 +
 debian/changelog            | 65 +++++++++++++++++++++++++++++++++++++++++++++
 debian/compat               |  2 +-
 debian/control              | 25 ++++++++++-------
 debian/source/local-options |  1 +
 5 files changed, 84 insertions(+), 10 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 b697c56..c047387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,68 @@
+ktouch (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+  * Merge with Debian:
+   - Add dependency on qtdeclarative4-kqtquickcharts-1 as the qml module
+     is needed for anything to be displayed. LP: #1310019
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Jun 2014 10:42:00 +0100
+
+ktouch (4:4.13.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update install files.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 20 May 2014 18:36:48 +0200
+
+ktouch (4:4.12.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 28 Apr 2014 12:23:41 +0200
+
+ktouch (4:4.12.3-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Mar 2014 00:05:19 +0100
+
+ktouch (4:4.12.2-1) experimental; urgency=low
+
+  * Bump Standards-Version to 3.9.5, no changes needed.
+  * New upstream release.
+  * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:31:34 +0100
+
+ktouch (4:4.11.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 08 Nov 2013 15:23:27 +0100
+
+ktouch (4:4.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 07 Oct 2013 16:52:53 +0200
+
+ktouch (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jul 2013 16:43:08 +0200
+
+ktouch (4:4.10.4-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump debhelper build-dep and compat to 9.
+  * Bump Standards-Version to 3.9.4.
+  * Update vcs fields.
+  * Add myself to uploaders.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 14:31:13 +0200
+
 ktouch (4:4.13.0-0ubuntu1.1) trusty; urgency=medium
 
   * Add dependency on qtdeclarative4-kqtquickcharts-1 as the qml module
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 2034c21..a6b9c5e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,21 +3,28 @@ Section: kde
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Eshat Cakar <info at eshat.de>,
-Build-Depends: kde-sc-dev-latest (>= 4:4.10.1),
- cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.13.0), libqt4-opengl-dev, libxkbfile-dev
-Standards-Version: 3.9.3
+Uploaders: Eshat Cakar <info at eshat.de>, Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.12),
+               kdelibs5-dev (>= 4:4.11),
+               libqt4-opengl-dev,
+               libxkbfile-dev,
+               pkg-kde-tools (>= 0.12)
+Standards-Version: 3.9.5
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/ktouch
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/ktouch
-X-Vcs-Debian-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/ktouch.git
-X-Vcs-Debian-Git: git://git.debian.org/pkg-kde/kde-sc/ktouch.git
+X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/ktouch.git
+X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/ktouch.git
 
 Package: ktouch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ktouch-data (>= ${source:Version}),
- libqt4-sql-sqlite, qtdeclarative4-kqtquickcharts-1
+Depends: ktouch-data (>= ${source:Version}),
+         libqt4-sql-sqlite,
+         qtdeclarative4-kqtquickcharts-1,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: khelpcenter4
 Description: touch typing tutor for KDE
  KTouch is an aid for learning how to type with speed and accuracy.  It
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

-- 
ktouch packaging