tags 652618 +patch
thanks
[ adding the unixcw maintainer to the loop ]
[ also adding Michael as Cc, as last NMUer of the package he might have
interest in it ]
Hi!
* Alexander Reichle-Schmehl <toli...@debian.org> [111219 11:09]:
> I'm sorry, but I fear your package will FTBFS starting with the next
> dinstall run. Background is that unixcw dropped to build the package
> unixcw-dev on which cwdaemon build-depends. And well... I cruft-removed
> said package by mistake just now.
>
> I guess that the new build-dependency should be libcw3-dev, but I haven't
> checked.
The good news is that I kind of fixed it. The bad news is, that I can't
test the resulting package. Also just replacing the build-depens on
unixcw-dev with libcw3-dev didn't solved the issue, I guess that means
that the "Provides: unixcw-dev" of libcw3-dev is not true.
I had to do some further changes (see attached debdiff). To my
understanding the calls cw_set_soundcard_sound and cw_set_console_sound
are no longer necessary, as libcw automatically picks the right one?
Well, at least with the attached changes it builds again. So far, so
good, however I couldn't actually check the resulting package.
That being said, here are a couple of questions:
1) Is this package actually being used? Orphaned since two years, no
reverde depends (only one suggests by xlog), pretty low popcon (but a
special package), no upstream development.
2) Is the patch correct? Anyone can test it?
And for the Debian Hamradio Maintainers:
3) Shouldn't libcw3-dev have a dependency on libasound2-dev? Apparently
that's needed for successfull linking.
4) Are libcw's pc files correct? As you can see, I also had to add also
to the CFLAGS and lib calls.
5) Wouldn't you like to adopt cwdaemon, if it's worth to be kept?
Best Regards,
Alexander
diff -Nru cwdaemon-0.9.4/cwdaemon.c cwdaemon-0.9.4/cwdaemon.c
--- cwdaemon-0.9.4/cwdaemon.c 2006-11-09 10:23:11.000000000 +0100
+++ cwdaemon-0.9.4/cwdaemon.c 2011-12-19 13:36:02.000000000 +0100
@@ -89,7 +89,7 @@
#endif
#include <limits.h>
-#include <cwlib.h>
+#include <libcw.h>
#include "cwdaemon.h"
/* network vars */
@@ -305,8 +305,8 @@
{
cw_set_frequency (morse_tone);
cw_set_send_speed (morse_speed);
- cw_set_soundcard_sound (soundcard_sound);
- cw_set_console_sound (console_sound);
+ /* cw_set_soundcard_sound (soundcard_sound);
+ cw_set_console_sound (console_sound); */
cw_set_volume (morse_volume);
cw_set_gap (0);
}
@@ -559,8 +559,8 @@
if (valid_sdevice == 1)
{
debug ("Sound device: %s", message + 2);
- cw_set_soundcard_sound
(soundcard_sound);
- cw_set_console_sound (console_sound);
+ /*cw_set_soundcard_sound
(soundcard_sound);
+ cw_set_console_sound (console_sound); */
}
break;
case 'g': /* volume */
diff -Nru cwdaemon-0.9.4/debian/changelog cwdaemon-0.9.4/debian/changelog
--- cwdaemon-0.9.4/debian/changelog 2011-12-19 13:44:59.000000000 +0100
+++ cwdaemon-0.9.4/debian/changelog 2011-12-19 13:10:44.000000000 +0100
@@ -1,3 +1,11 @@
+cwdaemon (0.9.4-8) unstable; urgency=medium
+
+ * QA upload.
+ * Replace build-depends on unixcw-dev with libcw3-dev (Closes: #652618)
+ * Set urgency to medium due to rc bug fix
+
+ -- Alexander Reichle-Schmehl <toli...@debian.org> Mon, 19 Dec 2011 12:53:01
+0100
+
cwdaemon (0.9.4-7.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru cwdaemon-0.9.4/debian/control cwdaemon-0.9.4/debian/control
--- cwdaemon-0.9.4/debian/control 2011-12-19 13:44:59.000000000 +0100
+++ cwdaemon-0.9.4/debian/control 2011-12-19 13:10:44.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian QA Group <packa...@qa.debian.org>
Standards-Version: 3.8.3
-Build-Depends: debhelper (>=4.0.0), autotools-dev, unixcw-dev (>=2.3-10),
pkg-config
+Build-Depends: debhelper (>=4.0.0), autotools-dev, libcw3-dev, libasound2-dev,
pkg-config
Package: cwdaemon
Architecture: any
diff -Nru cwdaemon-0.9.4/debian/rules cwdaemon-0.9.4/debian/rules
--- cwdaemon-0.9.4/debian/rules 2011-12-19 13:44:59.000000000 +0100
+++ cwdaemon-0.9.4/debian/rules 2011-12-19 13:31:53.000000000 +0100
@@ -16,7 +16,8 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g
+CFLAGS = $(shell pkg-config --cflags alsa libcw) -Wall -g
+LDFLAGS = $(shell pkg-config --libs alsa libcw)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -27,7 +28,7 @@
config.status: configure
dh_testdir
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info
+ CFLAGS="$(CFLAGS) -Wl,-z,defs" LDFLAGS="$(LDFLAGS)" ./configure
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
build: build-stamp
