--- morse-2.1.orig/Makefile +++ morse-2.1/Makefile @@ -23,8 +23,8 @@ # to the authors! # #DEVICE = X11 -#DEVICE = Linux -DEVICE = OSS +DEVICE = Linux +#DEVICE = OSS VERS=$(shell sed #include #include -#include +#include #include #include #include "beep.h" @@ -850,7 +850,7 @@ { if (wordcount > 0) wordcount--; if (timeout > 0) - if (difftime(time(NULL),starttime) > (double)timeout) + if (difftime(time(NULL),starttime) > (double)timeout) timeout = 0; word[wordc] = '\0'; --- morse-2.1.orig/qso.d/grammar.c +++ morse-2.1/qso.d/grammar.c @@ -1,3 +1,5 @@ +#include + int is_vowel (first_char) char first_char; --- morse-2.1.orig/qso.d/QSO.c +++ morse-2.1/qso.d/QSO.c @@ -106,6 +106,7 @@ #include #include +#include char *A_Or_An (char *); char *Choose (char *Words[], int Number); --- morse-2.1.orig/debian/changelog +++ morse-2.1/debian/changelog @@ -0,0 +1,12 @@ +morse (2.1-2) unstable; urgency=low + + * Add libx11-dev build dependency. Closes: #357570. Thanks Martin. + + -- Joop Stakenborg Sat, 18 Mar 2006 09:47:15 +0100 + +morse (2.1-1) unstable; urgency=low + + * Initial release Closes: #325242. + + -- Joop Stakenborg Wed, 22 Feb 2006 20:05:30 +0100 + --- morse-2.1.orig/debian/compat +++ morse-2.1/debian/compat @@ -0,0 +1 @@ +4 --- morse-2.1.orig/debian/watch +++ morse-2.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.catb.org/~esr/morse/morse-(.*)\.tar\.gz debian uupdate --- morse-2.1.orig/debian/dirs +++ morse-2.1/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- morse-2.1.orig/debian/rules +++ morse-2.1/debian/rules @@ -0,0 +1,100 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + cd morse.d && $(MAKE) DEVICE=Linux + cd morse.d && $(MAKE) DEVICE=X11 + #docbook-to-man debian/morse.sgml > morse.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs usr/bin + + # Add here commands to install the package into debian/morse. + $(MAKE) install DESTDIR=$(CURDIR)/debian/morse + + +# 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_installchangelogs HISTORY + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman morse.1 QSO.1 morseX11.1 + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- morse-2.1.orig/debian/control +++ morse-2.1/debian/control @@ -0,0 +1,16 @@ +Source: morse +Section: hamradio +Priority: optional +Maintainer: Joop Stakenborg +Build-Depends: debhelper (>= 4.0.0), libx11-dev +Standards-Version: 3.6.2 + +Package: morse +Architecture: any +Depends: ${shlibs:Depends} +Description: 'Morse Classic' is a morse-code training program for aspiring radio hams + It can generate random tests or simulated QSOs resembling those + used in the ARRL test (a QSO generator is included). There are a + plethora of options to vary the training method. In one of the simpler + modes, this program will take text from standard input and render it + as Morse-code beeps. --- morse-2.1.orig/debian/copyright +++ morse-2.1/debian/copyright @@ -0,0 +1,38 @@ +This package was debianized by Joop Stakenborg on +Tue, 21 Feb 2006 23:36:14 +0100. + +It was downloaded from http://www.catb.org/~esr/morse + +Copyright Holder: Eric S. Raymond + +License: BSD, from morse.c: + +/* + * Copyright (c) 1988 Regents of the University of California. + * Copyright (c) 1992 Joe Dellinger, University of Hawaii at Manoa + * Copyright (c) 2005 Eric S. Raymond. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ --- morse-2.1.orig/debian/README.Debian +++ morse-2.1/debian/README.Debian @@ -0,0 +1,15 @@ +morse for Debian +---------------- + +This package is NOT the same as morse in Debian/Woody. The old morse package +was written by Alan Cox and Eric S. Raymond for some reason decided to give +it the same name. To distinguish it from Alan Cox's "morse" program, he calls +his program Morse Classic, although the binary name doesn't reflect that. + +Two binaries are include in this package. The ordinary 'morse' needs a +standard linux text terminal and won't sound when running X. The 'morseX11' +binary needs X to sound. + +I could not get the OSS implementation to work, sorry... + + -- Joop Stakenborg , Tue, 21 Feb 2006 23:36:14 +0100 --- morse-2.1.orig/debian/docs +++ morse-2.1/debian/docs @@ -0,0 +1 @@ +README --- morse-2.1.orig/morseX11.1 +++ morse-2.1/morseX11.1 @@ -0,0 +1 @@ +.so man1/morse.1