[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=0c1c039

The following commit has been merged in the master branch:
commit 0c1c0399866b4de765716f03bc112c3d60e21b09
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Tue Dec 20 23:41:26 2011 +0000

    4.7.90 packaging
---
 debian/.gitattributes       |   1 -
 debian/changelog            |  12 +++
 debian/control              |   4 +-
 debian/ktouch-data.install  | 179 +++++++++++++++++++++++---------------------
 debian/source/local-options |   1 -
 5 files changed, 106 insertions(+), 91 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index daa3a58..39e1376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ktouch (4:4.7.90-0ubuntu1) precise; urgency=low
+
+  * breaks/replaces old jovie
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 20 Dec 2011 18:27:17 +0000
+
+ktouch (4:4.7.90-0ubuntu1~ppa1) precise; urgency=low
+
+  * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 17 Dec 2011 15:06:57 +0000
+
 ktouch (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index dc40a64..38e49cf 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,8 @@ Description: touch typing tutor for KDE
 
 Package: ktouch-data
 Architecture: all
-Breaks: ktouch (<< 4:4.7.3)
-Replaces: ktouch (<< 4:4.7.3)
+Breaks: ktouch (<< 4:4.7.3), jovie (<< 4:4.7.90)
+Replaces: ktouch (<< 4:4.7.3), jovie (<< 4:4.7.90)
 Depends: ${misc:Depends}
 Description: data files for ktouch
  This package contains the architecture-independent data files for ktouch.
diff --git a/debian/ktouch-data.install b/debian/ktouch-data.install
index 3abf229..a28799f 100644
--- a/debian/ktouch-data.install
+++ b/debian/ktouch-data.install
@@ -17,93 +17,98 @@ 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/config.kcfg/ktouch.kcfg
+usr/share/man/man1/ktouch.1
 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/ktouchui.rc
 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/error.wav
 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
+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
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
ktouch packaging