Commit c30cb478 authored by Christoph Berg's avatar Christoph Berg

Import Upstream version 3.5.1

parent e79380f8
2017-02-11 Kamil Ignacak
* xcwcp: fixing problem with compilation of application.cc file.
2016-05-03 Kamil Ignacak
* libcw/bugfix: fixing a bug in libcw/generator that may have lead
to a key being permanently in "down" state upon silencing a
generator.
If cwdaemon using libcw with NULL or Console output was generating
tones from user input, and received ESC-4 escape request ("Abort
currently sent message"), it was possible that while the message
was interrupted, the key remained in "down" state.
The fix in libcw makes sure that upon request to stop generating
tones, the key always goes up, regardless of audio output type.
The bug was reported and investigated, and fix was provided by
Csahok Zoltan. Many thanks Zoli!
2016-03-30 Kamil Ignacak
* debian: adding pt_BR.po file, this should close Debian bug
#816939.
2016-01-18 Kamil Ignacak
* cw: bug discovered in cw and fix provided by Rob Wortman: cw
didn't read options from CW_OPTIONS environment variable.
2015-09-29 Kamil Ignacak
* bugfix: fixing code that resets tone queue on flushing. A bug
was found on FreeBSD: after pressing Ctrl+C, application that
......
This is INSTALL file for unixcw 3.5.0.
This is INSTALL file for unixcw 3.5.1.
......
......@@ -2,7 +2,7 @@ SUBDIRS=src
EXTRA_DIST = \
icon_unixcw.svg icon_unixcw.xpm \
unixcw-2.3.spec unixcw-3.5.0.lsm \
unixcw-2.3.spec unixcw-3.5.1.lsm \
po/UnixCW.po \
THANKS HISTORY \
debian
......@@ -329,7 +329,7 @@ top_srcdir = @top_srcdir@
SUBDIRS = src
EXTRA_DIST = \
icon_unixcw.svg icon_unixcw.xpm \
unixcw-2.3.spec unixcw-3.5.0.lsm \
unixcw-2.3.spec unixcw-3.5.1.lsm \
po/UnixCW.po \
THANKS HISTORY \
debian
......
# Copyright (C) 2001-2006 Simon Baldwin (simon_baldwin@yahoo.com)
# Copyright (C) 2011-2015 Kamil Ignacak (acerion@wp.pl)
# Copyright (C) 2011-2017 Kamil Ignacak (acerion@wp.pl)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
......
version 3.5.1 / 2017-02-XX
libcw:
- fixing a bug in libcw/generator that may have lead to a key being
permanently in "down" state upon silencing a generator.
If cwdaemon using libcw with NULL or Console output was generating
tones from user input, and received ESC-4 escape request ("Abort
currently sent message"), it was possible that while the message
was interrupted, the key remained in "down" state.
The fix in libcw makes sure that upon request to stop generating
tones, the key always goes up, regardless of audio output type.
The bug was reported and investigated, and fix was provided by
Csahok Zoltan. Many thanks Zoli!
- Library soname/version changed from 6.5.1 to 6.6.1.
----------------------------------------------------------------------------
version 3.5.0 / 2015-10-06
libcw:
......
This is README file for unixcw project version 3.5.0.
This is README file for unixcw project version 3.5.1.
unixcw is a project providing libcw library and a set of programs
using the library: cw, cwgen, cwcp and xcwcp. The programs are
......@@ -128,7 +128,8 @@ following:
3.4.0 6.2.1 2014-11-11
3.4.1 6.3.1 2015-01-02
3.4.2 6.4.1 2015-06-17
3.5.0 6.5.1 2015-10-XX
3.5.0 6.5.1 2015-10-06
3.5.1 6.6.1 2017-02-12
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for unixcw 3.5.0.
# Generated by GNU Autoconf 2.69 for unixcw 3.5.1.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
......@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='unixcw'
PACKAGE_TARNAME='unixcw'
PACKAGE_VERSION='3.5.0'
PACKAGE_STRING='unixcw 3.5.0'
PACKAGE_VERSION='3.5.1'
PACKAGE_STRING='unixcw 3.5.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -651,6 +651,8 @@ LDCONFIG
GZIP
OSS_LIB
DL_LIB
HOST_IS_FREEBSD_FALSE
HOST_IS_FREEBSD_TRUE
CXXCPP
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
......@@ -1348,7 +1350,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures unixcw 3.5.0 to adapt to many kinds of systems.
\`configure' configures unixcw 3.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1418,7 +1420,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of unixcw 3.5.0:";;
short | recursive ) echo "Configuration of unixcw 3.5.1:";;
esac
cat <<\_ACEOF
......@@ -1543,7 +1545,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
unixcw configure 3.5.0
unixcw configure 3.5.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2083,7 +2085,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by unixcw $as_me 3.5.0, which was
It was created by unixcw $as_me 3.5.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2947,7 +2949,7 @@ fi
# Define the identity of the package.
PACKAGE='unixcw'
VERSION='3.5.0'
VERSION='3.5.1'
cat >>confdefs.h <<_ACEOF
......@@ -16198,6 +16200,7 @@ DL_LIB=
# TODO: consider using AC_CHECK_LIB(ossaudio, _oss_ioctl)
OSS_LIB=
IS_FREEBSD=false
case $host_os in
*linux*|*Linux*)
......@@ -16209,6 +16212,7 @@ $as_echo "$as_me: Detected Linux: $host_os" >&6;}
*freebsd*|*FreeBSD*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: Detected FreeBSD: $host_os" >&5
$as_echo "$as_me: Detected FreeBSD: $host_os" >&6;}
IS_FREEBSD=true
;;
*openbsd*|*OpenBSD*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: Detected OpenBSD: $host_os" >&5
......@@ -16230,6 +16234,14 @@ $as_echo "$as_me: Detected other OS: $host_os" >&6;}
DL_LIB=\"-ldl\"
;;
esac
if test $IS_FREEBSD = true; then
HOST_IS_FREEBSD_TRUE=
HOST_IS_FREEBSD_FALSE='#'
else
HOST_IS_FREEBSD_TRUE='#'
HOST_IS_FREEBSD_FALSE=
fi
......@@ -16439,7 +16451,7 @@ fi
# I'm defining it here so that it's available in config.h and can be
# used in libcw's cw_version() function that should return the
# numbers.
LIBCW_VERSION=\"6:5:1\"
LIBCW_VERSION=\"6:6:1\"
cat >>confdefs.h <<_ACEOF
#define LIBCW_VERSION $LIBCW_VERSION
......@@ -18276,6 +18288,10 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HOST_IS_FREEBSD_TRUE}" && test -z "${HOST_IS_FREEBSD_FALSE}"; then
as_fn_error $? "conditional \"HOST_IS_FREEBSD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${LIBCW_WITH_DEV_TRUE}" && test -z "${LIBCW_WITH_DEV_FALSE}"; then
as_fn_error $? "conditional \"LIBCW_WITH_DEV\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
......@@ -18677,7 +18693,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by unixcw $as_me 3.5.0, which was
This file was extended by unixcw $as_me 3.5.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -18743,7 +18759,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
unixcw config.status 3.5.0
unixcw config.status 3.5.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
# Copyright (C) 2001-2006 Simon Baldwin (simon_baldwin@yahoo.com)
# Copyright (C) 2011-2015 Kamil Ignacak (acerion@wp.pl)
# Copyright (C) 2011-2017 Kamil Ignacak (acerion@wp.pl)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
......@@ -19,7 +19,7 @@
# General initializations.
AC_PREREQ(2.57)
AC_INIT([unixcw], [3.5.0])
AC_INIT([unixcw], [3.5.1])
AC_CONFIG_SRCDIR([src/libcw/libcw_gen.c])
AM_INIT_AUTOMAKE
......@@ -66,6 +66,7 @@ DL_LIB=
# TODO: consider using AC_CHECK_LIB(ossaudio, _oss_ioctl)
OSS_LIB=
IS_FREEBSD=false
AC_CANONICAL_HOST
case $host_os in
*linux*|*Linux*)
......@@ -75,6 +76,7 @@ case $host_os in
;;
*freebsd*|*FreeBSD*)
AC_MSG_NOTICE([Detected FreeBSD: $host_os])
IS_FREEBSD=true
;;
*openbsd*|*OpenBSD*)
AC_MSG_NOTICE([Detected OpenBSD: $host_os])
......@@ -93,6 +95,7 @@ case $host_os in
DL_LIB=\"-ldl\"
;;
esac
AM_CONDITIONAL([HOST_IS_FREEBSD], [test $IS_FREEBSD = true])
AC_SUBST(DL_LIB)
AC_SUBST(OSS_LIB)
......@@ -136,7 +139,7 @@ fi
# I'm defining it here so that it's available in config.h and can be
# used in libcw's cw_version() function that should return the
# numbers.
LIBCW_VERSION=\"6:5:1\"
LIBCW_VERSION=\"6:6:1\"
AC_DEFINE_UNQUOTED([LIBCW_VERSION], $LIBCW_VERSION, [Library version, libtool notation])
AC_SUBST(LIBCW_VERSION)
......
unixcw for Debian
-----------------
As of version 3.0, this package is split up into
- shared library (libcw<version number>)
- development files (libcw<version number>-dev)
- command line frontend (cw)
- ncurses frontend (cwcp)
- Qt frontend (xcwcp)
Kamil Ignacak <acerion@wp.pl>, Tue, 29 Nov 2011, 20:49:32 +0100
As of version 2.0, this package has been split up into
- shared library (unixcw)
- development files (unixcw-dev)
- command line frontend (cw)
- ncurses frontend (cwcp)
- Qt frontend (xcwcp)
Joop Stakenborg <pa3aba@debian.org>, Wed, 20 Jun 2001 09:44:23 +0200
This diff is collapsed.
Source: unixcw
Section: hamradio
Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Uploaders: Kamil Ignacak <acerion@wp.pl>, Kamal Mostafa <kamal@whence.com>
Standards-Version: 3.9.6
Build-Depends: debhelper (>=7), libasound2-dev, libpulse-dev, qtbase5-dev, libncurses5-dev, po-debconf, autotools-dev, mawk|gawk, dpkg-dev (>= 1.16.1~)
Homepage: http://unixcw.sourceforge.net/
Package: libcw6
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: unixcw, libcw3, libcw4, libcw5
Breaks: unixcw, libcw3
Suggests: cw, cwcp, xcwcp
Description: Morse code tutor - shared library
The unixcw project provides support for learning to use Morse code.
.
This package provides shared library files to handle Morse code
signals and to generate sound on the console buzzer or a sound card
through OSS, ALSA or PulseAudio.
Package: libcw6-dev
Section: libdevel
Architecture: any
Depends: libcw6 (= ${binary:Version}), ${misc:Depends}
Replaces: unixcw-dev, libcw3-dev, libcw4-dev, libcw5-dev
Breaks: unixcw-dev, libcw3-dev
Description: Morse code tutor - development files
The unixcw project provides support for learning to use Morse code.
.
This package provides the static library, headers, and manual page for
development of programs that handle (i.e. send and receive) Morse code.
Package: cw
Architecture: any
Depends: libcw6, ${shlibs:Depends}, ${misc:Depends}, debconf|debconf-2.0
Description: Morse code tutor - command line user interface
The unixcw project provides support for learning to use Morse.
.
This package provides two executables:
* cw - a simple command line application that converts key-presses
to Morse code that can be heard through the console buzzer or a
sound card;
* cwgen - a program that generates groups of random characters for
Morse code practice, which can be piped to the cw program.
.
It also includes example files (with the extension "cw") containing
commands which can be used to change properties such as the speed,
tone, and spacing of characters.
Package: cwcp
Architecture: any
Depends: libcw6, ${shlibs:Depends}, ${misc:Depends}, debconf|debconf-2.0
Description: Morse code tutor - text user interface
The unixcw project provides support for learning to use Morse code.
.
This package provides an interactive Morse code tutor with a
full-screen text-based (ncurses) user interface. It offers menu
selection of sending modes, and keyboard control of character
sounding options such as the sending speed and pitch.
Package: xcwcp
Architecture: any
Depends: libcw6, ${shlibs:Depends}, ${misc:Depends}, debconf|debconf-2.0
Description: Morse code tutor - graphical user interface
The unixcw project provides support for learning to use Morse code.
.
This package provides an interactive Morse code tutor with a Qt4
user interface. It allows choosing from a number of options for
practice, including sending random characters, random words, and
characters from the keyboard. It will also receive Morse code sent
using the keyboard or mouse as a Morse keyer, and display the
characters it sees.
This package was debianized by Joop Stakenborg pa3aba@debian.org on
Wed, 20 Jun 2001 09:44:23 +0200.
Some files that are a standard part of build system, and that
are located in root directory of source package, may have
different copyright holders and different licenses than listed
below. Copyright/license of rest of the files in unixcw source
package follows:
Upstream-Name: unixcw
Upstream-Contact: Kamil Ignacak <acerion@wp.pl>
Source: http://unixcw.sourceforge.net
Files: *
Copyright: Copyright (C) 2001-2006 Simon Baldwin (simon_baldwin@yahoo.com)
Copyright (C) 2011-2017 Kamil Ignacak (acerion@wp.pl)
License: GPL-2+
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 systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
#!/bin/sh
set -e
. /usr/share/debconf/confmodule
db_input medium cw/suid_bit || true
db_go
usr/bin/cw
usr/bin/cwgen
usr/share/man/man1/cw.*
usr/share/man/man1/cwgen.*
usr/share/cw
usr/share/doc/cw
#!/bin/sh
#DEBHELPER#
set -e
[ "$1" = configure ] || exit 0
. /usr/share/debconf/confmodule
db_get cw/suid_bit
if [ "$RET" = "true" ]; then
if !( `dpkg-statoverride --list | grep -q bin/cw$` ); then
dpkg-statoverride --add --update root root 4755 /usr/bin/cw
fi
fi
exit 0
#!/bin/sh
#DEBHELPER#
set -e
if [ "$1" = purge -a -e /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
db_purge
fi
if ( `dpkg-statoverride --list | grep -q bin/cw$` ); then
dpkg-statoverride --remove /usr/bin/cw
fi
#!/bin/sh
cp -f ../../debian/cw.config DEBIAN/config
cp -f ../../debian/cw.templates DEBIAN/templates
#!/bin/sh
#DEBHELPER#
set -e
DOCLINK=/usr/share/doc/cw
# Previously in version 2.3-13 $DOCLINK was a symlink to /usr/share/doc/unixcw.
# Removing this symlink must be handled explicitly so that
# the new version of the package can be placed into a real directory
# there otherwise the symlink will be preserved and the doc files
# will be missing after the install. This is required to upgrade
# from Squeeze to Wheezy. This may be removed after Wheezy.
if [ -h $DOCLINK ]; then
rm -f $DOCLINK
fi
# These templates have been reviewed by the debian-l10n-english
# team
#
# If modifications/additions/rewording are needed, please ask
# debian-l10n-english@lists.debian.org for advice.
#
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
Template: cw/suid_bit
Type: boolean
Default: false
_Description: Run cw with root privileges?
If it is run with elevated privileges (which is not recommended), cw
can produce sounds using the console buzzer.
.
Please choose whether this should be achieved by giving the
executable the "setuid" attribute.
.
Alternatives include running the program with sudo or eliminating this
issue completely by using output via a sound card instead of the
buzzer.
#!/bin/sh
set -e
. /usr/share/debconf/confmodule
db_input medium cwcp/suid_bit || true
db_go
usr/bin/cwcp
usr/share/man/man1/cwcp*
usr/share/doc/cwcp
?package(cwcp):needs="text" section="Applications/Amateur Radio"\
title="cwcp" command="/usr/bin/cwcp"
#!/bin/sh
#DEBHELPER#
set -e
[ "$1" = configure ] || exit 0
. /usr/share/debconf/confmodule
db_get cwcp/suid_bit
if [ "$RET" = "true" ]; then
if !( `dpkg-statoverride --list | grep -q bin/cwcp` ); then
dpkg-statoverride --add --update root root 4755 /usr/bin/cwcp
fi
fi
#!/bin/sh
#DEBHELPER#
set -e
if [ "$1" = purge -a -e /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
db_purge
fi
if ( `dpkg-statoverride --list | grep -q bin/cwcp` ); then
dpkg-statoverride --remove /usr/bin/cwcp
fi
#!/bin/sh
cp -f ../../debian/cwcp.config DEBIAN/config
cp -f ../../debian/cwcp.templates DEBIAN/templates
#!/bin/sh
#DEBHELPER#
set -e
DOCLINK=/usr/share/doc/cwcp
# Previously in version 2.3-13 $DOCLINK was a symlink to /usr/share/doc/unixcw.
# Removing this symlink must be handled explicitly so that
# the new version of the package can be placed into a real directory
# there otherwise the symlink will be preserved and the doc files
# will be missing after the install. This is required to upgrade
# from Squeeze to Wheezy. This may be removed after Wheezy.
if [ -h $DOCLINK ]; then
rm -f $DOCLINK
fi
# These templates have been reviewed by the debian-l10n-english
# team
#
# If modifications/additions/rewording are needed, please ask
# debian-l10n-english@lists.debian.org for advice.
#
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
Template: cwcp/suid_bit
Type: boolean
Default: false
_Description: Run cwcp with root privileges?
If it is run with elevated privileges (which is not recommended), cwcp
can produce sounds using the console buzzer.
.
Please choose whether this should be achieved by giving the
executable the "setuid" attribute.
.
Alternatives include running the program with sudo or eliminating this
issue completely by using output via a sound card instead of the
buzzer.
/* XPM */
static const char * icon_mini_xcwcp_xpm[] = {
"32 32 4 1",
" c None",
". c #FE0000",
"+ c #FF0000",
"@ c #000000",
" ",
" ",
" ",
" ",
" ..++.. +..+++ ",
" +.++++ .++..+ ",
" .+++.+ ..+.+. ",
" .+...+ .....+ ",
" ..++++ .+++.+ ",
" .+++.+ ..++.+ ",
" ",
" ",
" @@@@@@ @@@@@@ ",
" @@@@@@ @@@@@@ ",
" @@@@@@ @@@@@@ ",
" @@@@@@ @@@@@@ ",
" @@@@@@ @@@@@@ ",
" @@@@@@ @@@@@@ ",
" @@@@@@ @@@@@@ ",
" @@@@@@ @@@@@@ ",
" @@@@@@@ @@@@@@@ ",
" @@@@@@@@ @@@@@@@@ ",
" @@@@@@@@@@@@@@@@@@@@ ",
" @@@@@@@@@@@@@@@@@@ ",
" @@@@@@@@@@@@@@@@ ",
" @@@@@@@@@@@@@@ ",
" @@@@@@@@@@@@ ",
" @@@@@@@@ ",
" ",
" ",
" ",
" "};
This diff is collapsed.
usr/lib/libcw.a
# lintian-info -t dev-pkg-without-shlib-symlink | non-dev-pkg-with-shlib-symlink:
# "A "-dev" package is supposed to install a "libsomething.so" symbolic
# link referencing the corresponding shared library. Notice how the link
# name doesn't include the version number -- this is because such a link
# is used by the linker when other programs are built against this
# shared library."
#
# "Shared libraries are supposed to place such symbolic links in their
# respective "-dev" packages, so it is a bug to include it with the main
# library package."
#
# The question is how does dh know that libcw.so should be a symlink, and
# that it should be created at some point. I can't see any explicit call
# to "ln -s" in debian/* files... But as long as it works implicitly, I'm
# willing to think that this is just how things should be.
usr/lib/libcw.so
usr/include/libcw.h
usr/include/libcw_debug.h
usr/share/man/man3
usr/share/doc/libcw6-dev
usr/lib/pkgconfig/libcw.pc
usr/share/doc/libcw6
usr/lib/libcw.so.6.6.1
usr/lib/libcw.so.6
usr/share/man/man7/cw.7
[type: gettext/rfc822deb] cwcp.templates
[type: gettext/rfc822deb] cw.templates
# SOME DESCRIPTIVE TITLE. <