Commit 616b7b12 authored by Kamil Ignacak's avatar Kamil Ignacak Committed by Christoph Berg

Import Debian changes 3.0.2-1

unixcw (3.0.2-1) unstable; urgency=low

  * Fixing FTBFS (problems with config.* files). I think that thanks to
    new entry in debian/source/options the fix is permanent. Closes: #676752.
  * Removing 'debian/' from unixcw_3.0.2-1.debian.tar.gz. Upstream version
    bump to avoid problems with upload.
parents 0fcc32f2 04f7a6fe
version 3.0.2 / 2012.06.18
New version. You won't find it in git repo, but only in SourceForge download
area and on Debian webpage.
This is a special release with two goals related to Debian packaging:
debian/:
- fixing Debian's FTBFS bug #676752
- removing debian/ from unixcw_X.Y.Z.orig.tar.gz. Contents of debian/ can be
found in separately provided unixcw_X.Y.Z-W.debian.tar.gz
Thanks to Kamal Mostafa for patiently explaining to me some details of
Debian/Ubuntu packaging.
----------------------------------------------------------------------------
version 3.0.1 / 2012.01.08
Thanks to Kamal Mostafa for providing patches that are the reason
......
version 3.0.2 / 2012.06.18
New version. You won't find it in git repo nor in SourceForge download area.
This is a special release with two goals related to Debian packaging:
debian/:
- fixing Debian's FTBFS bug #676752
- removing debian/ from unixcw_X.Y.Z.orig.tar.gz. Contents of debian/ can be
found in separately provided unixcw_X.Y.Z-W.debian.tar.gz
Thanks to Kamal Mostafa for patiently explaining to me some details of
Debian/Ubuntu packaging.
----------------------------------------------------------------------------
version 3.0.1 / 2012.01.08
Thanks to Kamal Mostafa for providing patches that are the reason
for 3.0.1 release.
Content of upstream package unixcw-3.0.1 is approximately the same as of
Debian source package unixcw_3.0-5.
debian/:
- added proper "Section" field in control file;
- fixed library dependencies in control file;
- fixed "Replaces:"/"Conflicts:" fields in control file;
- fixed Debian bug #653411: changes in *.preinst files to remove
dangling symlinks left by old packaging (suggested by Bob Proulx);
general:
- fixed library dependencies in "configure" script;
- fixed library dependencies provided by libcw.pc file;
libcw:
- proper detection of capabilities of liboss-salsa-dev
(kfreebsd's libasound implementation); libcw now can be built
properly on Debian/kFreeBSD;
- fixing awk scripts producing man pages: the awk scripts now
work with mawk too;
cwcp:
- fixed list of libraries in Makefile;
----------------------------------------------------------------------------
version 3.0 / 2011.12.13
Thanks to Simon Baldwin for creating this software in the
first place, and to Kamal Mostafa for helping me with packaging
unixcw 3.0 for Debian.
unixcw:
- Changed major version of unixcw package to '3'. Changes listed
below probably justify this.
- New main developer: Kamil Ignacak <acerion@wp.pl>
- New website: http://unixcw.sourceforge.net
- Scripts building Debian packages now build 'libcw3' package
instead of 'unixcw' package, and 'libcw3-dev' Debian package instead
of 'unixcw-dev' Debian package.
libcw:
- Renamed 'cwlib' part of unixcw package to 'libcw'.
- Renamed library's header file from cwlib.h to libcw.h.
- Changed library's soname from 0 to 3 (/usr/lib/libcw.so.3.0.0
/ libcw.so.3).
- Added support for ALSA. OSS is still the default backend.
- As a consequence, libasound2 is a new dependency. There is no
possibility (yet) to disable or reconfigure this at build time.
It is possible to select sound backend in applications that use
libcw.
- Added implicit dependency on pthread library (which is a part
of libc library, so it should be available on target system by
default). Main routine generating sine wave operates as a separate
thread.
- Added actual slopes to dot and dash sounds produced by the
library. This should result in less of (or even none) audible
pops. Unfortunately current implementation makes dots and dashes
a tiny bit longer than they would be without the slopes. The
difference is not significant, but I plan to re-implement it
in the future to make this feature 100% correct.
The slopes are linear.
- Rewritten management of sound volume so that the library doesn't
use OSS mixer. This should resolve Debian bug #567394
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567394).
Code that controls volume level is common for OSS and ALSA.
- Since libcw doesn't touch the mixer device anymore, then Debian
bug #567392 should be resolved as well
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567392).
- Added code that attempts to discover proper audio buffer size
for both OSS and ALSA. This should resolve Debian bug #567395
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567395).
- Fix of Debian bug #567395 should also solve Debian bug #567397
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567397).
- Changed library's API. There will be more API changes in 3.1, so
consider current API to be unstable.
- Changed volume change step from 5% to 1%.
- Changed frequency change step from 100Hz to 20Hz.
- The library no longer can produce sound on console buzzer and on
sound card at the same time.
- The library knows default names of OSS, ALSA and console buzzer
devices. The names are used to open sound devices if no other
names are provided explicitly as function arguments.
- Introduced symbolic names of int values returned by most of
library's function: CW_FAILURE / CW_SUCCESS.
xcwcp:
- Ported xcwcp to QT4. This should resolve Debian bug #604386
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=604386).
- Added auto-detection of QT4 headers and QT4 moc by build files.
#!/bin/bash
PACKAGE="unixcw"
VERSION="3.0.1"
# setup
REPO=`pwd`
cd ../../build
BUILD=`pwd`
echo "REPO = " $REPO
echo "BUILD = " $BUILD
if [ "$REPO" == x"" ]; then
echo "REPO is empty"
exit
elif [ "$REPO" == x"/" ]; then
echo "REPO is root directory"
exit
fi
if [ "$BUILD" == x"" ]; then
echo "BUILD is empty"
exit
elif [ "$BUILD" == x"/" ]; then
echo "BUILD is root directory"
exit
fi
# clean up old files, prepare brand new, empty dir
rm -rf $BUILD/*
# prepare $PACKAGE_X.Y.Z.debian.tar.gz
cd $REPO
cp -rp debian $BUILD/
cd $BUILD
tar cvfz $PACKAGE\_$VERSION.debian.tar.gz debian
rm -rf debian
cd $REPO
cp -rp ../$PACKAGE $BUILD
cd $BUILD/$PACKAGE/
./_clean_up distclean
rm -rf _build_debian _clean_up
rm -rf .git
cd $BUILD
mv $PACKAGE $PACKAGE-$VERSION
tar cvfz $PACKAGE\_$VERSION.orig.tar.gz $PACKAGE-$VERSION --exclude=debian
# go to final build dir and start building Debian package
cd $PACKAGE-$VERSION
echo ""
echo `pwd`
debuild -us -uc
This diff is collapsed.
This diff is collapsed.
unixcw (3.0.2-1) unstable; urgency=low
* Fixing FTBFS (problems with config.* files). I think that thanks to
new entry in debian/source/options the fix is permanent. Closes: #676752.
* Removing 'debian/' from unixcw_3.0.2-1.debian.tar.gz. Upstream version
bump to avoid problems with upload.
-- Kamil Ignacak <acerion@wp.pl> Mon, 18 June 2012 23:03:08 +0100
unixcw (3.0.1-3) unstable; urgency=low
* Fixing problems with building. Closes: #663947.
......
......@@ -4,7 +4,7 @@ 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.3
Build-Depends: debhelper (>=7), libasound2-dev, libqt4-dev, libncurses5-dev, po-debconf, autotools-dev, mawk|gawk
Build-Depends: debhelper (>=7), libasound2-dev, libqt4-dev, libncurses5-dev, po-debconf, autotools-dev, mawk|gawk, dpkg-dev (>= 1.16.1~)
Homepage: http://unixcw.sourceforge.net/
Package: libcw3
......
# 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/lib/libcw.a
usr/include/libcw.h
usr/share/man/man3
......
This diff is collapsed.
......@@ -22,6 +22,13 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# Enable hardening.
# http://wiki.debian.org/Hardening#dpkg-buildflags
DPKG_EXPORT_BUILDFLAGS = yes
include /usr/share/dpkg/default.mk
LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
CFLAGS = -Wall -g -std=gnu99
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
......
# Don't store changes on autogenerated files
# Source: http://raphaelhertzog.com/2011/01/28/3-ways-to-not-clutter-your-debian-source-package-with-autogenerated-files/
extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile)$"
\ No newline at end of file
......@@ -33,7 +33,7 @@ all: cw
cw.o: cw.c ../libcw/libcw.h
cw: cw.o
$(CC) -o $@ cw.o ../cwutils/i18n.o ../cwutils/cw_common.o ../cwutils/cmdline.o \
$(CC) $(LDFLAGS) -o $@ cw.o ../cwutils/i18n.o ../cwutils/cw_common.o ../cwutils/cmdline.o \
../cwutils/memory.o $(LIBS) -g -O0
# Install targets.
......
# Copyright (C) 2001-2006 Simon Baldwin (simon_baldwin@yahoo.com)
# Copyright (C) 2011-2012 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
# 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.
#
include ../../Makefile.inc
CC = $(AC_CC)
CFLAGS = $(AC_CFLAGS) $(AC_DEFS) -I../libcw -I../cwutils
GZIP = $(AC_GZIP)
SHELL = /bin/sh
default: all
LIBS = -L../libcw -lcw
# Build the cw binary.
all: cw
cw.o: cw.c ../libcw/libcw.h
cw: cw.o
$(CC) -o $@ cw.o ../cwutils/i18n.o ../cwutils/cw_common.o ../cwutils/cmdline.o \
../cwutils/memory.o $(LIBS) -g -O0
# Install targets.
install: all
$(INSTALL) -d $(includedir) $(bindir) $(mandir)/man1
$(INSTALL_DATA) cw.h $(includedir)/cw.h
$(INSTALL_PROGRAM) -m 4755 cw $(bindir)/cw
$(INSTALL_DATA) cw.1 $(mandir)/man1/cw.1
$(GZIP) -f -9 $(mandir)/man1/cw.1
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
uninstall:
rm -f $(includedir)/cw.h
rm -f $(bindir)/cw
rm -f $(mandir)/man1/cw.1 $(mandir)/man1/cw.1.gz
# Cleanup targets.
clean:
rm -f cw *.s *.o
rm -f core core.*
distclean: clean
rm -f Makefile.port
mostlyclean: clean
maintainer-clean: distclean
# Test targets.
# This test target will be invoked when creating deb package.
check:
# This test target can be invoked manually.
real_check: all
( echo "Trying with OSS audio output"; \
LD_LIBRARY_PATH=../libcw:$$LD_LIBRARY_PATH ./cw -so -f test.cw ) || \
( echo "Retrying with ALSA audio output"; \
LD_LIBRARY_PATH=../libcw:$$LD_LIBRARY_PATH ./cw -sa -f test.cw ) || \
( echo "Retrying with console audio output"; \
LIBCW_DEBUG=1 \
LD_LIBRARY_PATH=../libcw:$$LD_LIBRARY_PATH ./cw -sc -f test.cw )
# Unimplemented targets.
TAGS:
info:
dvi:
dist:
......@@ -31,7 +31,7 @@ all: cwgen
cwgen.o: cwgen.c
cwgen: cwgen.o
$(CC) -o $@ cwgen.o ../cwutils/i18n.o ../cwutils/cmdline.o \
$(CC) $(LDFLAGS) -o $@ cwgen.o ../cwutils/i18n.o ../cwutils/cmdline.o \
../cwutils/memory.o
# Install targets.
......
# Copyright (C) 2001-2006 Simon Baldwin (simon_baldwin@yahoo.com)
# Copyright (C) 2011-2012 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
# 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.
#
include ../../Makefile.inc
CC = $(AC_CC)
CFLAGS = $(AC_CFLAGS) $(AC_DEFS) -I../cwutils
GZIP = $(AC_GZIP)
SHELL = /bin/sh
default: all
# Build the cwgen binary.
all: cwgen
cwgen.o: cwgen.c
cwgen: cwgen.o
$(CC) -o $@ cwgen.o ../cwutils/i18n.o ../cwutils/cmdline.o \
../cwutils/memory.o
# Install targets.
install: all
$(INSTALL) -d $(bindir) $(mandir)/man1
$(INSTALL_PROGRAM) cwgen $(bindir)/cwgen
$(INSTALL_DATA) cwgen.1 $(mandir)/man1/cwgen.1
$(GZIP) -f -9 $(mandir)/man1/cwgen.1
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
uninstall:
rm -f $(bindir)/cwgen
rm -f $(mandir)/man1/cwgen.1 $(mandir)/man1/cwgen.1.gz
# Cleanup targets.
clean:
rm -f cwgen *.s *.o
rm -f core core.*
distclean: clean
rm -f Makefile.port
mostlyclean: clean
maintainer-clean: distclean
# Test targets.
check: all
-./cwgen
# Unimplemented targets.
TAGS:
info:
dvi:
dist:
......@@ -43,11 +43,11 @@ libcw.a: libcw.o
libcw.so.3.0.1: libcw.o
if [ "$(CC_LINKS_SO)" = "yes" ]; then \
$(CC) -shared -Wl,-soname,libcw.so.3 \
$(CC) $(LDFLAGS) -shared -Wl,-soname,libcw.so.3 \
-o libcw.so.3.0.1 libcw.o $(COMMON_LIBS); \
else \
if [ "$(LD_LINKS_SO)" = "yes" ]; then \
$(LD) -G -Wl,-soname,libcw.so.3 \
$(LD) $(LDFLAGS) -G -Wl,-soname,libcw.so.3 \
-o libcw.so.3.0.1 libcw.o $(COMMON_LIBS); \
fi \
fi
......
# Copyright (C) 2001-2006 Simon Baldwin (simon_baldwin@yahoo.com)
# Copyright (C) 2011-2012 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
# 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.
#
include ../../Makefile.inc
CC = $(AC_CC)
CFLAGS = $(AC_CFLAGS) $(AC_CFLAG_PIC) $(AC_DEFS)
AWK = $(AC_AWK)
RANLIB = $(AC_RANLIB)
LD = $(AC_LD)
LN_S = $(AC_LN_S)
GZIP = $(AC_GZIP)
LDCONFIG= $(AC_LDCONFIG)
CC_LINKS_SO = $(AC_CC_LINKS_SO)
LD_LINKS_SO = $(AC_LD_LINKS_SO)
SHELL = /bin/sh
COMMON_LIBS = -lm -lpthread -lasound
default: all
all: libcw.a libcw.so.3.0.1 libcw.so.3 libcw.so libcw.pc libcw.3 libcwtest
# Build the static and shared libraries.
libcw.a: libcw.o
rm -f libcw.a; ar -cr libcw.a libcw.o
$(RANLIB) libcw.a
libcw.so.3.0.1: libcw.o
if [ "$(CC_LINKS_SO)" = "yes" ]; then \
$(CC) -shared -Wl,-soname,libcw.so.3 \
-o libcw.so.3.0.1 libcw.o $(COMMON_LIBS); \
else \
if [ "$(LD_LINKS_SO)" = "yes" ]; then \
$(LD) -G -Wl,-soname,libcw.so.3 \
-o libcw.so.3.0.1 libcw.o $(COMMON_LIBS); \
fi \
fi
libcw.so.3: libcw.so.3.0.1
$(LN_S) -f libcw.so.3.0.1 libcw.so.3
libcw.so: libcw.so.3.0.1
$(LN_S) -f libcw.so.3.0.1 libcw.so
# Build the library man page.
libcw.3: libcw.3.m4 libcw.c
$(AWK) -f libdoc.awk <libcw.c | $(AWK) -f libsigs.awk >signatures
$(AWK) -f libdoc.awk <libcw.c | $(AWK) -f libfuncs.awk >functions
$(AWK) -f include.awk <libcw.3.m4 >libcw.3
rm -f signatures functions
# Build the unit test.
libcwtest: libcwtest.o
$(CC) -o libcwtest libcwtest.o -L. -lcw
# Build the pkgconfig metadata file.
libcw.pc:
$(AWK) -vprefix="$(prefix)" -v exec_prefix="$(exec_prefix)" \
-vlibdir="$(libdir)" -v includedir="$(includedir)" \
-vstrip="$$RPM_BUILD_ROOT" \
-vconfig_h="../config.h" -f libpc.awk >libcw.pc
# Define dependencies related to header/include files.
libcw.o: Makefile libcw.h
libcwtest.o: Makefile libcw.h
# Install targets.
install: all
$(INSTALL) -d $(includedir) $(libdir) $(mandir)/man3 $(mandir)/man7 \
$(libdir)/pkgconfig
$(INSTALL_DATA) libcw.h $(includedir)/libcw.h
$(INSTALL_DATA) libcw.a $(libdir)/libcw.a
if [ "$(CC_LINKS_SO)" = "yes" -o "$(LD_LINKS_SO)" = "yes" ]; then \
$(INSTALL_PROGRAM) libcw.so.3.0.1 $(libdir)/libcw.so.3.0.1; \
$(LN_S) -f libcw.so.3.0.1 $(libdir)/libcw.so.3; \
$(LN_S) -f libcw.so.3.0.1 $(libdir)/libcw.so; \
$(LDCONFIG) -n $(libdir); \
fi
$(INSTALL_DATA) libcw.3 $(mandir)/man3/libcw.3
$(GZIP) -f -9 $(mandir)/man3/libcw.3
$(INSTALL_DATA) cw.7 $(mandir)/man7/cw.7
$(GZIP) -f -9 $(mandir)/man7/cw.7
$(INSTALL_DATA) cw.7 $(mandir)/man7/CW.7
$(GZIP) -f -9 $(mandir)/man7/CW.7
$(INSTALL_DATA) libcw.pc $(libdir)/pkgconfig/libcw.pc
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
uninstall:
rm -f $(includedir)/libcw.h
rm -f $(libdir)/libcw.a
rm -f $(libdir)/libcw.so $(libdir)/libcw.so.3 $(libdir)/libcw.so.3.0.1
$(LDCONFIG) -n $(libdir)
rm -f $(mandir)/man3/libcw.3 $(mandir)/man3/libcw.3.gz
rm -f $(mandir)/man7/cw.7 $(mandir)/man7/cw.7.gz
rm -f $(mandir)/man7/CW.7 $(mandir)/man7/CW.7.gz
rm -f $(libdir)/pkgconfig/libcw.pc
# Cleanup targets.
clean:
rm -f libcw.a libcw.so libcw.so.3 libcw.so.3.0.1 *.s libcw.pc *.o
rm -f libcw.3 signatures functions
rm -f libcwtest
rm -f core core.*
distclean: clean
rm -f Makefile.port
mostlyclean: clean
maintainer-clean: distclean
# Test targets.
check: all libcwtest
-LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH ./libcwtest
# Unimplemented targets.
TAGS:
info:
dvi:
dist:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment