--- klavaro-1.4.1.orig/debian/compat +++ klavaro-1.4.1/debian/compat @@ -0,0 +1 @@ +5 --- klavaro-1.4.1.orig/debian/changelog +++ klavaro-1.4.1/debian/changelog @@ -0,0 +1,194 @@ +klavaro (1.4.1-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: Updated. + + -- Bart Martens Sat, 02 Jan 2010 15:23:48 +0100 + +klavaro (1.4.0-1) unstable; urgency=low + + * New upstream release. Closes: #558032. + * No longer Build-Depends: libsexy-dev. + * Build-Depends: libgtk2.0-dev (>= 2.16.0). + + -- Bart Martens Sat, 28 Nov 2009 06:48:57 +0100 + +klavaro (1.3.5-1) unstable; urgency=low + + * Rebuild, no changes. Closes: #554376. + * New upstream release. + * debian/copyright: Updated. + + -- Bart Martens Thu, 05 Nov 2009 13:07:18 +0100 + +klavaro (1.3.4-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Sat, 17 Oct 2009 17:27:52 +0200 + +klavaro (1.3.3-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Sun, 04 Oct 2009 18:00:49 +0000 + +klavaro (1.3.1-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Fri, 18 Sep 2009 16:17:12 +0200 + +klavaro (1.2.3-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Sat, 15 Aug 2009 11:58:26 +0200 + +klavaro (1.2.2-1) unstable; urgency=low + + * New upstream release. + * debian/postinst, debian/postrm: Removed. + + -- Bart Martens Fri, 07 Aug 2009 12:09:38 +0200 + +klavaro (1.2.1-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: Updated. + + -- Bart Martens Tue, 16 Jun 2009 09:03:15 +0200 + +klavaro (1.2.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: Build-Depends: libgtk2.0-dev (>= 2.12.11), + libgtkdatabox-dev, libsexy-dev. + * debian/copyright: Updated. + * debian/install, debian/klavaro.desktop: Different .desktop file. + * debian/install, debian/menu, debian/rules: Different icon. + * debian/patches/04_initial_keyboard.diff: Removed. + * debian/patches/05_array_size.diff: Removed. + * debian/patches/06_initial_locale.diff: Removed. + + -- Bart Martens Thu, 21 May 2009 11:22:34 +0200 + +klavaro (1.1.9-1) unstable; urgency=low + + * New upstream release. + * debian/patches/01_en_GB_typo.diff: Removed. + * debian/patches/03_nl_BE.diff: Removed. + * Moved changes outside the debian/ directory to patches. + * debian/copyright: Updated. + * debian/watch: Updated. + + -- Bart Martens Sat, 02 May 2009 20:23:49 +0200 + +klavaro (1.1.8-1) unstable; urgency=low + + * New upstream release. + * debian/patches/01_en_GB_typo.diff: Added. Closes: #509565. + * debian/patches/02_en_C.diff: Added. + * debian/patches/03_nl_BE.diff: Added. + + -- Bart Martens Thu, 25 Dec 2008 11:30:35 +0100 + +klavaro (1.1.7-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Sun, 19 Oct 2008 11:05:47 +0200 + +klavaro (1.1.5-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Sun, 07 Sep 2008 11:06:56 +0200 + +klavaro (1.1.4-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Wed, 27 Aug 2008 20:40:27 +0200 + +klavaro (1.1.1-1) unstable; urgency=low + + * New upstream release. + * src/Makefile.in: Reverted change of 1.1.0-1. No longer needed. + * src/keyboard.h: Default keyboard layout set to qwerty_us. + + -- Bart Martens Sun, 29 Jun 2008 20:31:38 +0200 + +klavaro (1.1.0-1) unstable; urgency=low + + * New upstream release. + * debian/README.Debian-source: Removed. + * debian/postinst, debian/postrm: Added to handle score files. + * src/Makefile.in: Edited to disable a part about score files. + * debian/control: Fixed spelling error in description. + * debian/control: Standards-Version. + + -- Bart Martens Sun, 22 Jun 2008 17:03:38 +0200 + +klavaro (1.0.8-1) unstable; urgency=low + + * New upstream release. + * debian/klavaro.desktop: Updated. Closes: #483495. + + -- Bart Martens Thu, 29 May 2008 08:44:33 +0200 + +klavaro (1.0.7-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Thu, 24 Jan 2008 21:14:27 +0100 + +klavaro (1.0.6-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Sat, 12 Jan 2008 20:16:08 +0100 + +klavaro (1.0.5-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Sat, 01 Dec 2007 08:09:54 +0100 + +klavaro (1.0.4-1) unstable; urgency=low + + * New maintainer. Closes: #440417. + * New upstream release. + * debian/copyright: Updated for new maintainer. + * debian/menu: Replaced Apps by Applications. + * debian/README.Debian-source: Updated for new upstream version. + * src/translation.c: Default locale C. + + -- Bart Martens Sun, 09 Sep 2007 18:03:23 +0200 + +klavaro (1.0.3-1) unstable; urgency=low + + * New upstream release. (Closes: #420603) + * debian/README.Debian-source: Added to describe repackaged .orig.tar.gz. + * configure, Makefile.in: Edited to ignore upstream debian/Makefile* and to + disable autogen.sh and regen.sh. + * debian/control: Added autotools-dev to Build-Depends. + * debian/klavaro.desktop: Removed. Now using the upstream .desktop file. + * debian/rules, debian/control: Create klavaro-32x16.xpm using imagemagick. + * debian/menu: Edited to add longtitle and icon klavaro-32x16.xpm. + * debian/install: Added to install .desktop file and klavaro-32x16.xpm. + * debian/rules: Added gnome.mk to invoke dh_desktop. + + -- Lionel Le Folgoc (mr_pouit) Sat, 02 Jun 2007 22:58:33 +0200 + +klavaro (1.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Lionel Le Folgoc (mr_pouit) Mon, 15 Jan 2007 01:56:28 +0100 + +klavaro (1.0.0-1) unstable; urgency=low + + * Initial release (Closes: #404959) + + -- Lionel Le Folgoc (mr_pouit) Thu, 28 Dec 2006 23:01:37 +0100 --- klavaro-1.4.1.orig/debian/control +++ klavaro-1.4.1/debian/control @@ -0,0 +1,22 @@ +Source: klavaro +Section: x11 +Priority: optional +Maintainer: Bart Martens +Build-Depends: debhelper (>= 5), cdbs, pkg-config (>= 0.9.0), libgtk2.0-dev (>= 2.16.0), autotools-dev, imagemagick, libcurl4-gnutls-dev, libgtkdatabox-dev +Standards-Version: 3.8.3 +Homepage: http://klavaro.sourceforge.net/ + +Package: klavaro +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: A very flexible touch typing tutor + Klavaro is a simple tutor to teach correct typing, almost independently of + language and very flexible regarding to new or unknown keyboard layouts. + . + Its key features are: + * Internationalization + * Ready to use keyboard layouts + * Keyboard layout editor + * Basic course + * Adaptability, velocity and fluidness exercises + * Progress charts. --- klavaro-1.4.1.orig/debian/watch +++ klavaro-1.4.1/debian/watch @@ -0,0 +1,4 @@ +version=3 +opts="uversionmangle=s/(\d)[\-_]?(rc\d+|pre-rc\d+|pre\d+a?)$/$1~$2/;s/[\-\.](source|Source|src|orig|unix)$//;s/-(bin|osx)$/~$1/;s/^v(\d)/$1/;" \ +http://klavaro.sourceforge.net/en/index.html .*klavaro-(v?[\d\.]+(?:rc|rc\d+|pre-rc\d+|-unix|-source|-Source|-src|\.src|\.orig|[a-z]|b\d+|beta\d+-src|beta\d+)?)\.(?:tar\.gz|tgz|tar\.bz2|zip|pm\.gz|jar|shar\.gz|shar\.Z) +# generated by watchupstream 0.8 --- klavaro-1.4.1.orig/debian/copyright +++ klavaro-1.4.1/debian/copyright @@ -0,0 +1,129 @@ +This package was debianized by Lionel Le Folgoc (mr_pouit) on +Thu, 16 Nov 2006 20:09:50 +0100. + +It was downloaded from: + + http://sourceforge.net/projects/klavaro + +Upstream authors, as listed in AUTHORS: + + | Programmers: + | ------------ + | + | - Felipe Castro (Brasil) < fefcas at gmail dot com > + | - Petr Machata + | + | Designers: + | ---------- + | + | - David Prieto (Spanish) - new interface mockups since version 1.2.0, new icons, new pixmaps. + | - Szczepan Marchewka (Polland) + | + | + | Translators: + | ------------ + | + | The Translation Project (http://translationproject.org) is the place to + | search the people who maintains Klavaro translations. The first contributors, + | who did the work in the beginning are listed below. Also for Arab, there's no + | currant team at TP, so the independent translator is listed here. + | + | Arab: + | - Usama Akkad + | + | Bangla/Bengali: + | - Ankur ICT Development Foundation, Bangladesh. + | http://www.ankur.org.bd + | + | Czech: + | - Martin Šín + | + | Dutch: + | - Dieter Vanderfaeillie (Belgium) + | - Richard van Schaik (Netherlands) + | + | English: + | - Dave Pawson (Great Britain) + | - Felipe Castro + | - Gregory Palmer + | + | Esperanto: + | - Felipe Castro + | + | French: + | - Fabrice Haberer-Proust + | - Lionel Dupuys + | - Sébastien Wilmet + | + | German: + | - Hermann J. Beckers + | - Matthias Mailänder + | + | Hungarian: + | - Gergely Máté + | + | Polish: + | - Robert Stefaniuk + | + | Portuguese: + | - Felipe Castro + | + | Russian: + | - Александр Казанцев (Alexandr Kazancev) + | + | Spanish: + | - Ibon Castilla + | - Juan Macedo + | - David Prieto + | + | Swedish: + | - Nils Pettersson + | + | Urdu: + | - Jess Body + | + | Vietnamese: + | - Trần Ngọc Quân + +Copyright: + + Copyright (C) 2005-2009 Felipe Castro at http://klavaro.sourceforge.net/ + Copyright (C) 2006, 2008-2009 Free Software Foundation, Inc. + +License: + + | This program is free software, licensed under the terms of the GNU + | General Public License as published by the Free Software Foundation, + | either version 3 of the License, or (at your option) any later version. + | You should have received a copy of the GNU General Public License + | along with this program. If not, see . + +On Debian systems, the complete text of the GNU General Public License +version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +The Debian packaging is +Copyright (C) 2006, Lionel Le Folgoc (mr_pouit) +Copyright (C) 2007-2010, Bart Martens +and is licensed under the GPL version 3, see above. + +The file po/bn.po has this copyright and license: + + | Copyright (C) 2008 Ankur + | This file is distributed under the same license as the klavaro package. + | Mahay Alam Khan (মাহে আলম খান) , 2008. + +The file po/da.po has this copyright and license: + + | Copyright (C) 2009 Joe Hansen. + | This file is distributed under the same license as the klavaro package. + +The file po/ar.po has this copyright and license: + + | Copyright (C) Usama Akkad, 2009 + | This file is distributed under the same license as the klavaro package. + +The file po/nb.po has this copyright and license: + + | Copyright (C) 2009 Axel Bojer + | This file is distributed under the same license as the klavaro package. + --- klavaro-1.4.1.orig/debian/menu +++ klavaro-1.4.1/debian/menu @@ -0,0 +1,4 @@ +?package(klavaro):needs="X11" section="Applications/Education"\ + icon="klavaro-logo.xpm"\ + longtitle="touch typing tutor"\ + title="Klavaro" command="/usr/bin/klavaro" --- klavaro-1.4.1.orig/debian/install +++ klavaro-1.4.1/debian/install @@ -0,0 +1,2 @@ +data/klavaro.desktop usr/share/applications/ +klavaro-logo.xpm usr/share/pixmaps/ --- klavaro-1.4.1.orig/debian/rules +++ klavaro-1.4.1/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +update-config:: + [ -e klavaro-logo.xpm ] || \ + convert data/icons/hicolor/32x32/apps/klavaro.png klavaro-logo.xpm + +reverse-config:: + rm -f klavaro-logo.xpm + --- klavaro-1.4.1.orig/debian/patches/02_en_C.diff +++ klavaro-1.4.1/debian/patches/02_en_C.diff @@ -0,0 +1,18 @@ +Prefer C over en_GB for English variants other than en_GB. + +--- ../orig/klavaro-1.1.8/src/translation.c 2008-12-24 22:10:22.000000000 +0100 ++++ src/translation.c 2008-12-25 11:06:16.000000000 +0100 +@@ -151,6 +151,13 @@ + gint i; + gchar aux_code_2[3]; + ++ if (g_str_has_prefix (test, "en")) ++ { ++ g_free (test); ++ test = g_strdup ("C"); ++ return (TRUE); ++ } ++ + if (g_str_equal (test, "C")) + return TRUE; +