--- gmfsk-0.6+0.7pre1.orig/debian/copyright +++ gmfsk-0.6+0.7pre1/debian/copyright @@ -0,0 +1,19 @@ +This is the Debian GNU/Linux package of gMFSK. + +Xastir was written by Tomi Manninen, OH2BNS +The Debian package was initially created by Hamish Moffatt + from sources obtained at: + http://hes.iki.fi/pub/ham/unix/linux/hfmodems/ + +This program is free software; you may 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, or (at your option) +any later version. + +This 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. + +A copy of the GNU General Public License is available as +/usr/share/common-licenses/GPL in the Debian GNU/Linux distribution. --- gmfsk-0.6+0.7pre1.orig/debian/gmfsk.menu +++ gmfsk-0.6+0.7pre1/debian/gmfsk.menu @@ -0,0 +1,4 @@ +?package(gmfsk):needs="X11" section="Apps/Hamradio" \ + title="gmfsk" longtitle="gMFSK" \ + description="MFSK modem" \ + command="/usr/bin/gmfsk" --- gmfsk-0.6+0.7pre1.orig/debian/rules +++ gmfsk-0.6+0.7pre1/debian/rules @@ -0,0 +1,70 @@ +#!/usr/bin/make -f + +# tell gconf not to register schemas at package build time +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 + +build: build-stamp +build-stamp: patch-stamp + cp -f /usr/share/misc/config.sub . + cp -f /usr/share/misc/config.guess . + dh_testdir + ./configure --prefix=/usr --sysconfdir=/etc --enable-hamlib + + $(MAKE) + touch build-stamp + +clean: clean1 unpatch +clean1: + dh_testdir + [ ! -f Makefile ] || $(MAKE) distclean + -rm build-stamp config.log + dh_clean config.guess config.sub + +binary-indep: build +# nothing else to do + +binary-arch: build + dh_clean + dh_installdirs + $(MAKE) install DESTDIR=`pwd`/debian/gmfsk + cp debian/gmfsk.desktop debian/gmfsk/usr/share/applications + + # Move the X fonts to the proper location + #mv debian/gmfsk/usr/share/fonts/feldhell/*.pcf debian/gmfsk/usr/X11R6/lib/X11/fonts/misc + #rm -rf debian/gmfsk/usr/share/fonts + # Remove the X fonts as they can't be used currently - to be fixed + rm -rf debian/gmfsk/usr/share/fonts + + dh_gconf + dh_scrollkeeper + #dh_installxfonts + dh_installdocs AUTHORS README + dh_installmenu + dh_installman debian/gmfsk.man + dh_installchangelogs ChangeLog + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +patch: patch-stamp +patch-stamp: + dpatch apply-all + touch patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +binary: binary-indep binary-arch + +checkroot: + dh_testdir + dh_testroot + +.PHONY: binary binary-arch binary-indep clean checkroot --- gmfsk-0.6+0.7pre1.orig/debian/compat +++ gmfsk-0.6+0.7pre1/debian/compat @@ -0,0 +1 @@ +4 --- gmfsk-0.6+0.7pre1.orig/debian/control +++ gmfsk-0.6+0.7pre1/debian/control @@ -0,0 +1,15 @@ +Source: gmfsk +Section: hamradio +Priority: optional +Maintainer: Hamish Moffatt +Standards-Version: 3.6.2 +Build-Depends: debhelper (>= 4), fftw-dev, libgnomeui-dev, libhamlib-dev | hamlib-dev (>= 1.2.4), scrollkeeper, gconf2, dpatch, autotools-dev + +Package: gmfsk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: MFSK, RTTY and other digital mode terminal for HF/amateur radio + gmfsk is a terminal program for amateur radio digital communication + modes for GNOME. It supports MFSK, RTTY, THROB, PSK31, MT63 and + Hellschreiber modulations. It is used for keyboard-to-keyboard chatting + and not reliable packet communication. --- gmfsk-0.6+0.7pre1.orig/debian/changelog +++ gmfsk-0.6+0.7pre1/debian/changelog @@ -0,0 +1,169 @@ +gmfsk (0.6+0.7pre1-2.2) unstable; urgency=low + + [ Kęstutis Bilūnas ] + * Non-maintainer upload. + * debian/patches: added the patch 13_log2_fix.dpatch for fix FTBFS + (Closes: #552851). + * debian/rules: + - fixed the order of calling debhelper programs dh_; + - fixed the clean target. + + [ Christoph Egger ] + * Update config.*, remove again in clean so they don't show up in the diff + + -- Kęstutis Bilūnas Tue, 08 Dec 2009 11:20:38 +0100 + +gmfsk (0.6+0.7pre1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with gcc-4.3. Patch from Kumar Appaiah. Closes: #456105. + + -- Mark Hymers Sun, 06 Apr 2008 12:17:04 +0100 + +gmfsk (0.6+0.7pre1-2) unstable; urgency=low + + * Change build-deps to libhamlib-dev | hamlib-dev ... + + -- Hamish Moffatt Thu, 20 Apr 2006 19:08:20 +1000 + +gmfsk (0.6+0.7pre1-1) unstable; urgency=low + + * New upstream version 0.7pre1 (0.6+0.7pre1 for Debian). + Long overdue for upload to Debian. + * Update standards-revision to 3.6.2 + * Fix category in desktop entry ("Ham Radio" => "HamRadio") + * Included W1HKJ's waterfall colour and zoom changes as + an experiment; more of W1HKJ's modifications to follow. + + -- Hamish Moffatt Sun, 2 Apr 2006 01:27:22 +1100 + +gmfsk (0.6-10) unstable; urgency=low + + * Removed build-dep on xlibs-dev, because gmfsk does not link any + X libraries directly (only via gtk) + + -- Hamish Moffatt Sun, 8 Jan 2006 14:17:33 +1100 + +gmfsk (0.6-9) unstable; urgency=low + + * Recompile with g++-4.0 + + -- Hamish Moffatt Sun, 31 Jul 2005 17:49:27 +1000 + +gmfsk (0.6-8) unstable; urgency=low + + * Recompile for hamlib 1.2.4 (updated build-deps) + + -- Hamish Moffatt Sun, 10 Apr 2005 23:41:10 +1000 + +gmfsk (0.6-7) unstable; urgency=low + + * Enabled hamlib support during build (closes: #282398) + * Fixed FTBFS with gcc-3.4 (closes: #274361); thanks to Andreas Jochens + for the patch + + -- Hamish Moffatt Sun, 23 Jan 2005 09:57:49 +1100 + +gmfsk (0.6-6) unstable; urgency=medium + + * Change configure.in to check for fftw last, so that libc6 tests + will pass with broken libfftw on arm + + -- Hamish Moffatt Fri, 1 Oct 2004 08:43:36 +1000 + +gmfsk (0.6-5) unstable; urgency=medium + + * Add dump of config.log during build so that we can find out why + configure on arm thinks gnu libc malloc is unavailable. + * Updated config.guess & config.sub in case that helps + + -- Hamish Moffatt Fri, 1 Oct 2004 01:23:18 +1000 + +gmfsk (0.6-4) unstable; urgency=medium + + * More workarounds for libfftw linking error on arm; modified + src/misc/Makefile.am so that the build-time genfilt program + links correctly + * Made this urgency=medium so that if it ever builds on arm + we won't have to wait too much longer for it to make testing. + + -- Hamish Moffatt Thu, 30 Sep 2004 08:51:18 +1000 + +gmfsk (0.6-3) unstable; urgency=low + + * Modified configure.in to use -lm when testing for libfftw, as + libfftw appears to be linked incorrectly on arm; might fix #271651 + + -- Hamish Moffatt Sun, 19 Sep 2004 23:48:13 +1000 + +gmfsk (0.6-2) unstable; urgency=low + + * Attempt to debug #271651 - FTBFS on arm + + -- Hamish Moffatt Sun, 19 Sep 2004 13:06:08 +1000 + +gmfsk (0.6-1) unstable; urgency=low + + * New upstream release (0.6 final). + + -- Hamish Moffatt Mon, 19 Jul 2004 18:49:07 +1000 + +gmfsk (0.5+0.6beta3-1) unstable; urgency=low + + * New upstream release. This is 0.6 beta 3. + + -- Hamish Moffatt Tue, 13 Jul 2004 17:42:16 +1000 + +gmfsk (0.5+0.6beta2-1) unstable; urgency=low + + * New upstream release. This is 0.6 beta 2. + + -- Hamish Moffatt Sun, 25 Jan 2004 11:44:10 +1100 + +gmfsk (0.5-1) unstable; urgency=low + + * New upstream release for GNOME2 + + -- Hamish Moffatt Sun, 20 Apr 2003 12:12:23 +1000 + +gmfsk (0.4.1-4) unstable; urgency=low + + * Compile with gcc-3.2 on ia64, as previous versions can't compile it + (closes: #144598) + + -- Hamish Moffatt Sun, 24 Nov 2002 15:56:14 +1100 + +gmfsk (0.4.1-3) unstable; urgency=low + + * Removed accidental unnecessary compilation with gcc-3.0 + (closes: #165660) + + -- Hamish Moffatt Mon, 21 Oct 2002 21:34:43 +1000 + +gmfsk (0.4.1-2) unstable; urgency=low + + * Added manual page gmfsk(1). + * Updated standards-version to 3.5.7. + + -- Hamish Moffatt Tue, 15 Oct 2002 23:56:24 +1000 + +gmfsk (0.4.1-1) unstable; urgency=low + + * New upstream release, with THROB and RTTY support + + -- Hamish Moffatt Thu, 25 Apr 2002 12:32:15 +1000 + +gmfsk (0.3-1) unstable; urgency=low + + * New upstream release + * Removed unnecessary (and unadvertised) build-dependency on + libncurses5-dev (closes: #101089, #101231) + + -- Hamish Moffatt Mon, 18 Jun 2001 08:32:16 +1000 + +gmfsk (0.2-1) unstable; urgency=low + + * First release (closes: #100170) + + -- Hamish Moffatt Sat, 9 Jun 2001 16:29:16 +1000 + --- gmfsk-0.6+0.7pre1.orig/debian/gmfsk.man +++ gmfsk-0.6+0.7pre1/debian/gmfsk.man @@ -0,0 +1,34 @@ +.TH gmfsk 1 "15 October 2002" "" "" +.SH NAME +gmfsk \- MFSK terminal for GNOME +.SH SYNOPSIS +\fBgmfsk\fR +.SH DESCRIPTION +.B gmfsk +is a terminal for MFSK16, RTTY and Throb, three digital modulation +formats used on HF radio particularly by radio amateurs. MFSK +is an acronym for multi-tone frequency shift keying. +.PP +gmfsk demodulates signals received through the sound card and +displays the resulting text on the screen. In transmit mode, +typed text is modulated and transmitted through the sound card. +.PP +Circuits for connecting the sound card to a receiver or transceiver +are readily available on the web. +.SH OPTIONS +Standard GNOME options may be used. +.PP +GMFSK must be configured through the "Settings" menu when first used. +.SH NOTES +MFSK activity is commonly found around 14.080 MHz on the amateur 20m band. +.PP +Although GMFSK is free software, transmission of any signal and of +MFSK, RTTY and/or Throb signals in particular is subject to the laws +of the government of your country. Receiving on non-amateur frequencies +may also be prohibited. +.SH "SEE ALSO" +More information on MFSK16 can be found at http://www.qsl.net/zl1bpu/MFSK/INDEX.html +.SH AUTHOR +gmfsk was written by Tomi Manninen, OH2BNS . +This manual page was written by Hamish Moffatt VK3SB for +Debian (but may be used by others). --- gmfsk-0.6+0.7pre1.orig/debian/gmfsk.desktop +++ gmfsk-0.6+0.7pre1/debian/gmfsk.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=gMFSK +Comment=HF digital mode terminal +Exec=gmfsk +Terminal=false +Type=Application +Categories=Application;HamRadio; --- gmfsk-0.6+0.7pre1.orig/debian/gmfsk.dirs +++ gmfsk-0.6+0.7pre1/debian/gmfsk.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/doc/gmfsk +usr/share/applications --- gmfsk-0.6+0.7pre1.orig/debian/patches/10_hkj_acknowledge.dpatch +++ gmfsk-0.6+0.7pre1/debian/patches/10_hkj_acknowledge.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_hkj_acknowledge.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Acknowledge W1HKJ in about box + +@DPATCH@ +diff -urNad gmfsk-0.7pre1~/src/interface.c gmfsk-0.7pre1/src/interface.c +--- gmfsk-0.7pre1~/src/interface.c 2005-02-21 08:12:22.000000000 +1100 ++++ gmfsk-0.7pre1/src/interface.c 2006-04-02 01:17:07.000000000 +1100 +@@ -1256,6 +1256,8 @@ + const gchar *authors[] = { + "Author:", + "Tomi Manninen, OH2BNS .", ++ "Modified by:", ++ "Dave Freese, W1HKJ, w1hkj@w1hkj.com", + "MFSK modem:", + "Help for pictures support from Denis, UU9JDR.", + "RTTY modem:", --- gmfsk-0.6+0.7pre1.orig/debian/patches/11_hkj_waterfall.dpatch +++ gmfsk-0.6+0.7pre1/debian/patches/11_hkj_waterfall.dpatch @@ -0,0 +1,420 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_hkj_waterfall.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gmfsk-0.7pre1~/src/callbacks.c gmfsk-0.7pre1/src/callbacks.c +--- gmfsk-0.7pre1~/src/callbacks.c 2005-01-24 07:50:48.000000000 +1100 ++++ gmfsk-0.7pre1/src/callbacks.c 2006-04-02 01:16:39.000000000 +1100 +@@ -1210,7 +1210,8 @@ + GdkEventButton *event, + gpointer user_data) + { +- GtkWidget *w = WFPopupMenu; ++ GtkWidget *wm = WFPopupMenu; ++ GtkWidget *w; + gint i; + + /* we are interested in button three */ +@@ -1219,7 +1220,12 @@ + + /* activate the correct mode radiobutton */ + i = conf_get_int("wf/mode") + 2; +- w = GTK_WIDGET(g_list_nth_data(GTK_MENU_SHELL(w)->children, i)); ++ w = GTK_WIDGET(g_list_nth_data(GTK_MENU_SHELL(wm)->children, i)); ++ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), TRUE); ++ ++ /* activate the correct width radiobutton */ ++ i = conf_get_int("wf/zoom") + 9; ++ w = GTK_WIDGET(g_list_nth_data(GTK_MENU_SHELL(wm)->children, i)); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), TRUE); + + gtk_menu_popup(GTK_MENU(WFPopupMenu), NULL, NULL, NULL, NULL, +@@ -1282,7 +1288,6 @@ + waterfall_set_frequency(waterfall, freq); + } + +- + void + on_afcbutton_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +@@ -1633,3 +1638,44 @@ + g_warning("on_qsybutton_clicked: Hamlib support not compiled in"); + #endif + } ++ ++/* ---------------------------------------------------------------------- */ ++ ++void ++on_waterfall2_color_activate (GtkMenuItem *menuitem, ++ gpointer user_data) ++{ ++ waterfall_set_colormode(waterfall, TRUE); ++} ++ ++void ++on_waterfall2_grayscale_activate (GtkMenuItem *menuitem, ++ gpointer user_data) ++{ ++ waterfall_set_colormode(waterfall, FALSE); ++} ++ ++void setmag(gint val) ++{ ++ waterfall_set_magnification(waterfall, val); ++ conf_set_int("wf/zoom", val); ++} ++ ++void ++on_waterfall3x1_activate (GtkMenuItem *menuitem, gpointer user_data) ++{ ++ setmag (WATERFALL_MAG_1); ++} ++ ++void ++on_waterfall3x2_activate (GtkMenuItem *menuitem, gpointer user_data) ++{ ++ setmag (WATERFALL_MAG_2); ++} ++ ++void ++on_waterfall3x4_activate (GtkMenuItem *menuitem, gpointer user_data) ++{ ++ setmag (WATERFALL_MAG_4); ++} ++ +diff -urNad gmfsk-0.7pre1~/src/callbacks.h gmfsk-0.7pre1/src/callbacks.h +--- gmfsk-0.7pre1~/src/callbacks.h 2005-01-23 09:17:58.000000000 +1100 ++++ gmfsk-0.7pre1/src/callbacks.h 2006-04-02 01:16:32.000000000 +1100 +@@ -197,6 +197,15 @@ + gpointer user_data); + + void ++on_refspinbutton_changed (GtkEditable *editable, ++ gpointer user_data); ++ ++void ++on_ampspinbutton_changed (GtkEditable *editable, ++ gpointer user_data); ++ ++ ++void + on_afcbutton_toggled (GtkToggleButton *togglebutton, + gpointer user_data); + +@@ -416,3 +425,19 @@ + void + on_qsybutton_clicked (GtkButton *button, + gpointer user_data); ++ ++void ++on_waterfall2_color_activate (GtkMenuItem *menuitem, gpointer user_data); ++ ++void ++on_waterfall2_grayscale_activate (GtkMenuItem *menuitem, gpointer user_data); ++ ++void ++on_waterfall3x1_activate (GtkMenuItem *menuitem, gpointer user_data); ++ ++void ++on_waterfall3x2_activate (GtkMenuItem *menuitem, gpointer user_data); ++ ++void ++on_waterfall3x4_activate (GtkMenuItem *menuitem, gpointer user_data); ++ +diff -urNad gmfsk-0.7pre1~/src/interface.c gmfsk-0.7pre1/src/interface.c +--- gmfsk-0.7pre1~/src/interface.c 2005-02-21 08:12:22.000000000 +1100 ++++ gmfsk-0.7pre1/src/interface.c 2006-04-02 01:16:32.000000000 +1100 +@@ -1,5 +1,8 @@ + /* +- * DO NOT EDIT THIS FILE - it is generated by Glade. ++ * This file was originally generated by Glade. ++ * It has been extensively modified by W1HKJ for tuning the user interface ++ * If you modify the user interface using glade2 and overwrite this file ++ * you will loose all the entries that have been modified in place. + */ + + #ifdef HAVE_CONFIG_H +@@ -898,8 +901,10 @@ + gtk_box_pack_start (GTK_BOX (hbox16), freqlabel, FALSE, FALSE, 4); + gtk_label_set_justify (GTK_LABEL (freqlabel), GTK_JUSTIFY_CENTER); + +- freqspinbutton_adj = gtk_adjustment_new (1001, 0, 4000, 1, 10, 10); ++ freqspinbutton_adj = gtk_adjustment_new (1000, 0, 4000, 1, 10, 10); ++ + freqspinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (freqspinbutton_adj), 1, 1); ++ + gtk_widget_show (freqspinbutton); + gtk_box_pack_start (GTK_BOX (hbox16), freqspinbutton, TRUE, TRUE, 2); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (freqspinbutton), TRUE); +@@ -982,7 +987,7 @@ + gtk_container_set_border_width (GTK_CONTAINER (modestatusbar), 2); + gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (modestatusbar), FALSE); + +- clocklabel = gtk_label_new (_("clock")); ++ clocklabel = gtk_label_new (_("00:00:00Z")); + gtk_widget_show (clocklabel); + gtk_box_pack_start (GTK_BOX (hbox20), clocklabel, FALSE, FALSE, 4); + gtk_label_set_justify (GTK_LABEL (clocklabel), GTK_JUSTIFY_CENTER); +@@ -1113,9 +1118,6 @@ + g_signal_connect ((gpointer) reversebutton, "toggled", + G_CALLBACK (on_reversebutton_toggled), + NULL); +- g_signal_connect ((gpointer) modeeventbox, "button_press_event", +- G_CALLBACK (on_modeeventbox_button_press_event), +- NULL); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (appwindow, appwindow, "appwindow"); +@@ -1203,19 +1205,19 @@ + GLADE_HOOKUP_OBJECT (appwindow, label180, "label180"); + GLADE_HOOKUP_OBJECT (appwindow, hbox2, "hbox2"); + GLADE_HOOKUP_OBJECT (appwindow, hbox3, "hbox3"); ++ GLADE_HOOKUP_OBJECT (appwindow, hbox4, "hbox4"); ++ GLADE_HOOKUP_OBJECT (appwindow, hbox11, "hbox11"); ++ GLADE_HOOKUP_OBJECT (appwindow, hbox12, "hbox12"); ++ GLADE_HOOKUP_OBJECT (appwindow, hbox13, "hbox13"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton1, "macrobutton1"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton2, "macrobutton2"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton3, "macrobutton3"); +- GLADE_HOOKUP_OBJECT (appwindow, hbox4, "hbox4"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton4, "macrobutton4"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton5, "macrobutton5"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton6, "macrobutton6"); +- GLADE_HOOKUP_OBJECT (appwindow, hbox11, "hbox11"); +- GLADE_HOOKUP_OBJECT (appwindow, hbox12, "hbox12"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton7, "macrobutton7"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton8, "macrobutton8"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton9, "macrobutton9"); +- GLADE_HOOKUP_OBJECT (appwindow, hbox13, "hbox13"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton10, "macrobutton10"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton11, "macrobutton11"); + GLADE_HOOKUP_OBJECT (appwindow, macrobutton12, "macrobutton12"); +@@ -1361,6 +1363,51 @@ + GNOMEUIINFO_END + }; + ++static GnomeUIInfo waterfall2_uiinfo[] = ++{ ++ { ++ GNOME_APP_UI_ITEM, N_("Color"), ++ NULL, ++ (gpointer) on_waterfall2_color_activate, NULL, NULL, ++ GNOME_APP_PIXMAP_NONE, NULL, ++ 0, (GdkModifierType) 0, NULL ++ }, ++ { ++ GNOME_APP_UI_ITEM, N_("Grayscale"), ++ NULL, ++ (gpointer) on_waterfall2_grayscale_activate, NULL, NULL, ++ GNOME_APP_PIXMAP_NONE, NULL, ++ 0, (GdkModifierType) 0, NULL ++ }, ++ GNOMEUIINFO_END ++}; ++ ++static GnomeUIInfo waterfall3_uiinfo[] = ++{ ++ { ++ GNOME_APP_UI_ITEM, N_("w3x1"), ++ NULL, ++ (gpointer) on_waterfall3x1_activate, NULL, NULL, ++ GNOME_APP_PIXMAP_NONE, NULL, ++ 0, (GdkModifierType) 0, NULL ++ }, ++ { ++ GNOME_APP_UI_ITEM, N_("w3x2"), ++ NULL, ++ (gpointer) on_waterfall3x2_activate, NULL, NULL, ++ GNOME_APP_PIXMAP_NONE, NULL, ++ 0, (GdkModifierType) 0, NULL ++ }, ++ { ++ GNOME_APP_UI_ITEM, N_("w3x4"), ++ NULL, ++ (gpointer) on_waterfall3x4_activate, NULL, NULL, ++ GNOME_APP_PIXMAP_NONE, NULL, ++ 0, (GdkModifierType) 0, NULL ++ }, ++ GNOMEUIINFO_END ++}; ++ + static GnomeUIInfo wfpopupmenu_uiinfo[] = + { + { +@@ -1377,7 +1424,19 @@ + (GdkModifierType) 0, NULL + }, + GNOMEUIINFO_SEPARATOR, +- { ++ { // 4 ++ GNOME_APP_UI_RADIOITEMS, NULL, NULL, waterfall2_uiinfo, ++ NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, 0, ++ (GdkModifierType) 0, NULL ++ }, ++ GNOMEUIINFO_SEPARATOR, // 5 ++ { // 6 ++ GNOME_APP_UI_RADIOITEMS, NULL, NULL, waterfall3_uiinfo, ++ NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, 0, ++ (GdkModifierType) 0, NULL ++ }, ++ GNOMEUIINFO_SEPARATOR, // 7 ++ { // 8 + GNOME_APP_UI_ITEM, N_("Waterfall properties..."), + NULL, + (gpointer) on_wfproperties_activate, NULL, NULL, +@@ -1399,15 +1458,26 @@ + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (waterfall1_uiinfo[0].widget), TRUE); + + /* Store pointers to all widgets, for use by lookup_widget(). */ ++ + GLADE_HOOKUP_OBJECT_NO_REF (wfpopupmenu, wfpopupmenu, "wfpopupmenu"); + GLADE_HOOKUP_OBJECT (wfpopupmenu, wfpopupmenu_uiinfo[0].widget, "wfpause"); + GLADE_HOOKUP_OBJECT (wfpopupmenu, wfpopupmenu_uiinfo[1].widget, "separator7"); ++ + GLADE_HOOKUP_OBJECT (wfpopupmenu, waterfall1_uiinfo[0].widget, "waterfall1"); + GLADE_HOOKUP_OBJECT (wfpopupmenu, waterfall1_uiinfo[1].widget, "spectrum1"); + GLADE_HOOKUP_OBJECT (wfpopupmenu, waterfall1_uiinfo[2].widget, "scope1"); +- GLADE_HOOKUP_OBJECT (wfpopupmenu, wfpopupmenu_uiinfo[3].widget, "separator9"); +- GLADE_HOOKUP_OBJECT (wfpopupmenu, wfpopupmenu_uiinfo[4].widget, "wfproperties"); ++ GLADE_HOOKUP_OBJECT (wfpopupmenu, wfpopupmenu_uiinfo[3].widget, "separator7a"); ++ ++ GLADE_HOOKUP_OBJECT (wfpopupmenu, waterfall2_uiinfo[0].widget, "color"); ++ GLADE_HOOKUP_OBJECT (wfpopupmenu, waterfall2_uiinfo[1].widget, "grayscale"); ++ GLADE_HOOKUP_OBJECT (wfpopupmenu, wfpopupmenu_uiinfo[5].widget, "separator7b"); + ++ GLADE_HOOKUP_OBJECT (wfpopupmenu, waterfall3_uiinfo[0].widget, "w3x1"); ++ GLADE_HOOKUP_OBJECT (wfpopupmenu, waterfall3_uiinfo[1].widget, "w3x2"); ++ GLADE_HOOKUP_OBJECT (wfpopupmenu, waterfall3_uiinfo[2].widget, "w3x4"); ++ ++ GLADE_HOOKUP_OBJECT (wfpopupmenu, wfpopupmenu_uiinfo[7].widget, "separator9"); ++ GLADE_HOOKUP_OBJECT (wfpopupmenu, wfpopupmenu_uiinfo[8].widget, "wfproperties"); + return wfpopupmenu; + } + +diff -urNad gmfsk-0.7pre1~/src/waterfall.c gmfsk-0.7pre1/src/waterfall.c +--- gmfsk-0.7pre1~/src/waterfall.c 2005-01-02 06:57:03.000000000 +1100 ++++ gmfsk-0.7pre1/src/waterfall.c 2006-04-02 01:16:32.000000000 +1100 +@@ -161,7 +161,8 @@ + gdk_color_parse("magenta", &wf->pointer1col); + wf->pointer1_gc = NULL; + +- gdk_color_parse("blue", &wf->pointer2col); ++ gdk_color_parse("yellow", &wf->pointer2col); ++ + wf->pointer2_gc = NULL; + + gdk_color_parse("red", &wf->pointer3col); +@@ -174,7 +175,7 @@ + wf->trace_gc = NULL; + + /* compute cmap */ +-#if 0 ++// create color map for waterfall + for (i = 0; i < 256; i++) { + guchar r, g, b; + +@@ -189,11 +190,13 @@ + } + colormap[i] = (r << 16) + (g << 8) + b; + } +-#else ++ wf->cmap = gdk_rgb_cmap_new(colormap, 256); // color map ++// create grayscale map for waterfall + for (i = 0; i < 256; i++) + colormap[i] = 65793 * i; +-#endif +- wf->cmap = gdk_rgb_cmap_new(colormap, 256); ++ ++ wf->gmap = gdk_rgb_cmap_new(colormap, 256); // gray scale map ++ wf->dispclr = TRUE; + + wf->pixmap = NULL; + wf->pixbufsize = 0; +@@ -439,6 +442,10 @@ + if (wf->cmap) + gdk_rgb_cmap_free(wf->cmap); + wf->cmap = NULL; ++ ++ if (wf->gmap) ++ gdk_rgb_cmap_free(wf->gmap); ++ wf->gmap = NULL; + + g_free(wf->pixbuf); + wf->pixbuf = NULL; +@@ -840,7 +847,7 @@ + GDK_RGB_DITHER_NORMAL, + ptr, + wf->fftlen / 2, +- wf->cmap); ++ (wf->dispclr == TRUE ? wf->cmap : wf->gmap)); + + /* draw ruler */ + gdk_draw_rectangle(wf->pixmap, widget->style->black_gc, TRUE, +@@ -1100,11 +1107,14 @@ + + /* ---------------------------------------------------------------------- */ + ++ + #define cabs(z) (sqrt(c_re(z) * c_re(z) + c_im(z) * c_im(z))) + + static void setdata(Waterfall *wf) + { + gint i, width, size; ++ gint i4m, i4p, i3m, i3p, i1m, i1p, ictr, ioff; ++ gfloat avgsig, avgsig0, avgsig1, avgsig3, avgsig4; + guchar *ptr; + + for (i = 0; i < wf->fftlen; i++) { +@@ -1151,6 +1161,7 @@ + /* spectrum data */ + wf->specbuf[i] = x; + } ++ + } + + void waterfall_set_data(Waterfall *wf, gfloat *data, int len) +@@ -1503,6 +1514,11 @@ + wf->fixed = flag; + } + ++void waterfall_set_colormode(Waterfall *wf, gboolean flag) ++{ ++ wf->dispclr = flag; ++} ++ + void waterfall_set_lsb(Waterfall *wf, gboolean flag) + { + g_return_if_fail(wf != NULL); +diff -urNad gmfsk-0.7pre1~/src/waterfall.h gmfsk-0.7pre1/src/waterfall.h +--- gmfsk-0.7pre1~/src/waterfall.h 2004-04-17 01:04:19.000000000 +1000 ++++ gmfsk-0.7pre1/src/waterfall.h 2006-04-02 01:16:32.000000000 +1100 +@@ -117,6 +117,8 @@ + GdkColor tracecol; + + GdkRgbCmap *cmap; ++ GdkRgbCmap *gmap; ++ gboolean dispclr; + + GdkPixmap *pixmap; + +@@ -156,6 +158,8 @@ + + gdouble *specbuf; + gdouble *peakbuf; ++ gdouble ratio; ++ gdouble imd; + + GdkCursor *ruler_cursor; + gboolean ruler_cursor_set; +@@ -197,7 +201,7 @@ + void waterfall_set_dir(Waterfall *wf, gboolean dir); + void waterfall_set_fixed(Waterfall *wf, gboolean fixed); + void waterfall_set_lsb(Waterfall *wf, gboolean lsb); +- ++void waterfall_set_colormode(Waterfall *wf, gboolean flag); + void waterfall_get_config(Waterfall *wf, wf_config_t *config); + + #ifdef __cplusplus --- gmfsk-0.6+0.7pre1.orig/debian/patches/00list +++ gmfsk-0.6+0.7pre1/debian/patches/00list @@ -0,0 +1,5 @@ +# List of patches to apply +10_hkj_acknowledge.dpatch +11_hkj_waterfall.dpatch +12_gcc43_fixes.dpatch +13_log2_fix.dpatch --- gmfsk-0.6+0.7pre1.orig/debian/patches/12_gcc43_fixes.dpatch +++ gmfsk-0.6+0.7pre1/debian/patches/12_gcc43_fixes.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_gcc43_fixes.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: gcc-4.3 fixes + +@DPATCH@ +diff -Nru --exclude changelog /tmp/YMsfJ7kTPO/gmfsk-0.6+0.7pre1/src/olivia/mfsk.h /tmp/J6003wm8NM/gmfsk-0.6+0.7pre1/src/olivia/mfsk.h +--- gmfsk-0.6+0.7pre1/src/olivia/mfsk.h 2005-01-21 02:08:06.000000000 +0530 ++++ gmfsk-0.6+0.7pre1/src/olivia/mfsk.h 2008-03-23 14:22:44.000000000 +0530 +@@ -1960,7 +1960,7 @@ + + Type *ModulatorOutput; + +- RateConverter RateConverter; // output rate converter ++ ::RateConverter RateConverter; // output rate converter + + Type *ConverterOutput; + +@@ -2209,7 +2209,7 @@ + + private: + +- RateConverter RateConverter; ++ ::RateConverter RateConverter; + + Seq InputBuffer; + --- gmfsk-0.6+0.7pre1.orig/debian/patches/13_log2_fix.dpatch +++ gmfsk-0.6+0.7pre1/debian/patches/13_log2_fix.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 13_log2_fix.dpatch by Kęstutis Biliūnas +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch for fix FTBFS bug #552851. +## DP: +## DP: This problem occurs because the function (log2) declared with the +## DP: same name twice: in the file mfsk.h and in the file misk.h. +## DP: But since the function log2 declared in header file misk.h is not +## DP: used at all in this source, here this function is simply commented +## DP: out. + +@DPATCH@ +diff -urNad gmfsk-0.6+0.7pre1~/src/misc/misc.c gmfsk-0.6+0.7pre1/src/misc/misc.c +--- gmfsk-0.6+0.7pre1~/src/misc/misc.c 2005-01-04 23:07:42.000000000 +0200 ++++ gmfsk-0.6+0.7pre1/src/misc/misc.c 2009-11-29 01:16:37.000000000 +0200 +@@ -105,6 +105,7 @@ + /* + * Integer base-2 logarithm + */ ++/* + guint log2(guint x) + { + int y = 0; +@@ -118,6 +119,7 @@ + + return y; + } ++*/ + + /* ---------------------------------------------------------------------- */ + +diff -urNad gmfsk-0.6+0.7pre1~/src/misc/misc.h gmfsk-0.6+0.7pre1/src/misc/misc.h +--- gmfsk-0.6+0.7pre1~/src/misc/misc.h 2009-11-29 01:11:49.000000000 +0200 ++++ gmfsk-0.6+0.7pre1/src/misc/misc.h 2009-11-29 01:17:12.000000000 +0200 +@@ -107,6 +107,7 @@ + /* + * Integer base-2 logarithm + */ ++/* + extern inline guint log2(guint x) + { + int y = 0; +@@ -121,6 +121,7 @@ + + return y; + } ++*/ + + /* ---------------------------------------------------------------------- */ + --- gmfsk-0.6+0.7pre1.orig/help/gmfsk/C/gmfsk-C.omf.out +++ gmfsk-0.6+0.7pre1/help/gmfsk/C/gmfsk-C.omf.out @@ -0,0 +1,32 @@ + + + + + + oh2bns@sral.fi (Tomi Manninen) + + + oh2bns@sral.fi (Tomi Manninen) + + + gMFSK Manual V0.2 + + + 2003-05-05 + + + + + + User manual for the gMFSK HF terminal program. + + + User's guide + + + + + + + +