[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=03e7f11

The following commit has been merged in the master branch:
commit 03e7f117ae8b91def864f475a6b11e519e4a3196
Author: Scott Kitterman <scott at kitterman.com>
Date:   Wed Nov 21 10:59:06 2012 -0500

      * Update ktouch.install and ktouch-data.install to match new application
      * Update debian/copyright
---
 debian/changelog           |  10 ++-
 debian/copyright           |  34 ++++++-
 debian/ktouch-data.install | 216 ++++++++++++++++++++++++++-------------------
 debian/ktouch.install      |   9 +-
 4 files changed, 172 insertions(+), 97 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a418a93..18dec89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 ktouch (4:4.9.80-0ubuntu1) UNRELEASED; urgency=low
 
-  * New upstream beta release
-  * New upstream beta release
+  [ Jonathan Riddell ]
+  * Initial upstream beta release of the rewritten ktouch
+
+  [ Scott Kitterman ]
+  * Update ktouch.install and ktouch-data.install to match new application
+  * Update debian/copyright
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Nov 2012 16:08:25 +0000
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 21 Nov 2012 10:41:35 -0500
 
 ktouch (4:4.9.3-0ubuntu1) raring; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 5ff3941..6b9f81a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,7 @@ Upstream-Contact: kde-edu at mail.kde.org
 Source: ftp.kde.org
 
 Files: *
-Copyright: 2000-2007, Håvard Frøiland <haavard at users.sourceforge.net>
-           2003-2007, Andreas Nicolai <ghorwin at users.sourceforge.net>
+Copyright:  2012  Sebastian Gottfried <sebastiangottfried at web.de>
 License: GPL-2+
 
 Files: doc/*
@@ -13,6 +12,16 @@ Copyright: 1999-2007, Håvard Frøiland <haavard at users.sourceforge.net>
            1999-2007, Andreas Nicolai <ghorwin at users.sourceforge.net>
 License: GFDL-1.2+
 
+Files: data/courses/de2.xml
+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)
+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>
@@ -40,6 +49,27 @@ License: GPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
+License: GPL-2
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
 License: GFDL-1.2+
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.2
diff --git a/debian/ktouch-data.install b/debian/ktouch-data.install
index 8b66936..9de93ff 100644
--- a/debian/ktouch-data.install
+++ b/debian/ktouch-data.install
@@ -19,98 +19,132 @@ usr/share/icons/hicolor/48x48/apps/ktouch.png
 usr/share/icons/hicolor/scalable/apps/ktouch.svgz
 usr/share/kde4/config.kcfg/ktouch.kcfg
 usr/share/man/man1/ktouch.1
-usr/share/kde4/apps/ktouch/splash.png
-usr/share/kde4/apps/ktouch/ktouchui.rc
 usr/share/kde4/apps/ktouch/typewriter.wav
 usr/share/kde4/apps/ktouch/error.wav
 usr/share/kde4/apps/ktouch/up.wav
 usr/share/kde4/apps/ktouch/down.wav
-usr/share/kde4/apps/ktouch/Lecture/Spanish/es.dvorak.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Spanish/es.1.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Spanish/es.2.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Spanish/es.3.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Arabic/ar.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Slovenian/slovenian.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Polish/pl.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Finnish/fi.junior.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Finnish/fi.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Italian/it.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Czech/cs.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Turkish/tr.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Dutch/nl.junior.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Dutch/nl.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Danish/da.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Danish/da.auto.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Ukrainian/uk.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Brazilian/pt.br-nativo.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/German/de.neo2.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/German/de.1.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/German/de.2.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/German/de.dvorak.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/German/de.3.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/German/de.number.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Lithuanian/lt.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Catalan/ca.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Bulgarian/bg.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Bulgarian/bg.long.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Russian/ru.2.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Russian/ru.long.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Russian/ru.1.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Hellenic/el.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Hungarian/hu.expert.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Hungarian/hu.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/French/fr.auto2.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/French/fr.auto1.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/French/fr.dvorak1.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/French/fr.dvorak2.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Latin/la.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/English/en.dvorak1.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/English/english_alphagrip.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/English/en.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/English/en.dvorak2.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/English/en.colemak.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Slovak/sl.ktouch.xml
-usr/share/kde4/apps/ktouch/Lecture/Norwegian/no.ktouch.xml
-usr/share/kde4/apps/ktouch/keyboard/german/de.dvorak.type2.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/german/de.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/german/de.neo2.all.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/finnish/fi.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/swiss/ch.de.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/swiss/ch.fr.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/arabic/ar.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/russian/ru.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/russian/ru.winkeys.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/danish/dk.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/estonian/ee.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/kannada/kn.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/slovenian/sl.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/latin/lat.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/hebrew/he.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/slovak/sk.qwertz.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/slovak/sk.qwerty.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/lithuanian/lt.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/quebec/qc.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/bulgarian/bg.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/czech/cs.qwertz.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/czech/cs.qwerty.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/tamil/ta_eng.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/tamil/tamil.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/brazilian/pt.br.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/swedish/sv.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/english/en_alphagrip.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/english/en_gb.dvorak.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/english/en_gb.qwerty.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/english/en.dvorak.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/english/en.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/english/en.colemak.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/greek/el.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/italian/it.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/hungarian/hu.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/spanish/es.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/spanish/es.dvorak.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/ukrainian/uk.winkeys.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/norwegian/no.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/french/fr.dvorak.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/french/fr.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/portuguese/pt.keyboard.xml
-usr/share/kde4/apps/ktouch/keyboard/Turkish/tr.f.keyboard.xml
+usr/share/kde4/apps/ktouch/courses/ara.xml
+usr/share/kde4/apps/ktouch/courses/bg1.xml
+usr/share/kde4/apps/ktouch/courses/bg2.xml
+usr/share/kde4/apps/ktouch/courses/br.xml
+usr/share/kde4/apps/ktouch/courses/cat.xml
+usr/share/kde4/apps/ktouch/courses/cz.xml
+usr/share/kde4/apps/ktouch/courses/de.dvorak.xml
+usr/share/kde4/apps/ktouch/courses/de.neo.xml
+usr/share/kde4/apps/ktouch/courses/de1.xml
+usr/share/kde4/apps/ktouch/courses/de2.xml
+usr/share/kde4/apps/ktouch/courses/dk1.xml
+usr/share/kde4/apps/ktouch/courses/es.dvorak.xml
+usr/share/kde4/apps/ktouch/courses/es1.xml
+usr/share/kde4/apps/ktouch/courses/es2.xml
+usr/share/kde4/apps/ktouch/courses/es3.xml
+usr/share/kde4/apps/ktouch/courses/fi.xml
+usr/share/kde4/apps/ktouch/courses/fr.dvarok.xml
+usr/share/kde4/apps/ktouch/courses/fr.xml
+usr/share/kde4/apps/ktouch/courses/gb.xml
+usr/share/kde4/apps/ktouch/courses/gr.xml
+usr/share/kde4/apps/ktouch/courses/it.xml
+usr/share/kde4/apps/ktouch/courses/lt.std.xml
+usr/share/kde4/apps/ktouch/courses/nl1.xml
+usr/share/kde4/apps/ktouch/courses/nl2.xml
+usr/share/kde4/apps/ktouch/courses/no.xml
+usr/share/kde4/apps/ktouch/courses/pl.xml
+usr/share/kde4/apps/ktouch/courses/ru.legacy.xml
+usr/share/kde4/apps/ktouch/courses/ru1.xml
+usr/share/kde4/apps/ktouch/courses/ru2.xml
+usr/share/kde4/apps/ktouch/courses/si.xml
+usr/share/kde4/apps/ktouch/courses/sk.xml
+usr/share/kde4/apps/ktouch/courses/tr.xml
+usr/share/kde4/apps/ktouch/courses/ua.xml
+usr/share/kde4/apps/ktouch/courses/us.colemak.xml
+usr/share/kde4/apps/ktouch/courses/us.dvorak1.xml
+usr/share/kde4/apps/ktouch/courses/us.dvorak2.xml
+usr/share/kde4/apps/ktouch/courses/us.xml
+usr/share/kde4/apps/ktouch/data.xml
+usr/share/kde4/apps/ktouch/images/accuracymeter.svgz
+usr/share/kde4/apps/ktouch/images/charactersperminutemeter.svgz
+usr/share/kde4/apps/ktouch/images/elapsedtimemeter.svgz
+usr/share/kde4/apps/ktouch/images/meterbox.svgz
+usr/share/kde4/apps/ktouch/images/resizegrip.svgz
+usr/share/kde4/apps/ktouch/images/statusled.svgz
+usr/share/kde4/apps/ktouch/images/trainingscreen.svgz
+usr/share/kde4/apps/ktouch/keyboardlayouts/ara.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/bg.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/br.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/ch.fr.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/ch.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/cz.qwerty.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/cz.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/de.dvorak.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/de.neo2.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/de.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/dk.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/ee.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/es.dvorak.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/es.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/fi.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/fr.dvorak.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/fr.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/gb.dvorak.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/gb.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/hu.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/il.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/in.kan.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/in.tam_unicode.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/it.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/latam.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/lt.std.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/no.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/pt.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/ru.legacy.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/ru.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/se.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/si.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/sk.qwerty.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/sk.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/tr.f.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/ua.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/us.colemak.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/us.dvorak.xml
+usr/share/kde4/apps/ktouch/keyboardlayouts/us.xml
+usr/share/kde4/apps/ktouch/qml/AccuracyMeter.qml
+usr/share/kde4/apps/ktouch/qml/Baloon.qml
+usr/share/kde4/apps/ktouch/qml/CharactersPerMinuteMeter.qml
+usr/share/kde4/apps/ktouch/qml/CourseDescriptionItem.qml
+usr/share/kde4/apps/ktouch/qml/CoursePage.qml
+usr/share/kde4/apps/ktouch/qml/CourseSelector.qml
+usr/share/kde4/apps/ktouch/qml/ElapsedTimeMeter.qml
+usr/share/kde4/apps/ktouch/qml/HomeScreen.qml
+usr/share/kde4/apps/ktouch/qml/InfoItem.qml
+usr/share/kde4/apps/ktouch/qml/InformationTable.qml
+usr/share/kde4/apps/ktouch/qml/InitialProfileForm.qml
+usr/share/kde4/apps/ktouch/qml/KeyItem.qml
+usr/share/kde4/apps/ktouch/qml/KeyLabel.qml
+usr/share/kde4/apps/ktouch/qml/Keyboard.qml
+usr/share/kde4/apps/ktouch/qml/KeyboardLayoutEditor.qml
+usr/share/kde4/apps/ktouch/qml/KeyboardUnavailableNotice.qml
+usr/share/kde4/apps/ktouch/qml/LearningProgressGraph.qml
+usr/share/kde4/apps/ktouch/qml/LessonLockedNotice.qml
+usr/share/kde4/apps/ktouch/qml/LessonPreview.qml
+usr/share/kde4/apps/ktouch/qml/LessonSelector.qml
+usr/share/kde4/apps/ktouch/qml/ListItem.qml
+usr/share/kde4/apps/ktouch/qml/MessageBox.qml
+usr/share/kde4/apps/ktouch/qml/Meter.qml
+usr/share/kde4/apps/ktouch/qml/NoCoursesMessage.qml
+usr/share/kde4/apps/ktouch/qml/ProfileDetailsItem.qml
+usr/share/kde4/apps/ktouch/qml/ProfileForm.qml
+usr/share/kde4/apps/ktouch/qml/ProfileSelector.qml
+usr/share/kde4/apps/ktouch/qml/ScoreScreen.qml
+usr/share/kde4/apps/ktouch/qml/SelectionGrip.qml
+usr/share/kde4/apps/ktouch/qml/SelectionRectangle.qml
+usr/share/kde4/apps/ktouch/qml/SheetDialog.qml
+usr/share/kde4/apps/ktouch/qml/StatBox.qml
+usr/share/kde4/apps/ktouch/qml/TrainingLine.qml
+usr/share/kde4/apps/ktouch/qml/TrainingScreen.qml
+usr/share/kde4/apps/ktouch/qml/TrainingScreenMenuOverlay.qml
+usr/share/kde4/apps/ktouch/qml/TrainingScreenToolbar.qml
+usr/share/kde4/apps/ktouch/qml/TrainingWidget.qml
+usr/share/kde4/apps/ktouch/qml/main.qml
+usr/share/kde4/apps/ktouch/schemata/course.xsd
+usr/share/kde4/apps/ktouch/schemata/data.xsd
+usr/share/kde4/apps/ktouch/schemata/keyboardlayout.xsd
diff --git a/debian/ktouch.install b/debian/ktouch.install
index 118af86..ac6715e 100644
--- a/debian/ktouch.install
+++ b/debian/ktouch.install
@@ -1,2 +1,9 @@
 usr/bin/ktouch
-usr/share/applications/kde4/ktouch.desktop
\ No newline at end of file
+usr/lib/kde4/imports/org/kde/ktouch/graph/BarGraph.qml
+usr/lib/kde4/imports/org/kde/ktouch/graph/Label.qml
+usr/lib/kde4/imports/org/kde/ktouch/graph/LegendItem.qml
+usr/lib/kde4/imports/org/kde/ktouch/graph/LineGraph.qml
+usr/lib/kde4/imports/org/kde/ktouch/graph/LineLabel.qml
+usr/lib/kde4/imports/org/kde/ktouch/graph/libgraphplugin.so
+usr/lib/kde4/imports/org/kde/ktouch/graph/qmldir
+usr/share/applications/kde4/ktouch.desktop

-- 
ktouch packaging