[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:33 UTC 2014 

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

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

    * Merge with Debian Git
     - ktouch-data replaces/breaks ktouch << 4.7.3
    * Initial release. Start from the Kubuntu packaging, thanks!
    [ Eshat Cakar ]
    * Add ktouch-data package.
---
 debian/.gitattributes       |   1 +
 debian/changelog            |  15 +++++-
 debian/control              |  23 ++++++++--
 debian/copyright            |   1 +
 debian/ktouch-data.install  | 109 ++++++++++++++++++++++++++++++++++++++++++++
 debian/ktouch.install       |   2 +
 debian/not-installed        |   2 +
 debian/source/local-options |   1 +
 8 files changed, 147 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 db2a2b2..daa3a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
-ktouch (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
+ktouch (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
+  * Merge with Debian Git
+   - ktouch-data replaces/breaks ktouch << 4.7.3
 
- -- Philip Muškovac <yofel at kubuntu.org>  Tue, 01 Nov 2011 15:00:55 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:47:05 +0000
+
+ktouch (4:4.7.2-0r1) UNRELEASED; urgency=low
+
+  * Initial release. Start from the Kubuntu packaging, thanks!
+
+  [ Eshat Cakar ]
+  * Add ktouch-data package.
+  
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Oct 2011 18:55:10 +0200
 
 ktouch (4:4.7.1-0ubuntu2) oneiric; urgency=low
 
diff --git a/debian/control b/debian/control
index 1b4e888..dc40a64 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,21 @@ Source: ktouch
 Section: kde
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Harald Sitter <apachelogger at 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: 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.7)
 Standards-Version: 3.9.2
 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
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/ktouch/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/ktouch/ubuntu
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/ktouch.git
+X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/ktouch.git
 
 Package: ktouch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ktouch-data (>= ${source:Version})
 Suggests: khelpcenter4
 Description: touch typing tutor for KDE
  KTouch is an aid for learning how to type with speed and accuracy.  It
@@ -25,3 +28,13 @@ Description: touch typing tutor for KDE
  level of difficulty.
  .
  This package is part of the KDE education module.
+
+Package: ktouch-data
+Architecture: all
+Breaks: ktouch (<< 4:4.7.3)
+Replaces: ktouch (<< 4:4.7.3)
+Depends: ${misc:Depends}
+Description: data files for ktouch
+ This package contains the architecture-independent data files for ktouch.
+ .
+ This package is part of the KDE education module.
diff --git a/debian/copyright b/debian/copyright
index e155521..5ff3941 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,6 +14,7 @@ Copyright: 1999-2007, Håvard Frøiland <haavard at users.sourceforge.net>
 License: GFDL-1.2+
 
 Files: debian/*
+Copyright: 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Copyright: 2011, Harald Sitter <apachelogger at ubuntu.com>
 License: GPL-2+
 
diff --git a/debian/ktouch-data.install b/debian/ktouch-data.install
new file mode 100644
index 0000000..3abf229
--- /dev/null
+++ b/debian/ktouch-data.install
@@ -0,0 +1,109 @@
+usr/share/doc/kde/HTML/en/ktouch/color_options.png
+usr/share/doc/kde/HTML/en/ktouch/common
+usr/share/doc/kde/HTML/en/ktouch/general_options.png
+usr/share/doc/kde/HTML/en/ktouch/index.cache.bz2
+usr/share/doc/kde/HTML/en/ktouch/index.docbook
+usr/share/doc/kde/HTML/en/ktouch/keyboard_options.png
+usr/share/doc/kde/HTML/en/ktouch/main_screen_default_color.png
+usr/share/doc/kde/HTML/en/ktouch/main_window_german.png
+usr/share/doc/kde/HTML/en/ktouch/man-ktouch.1.docbook
+usr/share/doc/kde/HTML/en/ktouch/sound_options.png
+usr/share/doc/kde/HTML/en/ktouch/statistics_dialog.png
+usr/share/doc/kde/HTML/en/ktouch/statistics_dialog_chart.png
+usr/share/doc/kde/HTML/en/ktouch/training_options.png
+usr/share/icons/hicolor/128x128/apps/ktouch.png
+usr/share/icons/hicolor/16x16/apps/ktouch.png
+usr/share/icons/hicolor/22x22/apps/ktouch.png
+usr/share/icons/hicolor/32x32/apps/ktouch.png
+usr/share/icons/hicolor/48x48/apps/ktouch.png
+usr/share/icons/hicolor/scalable/apps/ktouch.svgz
+usr/share/kde4/apps/ktouch/ar.keyboard.xml
+usr/share/kde4/apps/ktouch/arabic.ktouch.xml
+usr/share/kde4/apps/ktouch/bg.keyboard.xml
+usr/share/kde4/apps/ktouch/bulgarian.ktouch.xml
+usr/share/kde4/apps/ktouch/bulgarian_long.ktouch.xml
+usr/share/kde4/apps/ktouch/catalan.ktouch.xml
+usr/share/kde4/apps/ktouch/colemak.keyboard.xml
+usr/share/kde4/apps/ktouch/colemak.ktouch.xml
+usr/share/kde4/apps/ktouch/cs.qwerty.keyboard.xml
+usr/share/kde4/apps/ktouch/cs.qwertz.keyboard.xml
+usr/share/kde4/apps/ktouch/czech.ktouch.xml
+usr/share/kde4/apps/ktouch/danish.ktouch.xml
+usr/share/kde4/apps/ktouch/danish2.ktouch.xml
+usr/share/kde4/apps/ktouch/de.dvorak.type2.keyboard.xml
+usr/share/kde4/apps/ktouch/de.keyboard.xml
+usr/share/kde4/apps/ktouch/de.neo2.all.keyboard.xml
+usr/share/kde4/apps/ktouch/de_ch.keyboard.xml
+usr/share/kde4/apps/ktouch/dk.keyboard.xml
+usr/share/kde4/apps/ktouch/down.wav
+usr/share/kde4/apps/ktouch/dvorak-fr-1.ktouch.xml
+usr/share/kde4/apps/ktouch/dvorak-fr-2.ktouch.xml
+usr/share/kde4/apps/ktouch/dvorak.ktouch.xml
+usr/share/kde4/apps/ktouch/dvorak_ABCD.ktouch.xml
+usr/share/kde4/apps/ktouch/dvorak_es.ktouch.xml
+usr/share/kde4/apps/ktouch/ee.keyboard.xml
+usr/share/kde4/apps/ktouch/el.keyboard.xml
+usr/share/kde4/apps/ktouch/el.ktouch.xml
+usr/share/kde4/apps/ktouch/en.dvorak.keyboard.xml
+usr/share/kde4/apps/ktouch/en.keyboard.xml
+usr/share/kde4/apps/ktouch/en_gb.dvorak.keyboard.xml
+usr/share/kde4/apps/ktouch/en_gb.qwerty.keyboard.xml
+usr/share/kde4/apps/ktouch/english.ktouch.xml
+usr/share/kde4/apps/ktouch/error.wav
+usr/share/kde4/apps/ktouch/es.dvorak.keyboard.xml
+usr/share/kde4/apps/ktouch/es.keyboard.xml
+usr/share/kde4/apps/ktouch/espanol.ktouch.xml
+usr/share/kde4/apps/ktouch/espanol2.ktouch.xml
+usr/share/kde4/apps/ktouch/fi.keyboard.xml
+usr/share/kde4/apps/ktouch/finnish.ktouch.xml
+usr/share/kde4/apps/ktouch/finnish_for_kids.ktouch.xml
+usr/share/kde4/apps/ktouch/fr.dvorak.keyboard.xml
+usr/share/kde4/apps/ktouch/fr.keyboard.xml
+usr/share/kde4/apps/ktouch/fr_ch.keyboard.xml
+usr/share/kde4/apps/ktouch/french.ktouch.xml
+usr/share/kde4/apps/ktouch/french2.ktouch.xml
+usr/share/kde4/apps/ktouch/german.dvorak.type2.ktouch.xml
+usr/share/kde4/apps/ktouch/german.ktouch.xml
+usr/share/kde4/apps/ktouch/german.neo2.ktouch.xml
+usr/share/kde4/apps/ktouch/german.number.ktouch.xml
+usr/share/kde4/apps/ktouch/german2.ktouch.xml
+usr/share/kde4/apps/ktouch/german3.ktouch.xml
+usr/share/kde4/apps/ktouch/he.keyboard.xml
+usr/share/kde4/apps/ktouch/hu.keyboard.xml
+usr/share/kde4/apps/ktouch/hungarian.expert.ktouch.xml
+usr/share/kde4/apps/ktouch/hungarian.ktouch.xml
+usr/share/kde4/apps/ktouch/it.keyboard.xml
+usr/share/kde4/apps/ktouch/italian.ktouch.xml
+usr/share/kde4/apps/ktouch/kn.keyboard.xml
+usr/share/kde4/apps/ktouch/ktouchui.rc
+usr/share/kde4/apps/ktouch/lat.keyboard.xml
+usr/share/kde4/apps/ktouch/latin.ktouch.xml
+usr/share/kde4/apps/ktouch/lt.keyboard.xml
+usr/share/kde4/apps/ktouch/lt.ktouch.xml
+usr/share/kde4/apps/ktouch/nederlands.ktouch.xml
+usr/share/kde4/apps/ktouch/nederlands_junior.ktouch.xml
+usr/share/kde4/apps/ktouch/no.keyboard.xml
+usr/share/kde4/apps/ktouch/norwegian.ktouch.xml
+usr/share/kde4/apps/ktouch/polish.ktouch.xml
+usr/share/kde4/apps/ktouch/pt.br.keyboard.xml
+usr/share/kde4/apps/ktouch/qc.keyboard.xml
+usr/share/kde4/apps/ktouch/ru-winkeys.keyboard.xml
+usr/share/kde4/apps/ktouch/ru.keyboard.xml
+usr/share/kde4/apps/ktouch/russian.ktouch.xml
+usr/share/kde4/apps/ktouch/russian2ktouch.xml
+usr/share/kde4/apps/ktouch/russian_long.ktouch.xml
+usr/share/kde4/apps/ktouch/sk.qwerty.keyboard.xml
+usr/share/kde4/apps/ktouch/sk.qwertz.keyboard.xml
+usr/share/kde4/apps/ktouch/sl.keyboard.xml
+usr/share/kde4/apps/ktouch/slovak.ktouch.xml
+usr/share/kde4/apps/ktouch/slovenian.ktouch.xml
+usr/share/kde4/apps/ktouch/spanish.ktouch.xml
+usr/share/kde4/apps/ktouch/splash.png
+usr/share/kde4/apps/ktouch/sv.keyboard.xml
+usr/share/kde4/apps/ktouch/turkish.ktouch.xml
+usr/share/kde4/apps/ktouch/typewriter.wav
+usr/share/kde4/apps/ktouch/uk.winkeys.keyboard.xml
+usr/share/kde4/apps/ktouch/ukrainian.ktouch.xml
+usr/share/kde4/apps/ktouch/up.wav
+usr/share/kde4/config.kcfg/ktouch.kcfg
+usr/share/man/man1/ktouch.1
\ No newline at end of file
diff --git a/debian/ktouch.install b/debian/ktouch.install
new file mode 100644
index 0000000..118af86
--- /dev/null
+++ b/debian/ktouch.install
@@ -0,0 +1,2 @@
+usr/bin/ktouch
+usr/share/applications/kde4/ktouch.desktop
\ No newline at end of file
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..6137a10
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+# manpages are compressed
+./usr/share/man/man1/ktouch.1
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

More information about the pkg-kde-commits mailing list