debian/0000755000000000000000000000000011664270535007177 5ustar debian/compat0000644000000000000000000000000211504334764010373 0ustar 7 debian/README0000644000000000000000000000067311504334764010063 0ustar dvoark7min for DEBIAN ------------------------ Previous versions of this package included the asdf and aoeu binaries installed in /usr/bin. Unfortunately they only work with the i386 architecture, so they have been moved to /usr/share/doc/dvoark7min/examples if you can suggest a way to fix the scripts they will move back to /usr/bin, but until then they stay in examples. Edward Betts , Tue, 18 Apr 2000 15:59:25 +0100 debian/control0000644000000000000000000000115411504334764010601 0ustar Source: dvorak7min Section: games Priority: optional Maintainer: Martin Kelly Standards-Version: 3.9.1.0 Build-Depends: debhelper (>= 7), libncurses5-dev Vcs-git: git://git.debian.org/git/collab-maint/dvorak7min.git Vcs-Browser: http://git.debian.org/?p=collab-maint/dvorak7min.git;a=summary Package: dvorak7min Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: typing tutor for Dvorak keyboards dvorak7min is a typing tutor to help you learn the Dvorak keyboard layout. . It consists of 29 short lessons and will gives immediate feedback on typing speed and accuracy. debian/patches/0000755000000000000000000000000011504341716010617 5ustar debian/patches/series0000644000000000000000000000003011504341716012025 0ustar debian-changes-1.6.1-13 debian/patches/debian-changes-1.6.1-130000644000000000000000000002123111504341716014253 0ustar Description: Upstream changes introduced in version 1.6.1-13 This patch has been created by dpkg-source during the package build. Here's the last changelog entry, hopefully it gives details on why those changes were made: . dvorak7min (1.6.1-13) unstable; urgency=low . * Bump Standards-Version to 3.9.1.0 * New maintainer (Closes: #588878) * Delete errors.out (it's a relic) . The person named in the Author field signed this changelog entry. Author: Martin Kelly Bug-Debian: http://bugs.debian.org/588878 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- dvorak7min-1.6.1.orig/README +++ dvorak7min-1.6.1/README @@ -2,28 +2,16 @@ First of all, please read COPYING. Note courtesy of Dan Wood , and that they are available in the original html format at http://www.karelia.com/abcd/ -After that, just type - - make - -and when it's done, try running ``./dvorak7min''. +Once the program is installed, try running ``./dvorak7min''. If you get screwed up chars on the keyboard layout, you might want to try: rm ~/.terminfo -R -and, if that doesn't work, try uncommenting the COLORS and/or the -NOT_SO_PRETTY lines in the Makefile, and doing a ``make clean all''. You -have a few other options in the Makefile, have a look to them. - In addition of the built-in lessons, you can use any ascii file (as Smoke suggests, Gutenberg books are good idea). Just specify the filename as an argument to the program, and you are done. -If you are satisfied with the program, simply - - make install - Remember that you can set your keyboard map with loadkeys dvorak.map --- dvorak7min-1.6.1.orig/lessons.c +++ dvorak7min-1.6.1/lessons.c @@ -166,6 +166,7 @@ char *lessons[] = "gggg pppp gggg pppp gggg pppp gggg pppp gggg pppp gggg pppp gggg ppp\n" "pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg\n" "gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp\n" +"\x1" "gggg hhhh pppp uuuu gggg hhhh pppp uuuu gggg hhhh pppp uuuu\n" "up up up up hug hug hug hug pug pug pug pug pup pup pup pup\n" "ugh ugh ugh ugh Hugh Hugh Hugh Hugh Pugh Pugh Pugh Pugh", @@ -263,7 +264,7 @@ char *lessons[] = "The catchup accident at the picnic depicted Dutch as an apathetic nuisance.\n" "It is no coincidence that this idiotic sentence has eight concise Cs in it.\n" "The enthusiastic duchess noticed the Pontiac coupe...and decided to chase it." -"\1" +"\x1" "I detect a headache...I hope it is not the\n" "Schnapps and Cocoa I had as a nightcap.\n" "\n" @@ -362,11 +363,12 @@ char *lessons[] = "Allegra, an unparalleled intellectual, calculated the celestial latitudes and\n" "longitudes in her sleep.", - "YF: index fingers streching up", + "YF: index fingers stretching up", "\x2" "ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy\n" "ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy\n" "fy fy fy fy fy fy fy yf yf yf yf yf yf yf ffff gggg hhhh yyyy pppp uuuu\n" +"\x1" "guy guy guy guy guy guy guy guy guy gyp gyp gyp gyp gyp gyp gyp gyp gyp\n" "UHF UHF UHF UHF UHF UHF UHF UHF UHF yuh yuh yuh yuh yuh yuh yuh yuh yuh\n" "huff huff huff huff huff huff huff puff puff puff puff puff puff puff\n" @@ -406,6 +408,7 @@ char *lessons[] = "kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm\n" "kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm\n" "km km km km km km km km km km mk mk mk mk mk mk mk mk mk mk\n" +"\x1" "hhhh kkkk mmmm uuuu hhhh kkkk mmmm uuuu hhhh kkkk mmmm uuuu\n" "ku ku ku ku ku ku ku ku ku ku mu mu mu mu mu mu mu mu mu mu\n" "UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK\n" @@ -442,6 +445,7 @@ char *lessons[] = "jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww\n" "jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww\n" "jw jw jw jw jw jw jw jw jw jw jw wj wj wj wj wj wj wj wj wj\n" +"\x1" "eeee jjjj tttt wwww eeee jjjj tttt wwww eeee jjjj tttt wwww\n" "ewe ewe ewe ewe ewe jet jet jet jet jet Jew Jew Jew Jew Jew\n" "wee wee wee wee wee wee wee wet wet wet wet wet wet wet wet\n" @@ -500,6 +504,7 @@ char *lessons[] = "An acquisitive mind helped Pavlov evolve his theories.\n" "QVC's involvement with Paramount may give it new verve.\n" "Vivian's new Volvo unequivocally vanquished her fears of driving.\n" +"\x1" "According to Pravda, Vladivostok was a quiet village in its Soviet days.\n" "This unique, opaque liquor does not quench your thirst, it makes you queasy.\n" "David's vivid imagination and his inquisitive and inventive mind suggest a high IQ." @@ -548,7 +553,7 @@ char *lessons[] = "activity; several lizards hazarded the freezing waters and capsized the fish\n" "tanks; a dozen grizzlies were waltzing in the plaza.", - "XB: index fingers streching down", + "XB: index fingers stretching down", "\x2" "bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx\n" "bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx\n" --- dvorak7min-1.6.1.orig/Makefile +++ dvorak7min-1.6.1/Makefile @@ -6,7 +6,7 @@ INSTALL = /usr/local/games/bin #NASTINESS = -DNASTY_AS_USUAL #BEEPS = -DBEEPS_ARENT_IRRITATING #FLASHES = -DFLASHES_ARENT_IRRITATING -#COLORS = -DNO_COLORS_PLEASE +COLORS = -DNO_COLORS_PLEASE # Max length of imported texts. Set it to 0 or comment it if you don't want # a limit @@ -14,7 +14,7 @@ LIMIT_LENGTH = -DLIMIT_LENGTH=1024 ### That's all ### -#CC = gcc +CC = gcc PROF = -g0 -O2 CFLAGS = $(PROF) -Wall \ $(PRETTINESS) $(NASTINESS) $(BEEPS) $(FLASHES) $(COLORS) \ --- dvorak7min-1.6.1.orig/dvorak7min.c +++ dvorak7min-1.6.1/dvorak7min.c @@ -173,7 +173,8 @@ int myGetch(char shouldBe) /* calculate typing speed in a given interval */ inline float calcSpeed (time_t timeStart, time_t timeFinish, int hits) { - return (float) hits / (timeFinish - timeStart); + // Use WPS/WPM as better standard, so also divide by 5 + return (float) hits / 5 / (timeFinish - timeStart); } @@ -193,7 +194,7 @@ int importText (char const * const fileN file = fopen (fileName, "r"); if (!file) { - postmortem = sys_errlist[errno]; + postmortem = strerror(errno); return -1; } @@ -220,7 +221,7 @@ int importText (char const * const fileN while (1) { c = fgetc (file); if (errno) { - postmortem = sys_errlist[errno]; + postmortem = strerror(errno); fclose (file); return -1; } @@ -418,6 +419,7 @@ void do_text (char * const text) ++p; if (!timeStart) { timeStart = time(0); + hits = 0; } } @@ -431,8 +433,9 @@ void do_text (char * const text) float ratio = hits - misses; ratio = (ratio < 0) ? 0 : (100.0 * ratio / hits); timeCurrent = time(0); - speed = calcSpeed (timeStart, timeCurrent, hits); - mvprintw (LINES - 1, 0, "CPS %.2f CPM %.2f Hits: %d Misses: %d Seconds: %d Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio); + speed = calcSpeed (timeStart, timeCurrent, hits + misses); + // Use WPS/WPM as better standards + mvprintw (LINES - 1, 0, "WPS %.2f WPM %.2f Hits: %d Misses: %d Seconds: %d Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio); clrtoeol(); } } while (ch == ERR); @@ -510,7 +513,7 @@ void do_text (char * const text) } timeFinish = time(0); - speed = calcSpeed(timeStart, timeFinish, hits); + speed = calcSpeed(timeStart, timeFinish, hits + misses); clear(); cbreak(); if (!timeStart) { @@ -519,8 +522,11 @@ void do_text (char * const text) float ratio = hits - misses; ratio = (ratio < 0) ? 0 : (100.0 * ratio / hits); mvprintw (0, 0, "Elapsed time: %d seconds", timeFinish - timeStart); - mvprintw (1, 0, "Total: %d Misses: %d Ratio: %.2f%%", hits, misses, ratio); - mvprintw (2, 0, "CPS: %.2f CPM: %.2f", speed, speed * 60); + mvprintw (1, 0, "Total: %d Misses: %d Ratio: %.2f%%", + hits + misses, misses, + (float)100*(hits) / (hits + misses)); + // Use WPM/WPS as better standard + mvprintw (2, 0, "WPS: %.2f WPM: %.2f", speed, speed * 60); } mvprintw (4, 0, "[ ] Press ESCAPE to continue."); debian/copyright0000644000000000000000000000212311504334764011126 0ustar This package was debianized by Joseph Carter on Sat, 16 Jan 1999 15:44:08 -0800. It was downloaded from http://www.linalco.com/ragnar/ Upstream Author: Ragnar Hojland Espinosa Copyright: (C) 1998 Ragnar Hojland Espinosa 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, or (at your option) any later version. 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 program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/dirs0000644000000000000000000000001211504334764010052 0ustar usr/games debian/dvorak7min.60000644000000000000000000000072611504334764011352 0ustar .TH dvorak7min 6 "19 January 1999" .SH NAME dvorak7min \- Typing tutor for the dvorak keyboard layout .SH SYNOPSIS .B dvorak7min .SH DESCRIPTION .I dvorak7min is a typing tutor for the dvorak keyboard layout. Each lesson includes an onscreen layout of the dvorak keyboard to make the learning process easier. .PP .I dvorak7min assumes it is run with the dvorak keymappings already loaded. .SH AUTHOR This manual page was written by Joseph Carter debian/watch0000644000000000000000000000012311504334764010222 0ustar # This package is no longer maintained upstream and the original homepage is gone. debian/docs0000644000000000000000000000000711504334764010045 0ustar README debian/changelog0000644000000000000000000001370311664270535011055 0ustar dvorak7min (1.6.1-13.1) unstable; urgency=low * Non-maintainer upload. * rm no longer accepts the -d option. Don't use it in debian/rules (closes: #642676). Thanks to Bert Agaz for the bug report. -- Jakub Wilk Sun, 27 Nov 2011 00:08:12 +0100 dvorak7min (1.6.1-13) unstable; urgency=low * Bump Standards-Version to 3.9.1.0 * New maintainer (Closes: #588878) * Delete errors.out (it's a relic) -- Martin Kelly Wed, 22 Dec 2010 00:13:38 -0800 dvorak7min (1.6.1-12) unstable; urgency=low * Bump Standards-Version to 3.8.4 * Switch to 3.0 (quilt) source format -- Francois Marier Tue, 16 Feb 2010 16:00:21 +1300 dvorak7min (1.6.1-11) unstable; urgency=low * Bump Standards-Version to 3.8.3 * Bump debhelper compatibility to 7 * Add misc:depends (lintian warning) * Add empty watch file describing upstream situation * Expand the extended description * Cleanup debian/copyright (lintian warning) -- Francois Marier Mon, 05 Oct 2009 11:35:11 +1300 dvorak7min (1.6.1-10) unstable; urgency=low * Break up lessons which are longer than 6 lines so that they fit on the whole screen * Switch VCS fields to git * Bump Standards-Version to 3.8.0 (no changes) * Bump debhelper compatibility to 6 -- Francois Marier Mon, 24 Nov 2008 17:08:39 +1300 dvorak7min (1.6.1-9) unstable; urgency=low * Remove broken scripts in doc/examples which are outside the scope of this package anyways (closes: #455062) * Bump standards-version to 3.7.3 (no changes) -- Francois Marier Mon, 10 Dec 2007 09:34:35 +1300 dvorak7min (1.6.1-8) unstable; urgency=low * Remove homepage field, the website is no longer accessible * Rename XS-Vcs-* fields to Vcs-* -- Francois Marier Tue, 20 Nov 2007 15:37:45 +1300 dvorak7min (1.6.1-7) unstable; urgency=low * Remove watch file since the website doesn't exist anymore (closes: #449912) -- Francois Marier Mon, 19 Nov 2007 17:03:41 +1300 dvorak7min (1.6.1-6) unstable; urgency=low * Add homepage field in debian/control * Mention the collab-maint repo in debian/control -- Francois Marier Fri, 19 Oct 2007 16:18:03 +1300 dvorak7min (1.6.1-5) unstable; urgency=low * Remove reference to the example scripts (closes: #396456) * Update watch file and copyright file for the new location of upstream sources * Bump up Standard-Version to 3.7.2: - Remove unnecessary call to dh_installxfonts -- Francois Marier Sun, 12 Nov 2006 17:48:17 -0500 dvorak7min (1.6.1-4) unstable; urgency=low * Recompile without colors since they are broken on some architecture (closes: #329700) Thanks to Diego for the patch. -- Francois Marier Tue, 11 Oct 2005 15:46:26 -0400 dvorak7min (1.6.1-3) unstable; urgency=low * New maintainer (closes: #327439). Thanks Nigel for the clean-ups! * Update FSF postal address in debian/copyright * Remove the build instructions from upstream's README * Remove unnecessary commented out lines from debian/rules * Add "make clean" to the clean target in debian/rules -- Francois Marier Sat, 10 Sep 2005 19:46:34 -0400 dvorak7min (1.6.1-2) unstable; urgency=low * Apply patch to fix typing speed calculations (Closes: #242478) * Change dvorak7min.c to display WPM/WPS instead of CPM/CPS (Closes: #317387) -- Nigel Jones Thur, 4 Aug 2005 14:26:45 +1200 dvorak7min (1.6.1-1) unstable; urgency=low * New upstream release * New Maintainer. (Closes: #314844) -- Nigel Jones Mon, 8 Jul 2005 21:27:10 +1200 dvorak7min (1.6-1) unstable; urgency=low * New upstream release. * Cleaned up upstream source. (Closes: #159061) -- Ivo Timmermans Sun, 13 Oct 2002 13:52:18 +0200 dvorak7min (1.5-5) unstable; urgency=low * Spelling fixes. (Closes: #128489, #133853) -- Ivo Timmermans Fri, 22 Feb 2002 14:55:27 +0100 dvorak7min (1.5-4) unstable; urgency=low * Changed sys_errlist to calls to strerror(). (Closes: #107019) * Updated standards version to current. -- Ivo Timmermans Mon, 30 Jul 2001 20:29:59 +0200 dvorak7min (1.5-3) unstable; urgency=low * New maintainer. -- Ivo Timmermans Tue, 19 Dec 2000 22:13:28 +0100 dvorak7min (1.5-2) unstable; urgency=low * debian/rules: cleaned up a bit. * debian/examples: asdf and aeou moved to examples (Closes: Bug#53334). -- Edward Betts Tue, 18 Apr 2000 15:42:50 +0100 dvorak7min (1.5-1) unstable; urgency=low * New upstream release * debian/copyright: rewrote. * debian/watch: added. -- Edward Betts Mon, 17 Apr 2000 11:49:26 +0100 dvorak7min (1.4-4) unstable; urgency=low * New maintainer. * Created debian/dirs and debian/links. -- Edward Betts Fri, 31 Dec 1999 01:11:55 +0000 dvorak7min (1.4-3) unstable; urgency=low * Official Maintainer release. -- Edward C. Lang Thu, 16 Sep 1999 20:36:05 +1000 dvorak7min (1.4-1) unstable; urgency=low * New upstream version. -- Joseph Carter Sun, 30 May 1999 04:00:47 -0700 dvorak7min (1.2-1) unstable; urgency=low * New upstream version (closes: bug#34476) -- Joseph Carter Sat, 13 Mar 1999 17:31:16 -0800 dvorak7min (1.1-1) unstable; urgency=low * New upstream version -- Joseph Carter Mon, 1 Feb 1999 12:14:39 -0800 dvorak7min (1.0-2) unstable; urgency=low * fixed aoeu/asdf which I got backwards in my head * corrected copyright file -- Joseph Carter Wed, 27 Jan 1999 10:39:15 -0800 dvorak7min (1.0-1) unstable; urgency=low * Initial packaging * Wrote asdf and aoeu scripts * Wrote man pages for everything -- Joseph Carter Sat, 16 Jan 1999 15:44:08 -0800 debian/source/0000755000000000000000000000000011504334764010475 5ustar debian/source/format0000644000000000000000000000001411504334764011703 0ustar 3.0 (quilt) debian/rules0000755000000000000000000000206711664270375010266 0ustar #!/usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 build: build-stamp build-stamp: dh_testdir $(MAKE) touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp rm -rf $(CURDIR)/debian/dvorak7min/usr dh_clean make clean install: build dh_testdir dh_testroot dh_prep dh_installdirs install -o root -g root -m 755 dvorak7min \ $(CURDIR)/debian/dvorak7min/usr/games # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installdocs dh_installexamples dh_installmenu dh_installcron dh_installman debian/dvorak7min.6 dh_installinfo dh_installchangelogs ChangeLog dh_link dh_strip dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install