diff -Nru nlkt-0.3.2.5/debian/changelog nlkt-0.3.2.6/debian/changelog --- nlkt-0.3.2.5/debian/changelog 2017-11-22 10:14:33.000000000 +0000 +++ nlkt-0.3.2.6/debian/changelog 2017-11-22 10:14:33.000000000 +0000 @@ -1,8 +1,34 @@ -nlkt (0.3.2.5-1build1) xenial; urgency=medium +nlkt (0.3.2.6-2) unstable; urgency=medium - * No-change rebuild for qwt transition. + * debian/control: + - Build-depend on qttools5-dev instead of qttools5-dev-tools. Fixes FTBFS. + Thanks to Adrian Bunk for the report. (Closes: #881087) + - Bumped Standards-Version to 4.1.1, no changes needed. - -- Matthias Klose Wed, 30 Mar 2016 18:56:38 +0000 + -- Eugene V. Lyubimkin Sun, 19 Nov 2017 16:07:04 +0100 + +nlkt (0.3.2.6-1) unstable; urgency=medium + + * New upstream release. + - Added .desktop-file, provided by Julian Gilbey. (Closes: #735285) + * debian/install: + - Install .desktop-files. + * debian/control: + - Depend on 'fonts-dejavu-core' instead of 'ttf-dejavu-core' (which + became a transitional package). (Closes: #864430) + - Changed priority from 'extra' to 'optional'. + - Bumped Standards-Version to 4.1.0. + - Depend on debhelper (>= 9) for newer compat behavior. + * debian/menu: + - Removed. + * debian/post{inst,rm}: + - Removed as not needed anymore. + * debian/compat: + - Bumped to 9. + * debian/rules: + - Do not include dpkg/buildflags.mk manually. + + -- Eugene V. Lyubimkin Sun, 10 Sep 2017 14:27:05 +0200 nlkt (0.3.2.5-1) unstable; urgency=low diff -Nru nlkt-0.3.2.5/debian/compat nlkt-0.3.2.6/debian/compat --- nlkt-0.3.2.5/debian/compat 2017-11-22 10:14:33.000000000 +0000 +++ nlkt-0.3.2.6/debian/compat 2017-11-22 10:14:33.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru nlkt-0.3.2.5/debian/control nlkt-0.3.2.6/debian/control --- nlkt-0.3.2.5/debian/control 2017-11-22 10:14:33.000000000 +0000 +++ nlkt-0.3.2.6/debian/control 2017-11-22 10:14:33.000000000 +0000 @@ -1,15 +1,15 @@ Source: nlkt Section: x11 -Priority: extra +Priority: optional Maintainer: Eugene V. Lyubimkin -Build-Depends: dpkg-dev (>= 1.14.17), debhelper (>= 7.0.50), cmake, - qtbase5-dev, qttools5-dev-tools, libqwt-qt5-dev -Standards-Version: 3.9.6 +Build-Depends: dpkg-dev (>= 1.14.17), debhelper (>= 9), cmake, + qtbase5-dev, qttools5-dev, libqwt-qt5-dev +Standards-Version: 4.1.1 Homepage: http://sf.net/projects/nlkt Package: nlkt Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, fortune-mod, ttf-dejavu-core +Depends: ${misc:Depends}, ${shlibs:Depends}, fortune-mod, fonts-dejavu-core Suggests: fortunes, fortunes-ru, fortunes-debian-hints, fortunes-de Description: non-linear keyboard trainer Nlkt is a lightweight keyboard trainer (touch-typing tutor). diff -Nru nlkt-0.3.2.5/debian/dirs nlkt-0.3.2.6/debian/dirs --- nlkt-0.3.2.5/debian/dirs 2017-11-22 10:14:33.000000000 +0000 +++ nlkt-0.3.2.6/debian/dirs 2017-11-22 10:14:33.000000000 +0000 @@ -1,2 +1,3 @@ usr/bin usr/share/nlkt +usr/share/applications diff -Nru nlkt-0.3.2.5/debian/install nlkt-0.3.2.6/debian/install --- nlkt-0.3.2.5/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ nlkt-0.3.2.6/debian/install 2017-11-22 10:14:33.000000000 +0000 @@ -0,0 +1 @@ +share/*.desktop usr/share/applications diff -Nru nlkt-0.3.2.5/debian/menu nlkt-0.3.2.6/debian/menu --- nlkt-0.3.2.5/debian/menu 2017-11-22 10:14:33.000000000 +0000 +++ nlkt-0.3.2.6/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -?package(nlkt):needs="X11" section="Applications/Education"\ - title="nlkt" command="/usr/bin/nlkt" diff -Nru nlkt-0.3.2.5/debian/postinst nlkt-0.3.2.6/debian/postinst --- nlkt-0.3.2.5/debian/postinst 2017-11-22 10:14:33.000000000 +0000 +++ nlkt-0.3.2.6/debian/postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# -if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then - update-menus -fi diff -Nru nlkt-0.3.2.5/debian/postrm nlkt-0.3.2.6/debian/postrm --- nlkt-0.3.2.5/debian/postrm 2017-11-22 10:14:33.000000000 +0000 +++ nlkt-0.3.2.6/debian/postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# -# Automatically added by dh_installmenu -if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi -# End automatically added section diff -Nru nlkt-0.3.2.5/debian/rules nlkt-0.3.2.6/debian/rules --- nlkt-0.3.2.5/debian/rules 2017-11-22 10:14:33.000000000 +0000 +++ nlkt-0.3.2.6/debian/rules 2017-11-22 10:14:33.000000000 +0000 @@ -1,14 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- -DPKG_EXPORT_BUILDFLAGS = 1 - include /usr/share/dpkg/buildflags.mk - -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - %: dh $@ diff -Nru nlkt-0.3.2.5/README nlkt-0.3.2.6/README --- nlkt-0.3.2.5/README 2016-02-07 17:37:43.000000000 +0000 +++ nlkt-0.3.2.6/README 2017-09-10 10:53:51.000000000 +0000 @@ -1,42 +1,38 @@ -This README describes some notes about nlkt. - --------------------------- 1. Compiling and installing --------------------------- -Before compiling package from sources, check downloads page on sourceforge.net [1] for available packages for your operating system. - nlkt depends on: - - Qt4 library, [2]; + - Qt5 library, [2]; - Qwt6 library, [3]. + - CMake (build system) [4]. -So, you must have installed development versions of these libraries. - -If you have not debian-derived OS, then go to src/nlkt.pro file and replace "/usr/include/qwt-qt4" and "-lqwt-qt4" with appropriate qwt includes path and qwt library name in your OS. +Installed development versions of these libraries before continuing. -If you want "install" nlkt only for one user (for you :)), then simply run +If you want build and run nlkt only for current user, run: - ./build-local.sh + cmake . && make If you want to install nlkt system-wide, run: - cd src && qmake && lrelease nlkt.pro && make PATH_CFG=-DNLKT_USE_SYSTEM_PATH release && rm Makefile* && cd ../ - cd src && qmake && sudo make INSTALL_ROOT=/ release-install && cd ../ + cmake -DLOCAL=off . && make && sudo make install -If you has built native package for your system, please write me: [4]. I want to provide as more packages as possible. -------------------- 2. Using the program -------------------- -To enable typing in some language, check that fortunes for that language is installed. -For example, if you using debian-based system and want to install fortunes for russian language, you have to install fortunes-ru package: +To enable typing in a certain language, check that fortunes for that language +is installed. For example, to install fortunes for russian language in a +Debian-based system, install fortunes-ru package: aptitude install fortunes-ru -Now program has layout files (read "supports") for english, german and russian. If you to add your mother language, just simply write keyboard layout file (see /share/layouts/en for example) and send it to me [4], i will add support for this language in next version. +The program has currently layout files for English, German and Russian. + +Looking for keyboard hotkeys? Place mouse cursor over a button and wait for +a tooltip. If the button has a hotkey, you will see it. -Looking for keyboard hotkeys? Pick mouse cursor for some button and wait for tooltip. If the button has a hotkey, you will see it. --------- 3. Thanks @@ -51,14 +47,12 @@ GrayCardinal (forum.vingrad.ru) - criticism Enrico Zini (debian.org) - British layout, bugreports ---------------------------------------------------- This project is devoted to my sister Darja Karpova. ---------------------------------------------------- + --- Links: -[1] http://sourceforge.net/project/showfiles.php?group_id=218218 -[2] http://trolltech.com/products/qt +[2] http://doc.qt.io/ [3] http://qwt.sourceforge.net/ -[4] jackyf.devel@gmail.com +[4] http://cmake.org diff -Nru nlkt-0.3.2.5/share/nlkt.desktop nlkt-0.3.2.6/share/nlkt.desktop --- nlkt-0.3.2.5/share/nlkt.desktop 1970-01-01 00:00:00.000000000 +0000 +++ nlkt-0.3.2.6/share/nlkt.desktop 2017-09-10 10:53:51.000000000 +0000 @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=nlkt +Comment=Non-linear keyboard trainer (touch-typing tutor) +Exec=/usr/bin/nlkt +Terminal=false +Categories=Education;