--- klavaro-1.0.3.orig/configure +++ klavaro-1.0.3/configure @@ -7346,7 +7346,7 @@ #m4/Makefile -ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in data/Makefile doc/Makefile debian/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in data/Makefile doc/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7947,7 +7947,6 @@ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} --- klavaro-1.0.3.orig/upstreamdebian/klavaro.desktop +++ klavaro-1.0.3/upstreamdebian/klavaro.desktop @@ -9,7 +9,7 @@ Comment[pt]=Aprenda a digitar corretamente Comment[eo]=Lernu tajpi korekte Exec=klavaro -Icon=/usr/share/icons/hicolor/32x32/klavaro.png +Icon=/usr/share/klavaro/pixmaps/logo.xpm Terminal=false Type=Application Categories=GTK;Utility; --- klavaro-1.0.3.orig/Makefile.in +++ klavaro-1.0.3/Makefile.in @@ -167,12 +167,10 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = src po data doc debian +SUBDIRS = src po data doc EXTRA_DIST = \ - autogen.sh \ klavaro.glade \ klavaro.gladep \ - regen.sh all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive --- klavaro-1.0.3.orig/debian/changelog +++ klavaro-1.0.3/debian/changelog @@ -0,0 +1,26 @@ +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.0.3.orig/debian/watch +++ klavaro-1.0.3/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/klavaro/klavaro-(.*)\.tar\.bz2 --- klavaro-1.0.3.orig/debian/rules +++ klavaro-1.0.3/debian/rules @@ -0,0 +1,13 @@ +#!/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 + +update-config:: + [ -e pixmaps/klavaro-32x16.xpm ] || \ + convert -resize 32x16 pixmaps/logo.xpm pixmaps/klavaro-32x16.xpm + +reverse-config:: + rm -f pixmaps/klavaro-32x16.xpm --- klavaro-1.0.3.orig/debian/README.Debian-source +++ klavaro-1.0.3/debian/README.Debian-source @@ -0,0 +1,12 @@ +klavaro for Debian +------------------ + +How the .orig.tar.gz was created: + +tar xjf klavaro-1.0.3.tar.bz2 +mv klavaro-1.0.3/debian klavaro-1.0.3/upstreamdebian +mv klavaro-1.0.3 klavaro-1.0.3.orig +tar cf klavaro_1.0.3.orig.tar klavaro-1.0.3.orig +gzip -9 klavaro_1.0.3.orig.tar + + -- Lionel Le Folgoc (mr_pouit) Wed, 23 May 2007 00:56:07 +0200 --- klavaro-1.0.3.orig/debian/menu +++ klavaro-1.0.3/debian/menu @@ -0,0 +1,4 @@ +?package(klavaro):needs="X11" section="Apps/Education"\ + icon="klavaro-32x16.xpm"\ + longtitle="touch typing tutor"\ + title="Klavaro" command="/usr/bin/klavaro" --- klavaro-1.0.3.orig/debian/copyright +++ klavaro-1.0.3/debian/copyright @@ -0,0 +1,64 @@ +This package was debianized by Lionel Le Folgoc (mr_pouit) on +Thu, 16 Nov 2006 20:09:50 +0100. + +* Klavaro + +It was downloaded from http://sourceforge.net/projects/klavaro + +Upstream Author: Felipe Emmanuel Ferreira de Castro + +Copyright: + Copyright (C) 2005-2006 by Felipe Emmanuel Ferreira de Castro + +License: + + This package 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, or + (at your option) any later version. + + This package 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 complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +=============================================================================== + +* GtkDatabox + + - src/gtkdatabox.c + - src/gtkdatabox.h, + - src/gtkdataboxmarshal.c + - src/gtkdataboxmarshal.h + +Copyright: + Copyright (C) 1998 - 2005 Dr. Roland Bock + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser 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 complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +The Debian packaging is (C) 2006, Lionel Le Folgoc (mr_pouit) and +is licensed under the GPL, see above. --- klavaro-1.0.3.orig/debian/compat +++ klavaro-1.0.3/debian/compat @@ -0,0 +1 @@ +5 --- klavaro-1.0.3.orig/debian/install +++ klavaro-1.0.3/debian/install @@ -0,0 +1,2 @@ +upstreamdebian/klavaro.desktop usr/share/applications/ +pixmaps/klavaro-32x16.xpm usr/share/pixmaps/ --- klavaro-1.0.3.orig/debian/control +++ klavaro-1.0.3/debian/control @@ -0,0 +1,23 @@ +Source: klavaro +Section: x11 +Priority: optional +Maintainer: Lionel Le Folgoc (mr_pouit) +Build-Depends: debhelper (>= 5), cdbs, pkg-config (>= 0.9.0), libgtk2.0-dev (>= 2.6.2), autotools-dev, imagemagick +Standards-Version: 3.7.2 + +Package: klavaro +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: A very flexible touch typing tutor + Klavaro is a simple tutor to teach correctly 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. + . + Homepage: http://klavaro.sourceforge.net/