--- acfax-981011.orig/Imakefile +++ acfax-981011/Imakefile @@ -32,7 +32,7 @@ # (kernels 2.0+ and even 1.3.82 do this !) # - DEFINES = -DUSE_XAW3D -DSBL_16 -DDSP_SELECT -O2 -Wall + DEFINES = -DSBL_16 -DDSP_SELECT -O2 -Wall SRCS = acfax.c Canvas.c mod_demod.c sblaster.c fax_funcs.c \ x_image.c widgets.c \ @@ -42,12 +42,12 @@ FChooser.o Directory.o DirMgr.o RegExp.o INCLUDES = -I. -LOCAL_LIBRARIES = -lXaw3d $(XMULIB) $(XTOOLLIB) $(XLIB) -lm +LOCAL_LIBRARIES = -lXaw $(XTOOLONLYLIB) $(XONLYLIB) -lm SYS_LIBRARIES = all:: acfax -ComplexProgramTarget(acfax) +ComplexProgramTargetNoMan(acfax) acfax.o: global.h mod_demod.h sblaster.h widgets.h widgets.o: widgets.h --- acfax-981011.orig/FChooser.c +++ acfax-981011/FChooser.c @@ -247,7 +247,7 @@ if (FCCurrentDirectory(fcw) != NULL) { /* User Specified Path */ strcpy(str,FCCurrentDirectory(fcw)); } else { - getwd(path); + getcwd(path,MAXPATHLEN); strcpy(str,path); } FCCurrentDirectory(fcw) = str; --- acfax-981011.orig/mod_demod.c +++ acfax-981011/mod_demod.c @@ -99,7 +99,7 @@ } fmphsinc = (int *)malloc(258*sizeof(int)); for (i=0; i<1024; i++) - sintab[i] = 127.5 + 127*sin(i*PI/512.0); + sintab[i] = 127.5 + 127*sin(i*M_PI/512.0); inited = -1; } @@ -120,14 +120,14 @@ if (devi > 1200) devi = 1200; if (maxval < 1) maxval = 1; if (maxval > 255) maxval = 255; - phmax = 255.9 * sin(devi * PI / 4000.0) + 0.5; + phmax = 255.9 * sin(devi * M_PI / 4000.0) + 0.5; for (i=0; i<512; i++) { if (i <= 256-phmax) asntab[i] = 0; else if (i >= 256+phmax) asntab[i] = maxval; else - asntab[i] = maxval * 2000 / devi * asin((i-256.0)/256.5) / PI + asntab[i] = maxval * 2000 / devi * asin((i-256.0)/256.5) / M_PI + maxval/ 2; } for (i=0; i<2048; i++) { --- acfax-981011.orig/Directory.c +++ acfax-981011/Directory.c @@ -181,9 +181,9 @@ register char *p; char path[MAXPATHLEN + 2]; - if (getwd(path) == NULL) return(NULL); + if (getcwd(path, MAXPATHLEN) == NULL) return(NULL); if (chdir(old_path) != 0) return(NULL); - if (getwd(new_path) == NULL) strcpy(new_path,old_path); + if (getcwd(new_path, MAXPATHLEN) == NULL) strcpy(new_path,old_path); if (chdir(path) != 0) return(NULL); for (p = new_path; *p != '\0'; p++); /* append trailing slash if not already in place... */ --- acfax-981011.orig/fax_funcs.c +++ acfax-981011/fax_funcs.c @@ -475,12 +475,12 @@ smpl_line = 60.0 / lpm * smplf; if (vertical) { inc_pix = smpl_line / canhei; - inc_line = (int)(ixoc * PI * 65536.0 / canhei); + inc_line = (int)(ixoc * M_PI * 65536.0 / canhei); imgmax = DEFWIDTH; put_pix = verimag->f.put_pixel; } else { inc_pix = smpl_line / canwid; - inc_line = (int)(ixoc * PI * 65536.0 / canwid); + inc_line = (int)(ixoc * M_PI * 65536.0 / canwid); imgmax = DEFHEIGHT; put_pix = horimag->f.put_pixel; } @@ -753,7 +753,7 @@ if (width > 0) swidth = width; else - swidth = (ixoc * PI) + 0.5; + swidth = (ixoc * M_PI) + 0.5; fsfile = fopen(faxsavename, "wb"); if (!(fsfile)) { return SAVE_NPERM; @@ -787,7 +787,7 @@ /* now initialize all the variables... */ fprintf(stderr, "getting image settings..."); inc_pix = smpl_line / swidth; - inc_line = (int)(ixoc * PI * 65536.0 / swidth); + inc_line = (int)(ixoc * M_PI * 65536.0 / swidth); idx_pix = idx_line = idx_p0 = 0; core_pix = core_line = core_start; save_wptr = core_wptr; @@ -1235,9 +1235,9 @@ if (right2left) flip ^= 1; if (bot2top) flip ^= 1; if (vertical) { - df = (smplf * (double)dy) / (dx * PI * ixoc); + df = (smplf * (double)dy) / (dx * M_PI * ixoc); } else { - df = (smplf * (double)dx) / (dy * PI * ixoc); + df = (smplf * (double)dx) / (dy * M_PI * ixoc); } if (flip) df = -df; smplf += df; @@ -1446,14 +1446,14 @@ smpl_line = 60.0 / lpm * smplf; if (vertical) { inc_pix = smpl_line / theight; - inc_line = (int)(ixoc * PI * 65536.0 / theight); + inc_line = (int)(ixoc * M_PI * 65536.0 / theight); imgmax = DEFWIDTH; put_pix = verimag->f.put_pixel; bytes_per_pixel = twidth; bytes_per_line = 1; } else { inc_pix = smpl_line / twidth; - inc_line = (int)(ixoc * PI * 65536.0 / twidth); + inc_line = (int)(ixoc * M_PI * 65536.0 / twidth); imgmax = DEFHEIGHT; put_pix = horimag->f.put_pixel; bytes_per_pixel = 1; @@ -1500,10 +1500,10 @@ /* twidth, theight, timg_ptr */ if (vertical) { inc_pix = 65536.0 * theight * lpm / ((60.0/65536.0) * smplf); - inc_line = 65536.0 * theight / (PI * ixoc); + inc_line = 65536.0 * theight / (M_PI * ixoc); } else { inc_pix = 65536.0 * twidth * lpm / ((60.0/65536.0) * smplf); - inc_line = 65536.0 * twidth / (PI * ixoc); + inc_line = 65536.0 * twidth / (M_PI * ixoc); } if (right2left) { pixinc = -1; --- acfax-981011.orig/DirMgr.c +++ acfax-981011/DirMgr.c @@ -21,6 +21,10 @@ * */ +#define _GNU_SOURCE +#include +#include + #include "DirMgr.h" #ifndef NO_REGEXP --- acfax-981011.orig/debian/rules +++ acfax-981011/debian/rules @@ -0,0 +1,45 @@ +#!/usr/bin/make -f + +package = acfax + +build: + dh_testdir + xmkmf + $(MAKE) + touch build + +clean: + dh_testdir + [ ! -f Makefile ] || $(MAKE) clean + -rm -f build Makefile + -rm -f `find . -name "*~"` + dh_clean + +binary-indep: build +# nothing else to do + +binary-arch: build + dh_clean + dh_installdirs + $(MAKE) install DESTDIR=`pwd`/debian/acfax BINDIR=/usr/bin + + dh_installdocs 0README 0FEATURES 0TODO + dh_installmenu + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_makeshlibs + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +checkroot: + dh_testdir + dh_testroot + +.PHONY: binary binary-arch binary-indep clean checkroot --- acfax-981011.orig/debian/control +++ acfax-981011/debian/control @@ -0,0 +1,15 @@ +Source: acfax +Section: hamradio +Priority: extra +Standards-Version: 3.8.0 +Maintainer: Debian Hamradio Maintainers +Uploaders: Jaime Robles , Patrick Ouellette , Hamish Moffatt +Build-Depends: debhelper (>= 4), libxt-dev, libx11-dev, libxaw7-dev, xutils-dev + +Package: acfax +Architecture: any +Depends: ${shlibs:Depends} +Description: Receive faxes using your radio and sound card + acfax allows you to receive faxes using your sound card. + Typically you might use it to decode faxes sent over HF radio or + from satellites. --- acfax-981011.orig/debian/copyright +++ acfax-981011/debian/copyright @@ -0,0 +1,21 @@ +This is the Debian GNU/Linux package of acfax. +This package was put together from sources obtained at: + ftp://ftp.funet.fi/pub/ham/unix/Linux/misc/ +by Hamish Moffatt + +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 or +on the World Wide Web at http://www.gnu.org/copyleft/gpl.html. You can +also obtain it by writing to the Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + --- acfax-981011.orig/debian/compat +++ acfax-981011/debian/compat @@ -0,0 +1 @@ +4 --- acfax-981011.orig/debian/acfax.dirs +++ acfax-981011/debian/acfax.dirs @@ -0,0 +1 @@ +usr/bin --- acfax-981011.orig/debian/changelog +++ acfax-981011/debian/changelog @@ -0,0 +1,106 @@ +acfax (981011-14.1) unstable; urgency=low + + * Retiring - remove myself from the uploaders list. + + -- Joop Stakenborg Sun, 08 Nov 2009 18:38:42 +0000 + +acfax (981011-14) unstable; urgency=low + + * Fixes FTBFS, patch by peter green, thanks! Closes: #518733. + + -- Joop Stakenborg Sun, 08 Mar 2009 19:48:48 +0100 + +acfax (981011-13) unstable; urgency=low + + * Build-depends on xutils-dev because we need xmkmf. Closes: #485191. + + -- Joop Stakenborg Fri, 13 Jun 2008 20:21:44 +0200 + +acfax (981011-12) unstable; urgency=low + + * Donate to debian-hams team. + * General cleanup. + * Tighten X build-dependencies. + * Update menu file for new sections. + + -- Hamish Moffatt Fri, 19 Oct 2007 00:00:25 +1000 + +acfax (981011-11) unstable; urgency=low + + * Strip unneeded X libraries linked in (by modifying Imakefile) + * Updated standards-revision to 3.7.2 + + -- Hamish Moffatt Wed, 27 Sep 2006 08:39:50 +1000 + +acfax (981011-10) unstable; urgency=low + + * Changed build-dep on xlibs-dev to individual X libraries + + -- Hamish Moffatt Sun, 8 Jan 2006 13:57:03 +1100 + +acfax (981011-9) unstable; urgency=low + + * Clean-up upload for sarge + * Omit empty man directories from the binary package (closes: #260693) + * Clean up lintian warnings in menu file, update to standards version + 3.6.1 + + -- Hamish Moffatt Sun, 15 Aug 2004 15:14:30 +1000 + +acfax (981011-8) unstable; urgency=low + + * Change build-dep to libxaw7-dev as libxaw-dev no longer exists + (closes: #169969) + * Upgrade to debhelper 4 + + -- Hamish Moffatt Wed, 7 Jan 2004 23:41:36 +1100 + +acfax (981011-7) unstable; urgency=low + + * Changed Imakefile to use ComplexProgramTargetNoMan rather + than ComplexProgramTarget (closes: #123696) + + -- Hamish Moffatt Thu, 27 Dec 2001 12:07:46 +1100 + +acfax (981011-6) unstable; urgency=low + + * Added build-dep for xutils (closes: #86793) + + -- Hamish Moffatt Fri, 23 Feb 2001 23:34:13 +1100 + +acfax (981011-5) unstable; urgency=low + + * Updated Standards-Version + * Fixed old reference to the GPL location + * Closing old bugs (closes: #70062, #70120) + + -- Hamish Moffatt Wed, 6 Dec 2000 19:03:10 +1100 + +acfax (981011-4) unstable; urgency=low + + * Added build-deps for xlib6g-dev and debhelper + * Fixed Imakefile which was not explicitly linking in Xpm + + -- Hamish Moffatt Tue, 7 Nov 2000 16:27:00 +1100 + +acfax (981011-3) unstable; urgency=low + + * Changed section to Apps/Hamradio in the menu system + * Moved binary to /usr/bin from /usr/X11R6/bin + + -- Hamish Moffatt Tue, 5 Oct 1999 18:12:33 +1000 + +acfax (981011-2) unstable; urgency=low + + * Now FHS compliant + + -- Hamish Moffatt Fri, 1 Oct 1999 18:03:15 +1000 + +acfax (981011-1) unstable; urgency=low + + * Initial upload + * The upstream resources file is NOT installed, because the program + does not start up at all with it present! + + -- Hamish Moffatt Fri, 1 Oct 1999 18:03:08 +1000 + --- acfax-981011.orig/debian/acfax.menu +++ acfax-981011/debian/acfax.menu @@ -0,0 +1,4 @@ +?package(acfax):needs="x11" section="Applications/Amateur Radio" \ + title="acfax" longtitle="acfax fax receiver" \ + description="Fax receiver for sound cards" \ + command="/usr/bin/acfax"