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

Maximiliano Curia maxy at moszumanska.debian.org
Fri Jul 18 07:15:39 UTC 2014


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

The following commit has been merged in the master branch:
commit cc56c461b946cf0e2789722000e337c9788ea97e
Author: Philip Muskovac <yofel at gmx.net>
Date:   Fri Dec 21 11:17:15 2012 +0100

    * Build-depend on libxkbfile-dev for keyboard layout detection
    * Fix syntax of debian/copyright
---
 debian/changelog | 5 +++++
 debian/control   | 3 ++-
 debian/copyright | 7 +++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 888fbc0..a716ab8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 ktouch (4:4.9.95-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Jonathan Riddell ]
   * New upstream RC release
 
+  [ Philip Muškovac ]
+  * Build-depend on libxkbfile-dev for keyboard layout detection
+  * Fix syntax of debian/copyright
+
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:41:14 +0000
 
 ktouch (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
diff --git a/debian/control b/debian/control
index e9bdac9..5062831 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.
 Uploaders: Eshat Cakar <info at eshat.de>
 Build-Depends: 
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.9.95), libqt4-opengl-dev
+ kdelibs5-dev (>= 4:4.9.95), libqt4-opengl-dev,
+ libxkbfile-dev
 Standards-Version: 3.9.2
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/ktouch
diff --git a/debian/copyright b/debian/copyright
index 6b9f81a..d88c102 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,14 +17,13 @@ Copyright: Andreas Kalbitz
             Sven Gohlke
 License: GPL-2
 
-Files: data/courses/nl2.xml
-Files: data/data.xml
-Copyright 2004 by Marc Heyvaert (marc_heyvaert AT yahoo DOT com)
+Files: data/courses/nl2.xml data/data.xml
+Copyright: 2004 by Marc Heyvaert (marc_heyvaert AT yahoo DOT com)
 License: GPL-2
 
 Files: debian/*
 Copyright: 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Copyright: 2011, Harald Sitter <apachelogger at ubuntu.com>
+           2011, Harald Sitter <apachelogger at ubuntu.com>
 License: GPL-2+
 
 License: GPL-2+

-- 
ktouch packaging



More information about the pkg-kde-commits mailing list