--- xmailbox-2.5.orig/Imakefile +++ xmailbox-2.5/Imakefile @@ -12,15 +12,12 @@ #------------------------------- # Architecture specific defines #------------------------------- -#ifdef HPArchitecture -CCOPTIONS = -Aa -D_HPUX_SOURCE -#endif #------------------------------------------ # Comment the following define if you # want audio support #------------------------------------------ -#define NO_AUDIO /* */ +/* #define NO_AUDIO /* */ #------------------------------------------ # Uncomment the following define if your @@ -61,15 +58,15 @@ # are playing a sound via an external # sound player. #------------------------------------------ -/* #define COM_AUDIO /* */ +#define COM_AUDIO /* */ #ifndef NO_AUDIO #ifdef NCD_AUDIO - NCDINCDIR = /usr/local/include/ncd - NCDLIBDIR = /usr/local/lib + NCDINCDIR = /usr/X11R6/include/audio + NCDLIBDIR = /usr/X11R6/lib SNDLIB = -L$(NCDLIBDIR) -laudio -lm - INCLUDES = -I$(XPMINCDIR) -I$(NCDINCDIR) -I/usr/public/include + INCLUDES = -I$(XPMINCDIR) -I$(NCDINCDIR) EXTRA_DEFINES = -DNCD_AUDIO $(SUN_AUDIO) #else #ifdef RPLAY_AUDIO @@ -80,7 +77,7 @@ EXTRA_DEFINES = -DRPLAY_AUDIO $(SUN_AUDIO) #else #ifdef COM_AUDIO - INCLUDES = -I$(XPMINCDIR) -I/usr/public/include + INCLUDES = -I$(XPMINCDIR) EXTRA_DEFINES = -DCOM_AUDIO #else SNDLIB = --- xmailbox-2.5.orig/Mailbox.c +++ xmailbox-2.5/Mailbox.c @@ -34,11 +34,11 @@ #include <X11/cursorfont.h> /* for cursor constants */ #include <X11/Xosdefs.h> /* for X_NOT_POSIX def */ #include <sys/stat.h> /* for stat() ** needs types.h ***/ -#include <sys/signal.h> /* for signal() */ #include <stdio.h> /* for printing error messages */ #include <pwd.h> /* for getting username */ #include <stdlib.h> /* for getenv() */ #include <string.h> +#include <signal.h> #ifndef NO_AUDIO #ifdef NCD_AUDIO @@ -282,7 +282,7 @@ while (wait3(&status, WNOHANG, 0) >= 0); #ifdef linux - signal(SIGCHLD, (SignalHandler)zombiekiller); + signal(SIGCHLD, (__sighandler_t)zombiekiller); #endif } @@ -296,7 +296,7 @@ #ifdef SYSV signal(SIGCLD, zombiekiller); #elif defined(linux) - signal(SIGCHLD, (SignalHandler)zombiekiller); + signal(SIGCHLD, (__sighandler_t)zombiekiller); #else signal(SIGCHLD, zombiekiller); #endif @@ -556,7 +556,8 @@ long mailboxsize = 0; Boolean readSinceLastWrite = FALSE; int pid; - + char mailcommand[128] ; + if (w->mailbox.check_command != NULL) { waitType wait_status; int check_status; @@ -613,11 +614,8 @@ w->mailbox.flag_up = FALSE; force_redraw = TRUE; if (!ackonly && w->mailbox.mail_tool) { - pid = fork(); - if (pid == 0) { /* Child process */ - system(w->mailbox.mail_tool); - _exit(0); - } + sprintf( mailcommand, "%s &", w->mailbox.mail_tool ); + system( mailcommand ) ; } } else if (mailboxsize == 0) { /* no mailbox or empty */ w->mailbox.flag_up = FALSE; @@ -631,7 +629,7 @@ } } else if (mailboxsize != w->mailbox.last_size) { /* different size */ if (!w->mailbox.once_only || !w->mailbox.flag_up) - beep(w); + beep(w); if (!w->mailbox.flag_up) force_redraw = w->mailbox.flag_up = TRUE; } --- xmailbox-2.5.orig/MailboxP.h +++ xmailbox-2.5/MailboxP.h @@ -38,6 +38,9 @@ #include <X11/Xaw/SimpleP.h> #include <xpm.h> +#ifdef linux +#define MAILBOX_DIRECTORY "/var/spool/mail" +#else #ifdef SYSV #define MAILBOX_DIRECTORY "/usr/mail" #else @@ -47,6 +50,7 @@ #define MAILBOX_DIRECTORY "/usr/spool/mail" #endif #endif +#endif typedef struct { /* new fields for mailbox widget */ /* resources */ --- xmailbox-2.5.orig/XMailbox.ad +++ xmailbox-2.5/XMailbox.ad @@ -9,8 +9,13 @@ xmailbox*mailAnimOnce: true ! xmailbox*mailAnimUpdate: 1000 ! xmailbox*mailapp: echo 'setenv LINES 25; setenv COLUMNS 80; xterm -n Elm -e elm' | /bin/csh -f -s -! xmailbox*mailSndFile: /usr/public/lib/sounds/bong.au -! xmailbox*mailSndComm: /usr/public/bin/play %s -! xmailbox*nomailXpmFile: /usr/X11/include/X11/pixmaps/mail0.xpm -! xmailbox*mailXpmFile: /usr/X11/include/X11/pixmaps/mail1.xpm +! xmailbox*mailSndFile: /usr/lib/sounds/bong.au +! xmailbox*mailSndComm: /usr/bin/play %s +! xmailbox*nomailXpmFile: /usr/include/X11/pixmaps/mail0.xpm +! xmailbox*mailXpmFile: /usr/include/X11/pixmaps/mail1.xpm +! By default, version 2.5 will only ack the mail on a single click, and +! requires a double click to run the MUA. This translation will put back +! the 2.4 behaviour (a single click runs the MUA). +xmailbox.mailbox.translations: #override \ + <ButtonPress>: unset() --- xmailbox-2.5.orig/xmailbox.man +++ xmailbox-2.5/xmailbox.man @@ -1,4 +1,4 @@ -.TH XMAILBOX 1 "Release 6" "X Version 11" +.TH XMAILBOX 1x "Release 6" "X Version 11" .SH NAME xmailbox - mailbox checker for X using XPM icons .SH SYNOPSIS @@ -38,7 +38,7 @@ .TP 8 .B \-file \fIfilename\fP This option specifies the name of the file which should be monitored. By -default, it watches /usr/spool/mail/\fIusername\fP, where \fIusername\fP +default, it watches /var/spool/mail/\fIusername\fP, where \fIusername\fP is your login name. .TP 8 .B \-volume \fIpercentage\fP --- xmailbox-2.5.orig/debian/examples +++ xmailbox-2.5/debian/examples @@ -0,0 +1,2 @@ +icons +*.au --- xmailbox-2.5.orig/debian/compat +++ xmailbox-2.5/debian/compat @@ -0,0 +1 @@ +5 --- xmailbox-2.5.orig/debian/install +++ xmailbox-2.5/debian/install @@ -0,0 +1,2 @@ +xmailbox /usr/bin/ +XMailbox.ad /etc/X11/app-defaults/ --- xmailbox-2.5.orig/debian/menu +++ xmailbox-2.5/debian/menu @@ -0,0 +1,2 @@ +?package(xmailbox):needs="X11" section="Apps/Net"\ + title="xmailbox" command="/usr/bin/xmailbox" --- xmailbox-2.5.orig/debian/changelog +++ xmailbox-2.5/debian/changelog @@ -0,0 +1,141 @@ +xmailbox (2.5-10) unstable; urgency=low + + * QA upload for xlibs-dev transition. + * Maintainer asked to orphan this package, so set Maintainer accordingly. + * Updated Build-Depends to not depend on xlibs-dev but libx11-dev, + libxkbfile-dev, libxmu-dev, libxt-dev and x-dev. (Closes: #346822) + + * Housekeeping: + + debian/menu: Quote all strings + + debian/control: Update description a bit + + Updated debian/rules to dh compat 5 and stuff + + -- Marc 'HE' Brockschmidt <he@debian.org> Wed, 18 Jan 2006 10:09:15 +0100 + +xmailbox (2.5-9) unstable; urgency=medium + + * The previous uploads weren't NMUs! + * Build-Depends removed: xlib6g-dev, libxpm4-dev + * Build-Depends added: xlibs-dev, libxaw7-dev (closes: Bug#170191) + * Upgraded Standards-Version to 3.5.8. + * Changed Description to silent lintian. + + -- Lenart Janos <ocsi@debian.org> Tue, 4 Mar 2003 08:23:23 +0100 + +xmailbox (2.5-8.4) unstable; urgency=medium + + * Patch applied from André Dahlqvist <andre.dahlqvist@telia.com>, so + it now compiles on hppa. Thanks for him. (closes: Bug#104905) + * Merged debian/{dirs,docs} into debian/rules. + * Removed dh_{testversion,cron.info}. + * Emacs-thingy removed from this changelog. + + -- Lenart Janos <ocsi@debian.org> Sun, 11 Nov 2001 17:57:03 +0100 + +xmailbox (2.5-8.3) unstable; urgency=medium + + * Moved app-defaults directory. (closes: Bug#86315) + * The app-defaults file marked as conffile. + * Now debian/rules clean removes .o files. + + -- Lenart Janos <ocsi@debian.org> Sat, 17 Feb 2001 11:29:03 +0100 + +xmailbox (2.5-8.2) unstable; urgency=medium + + * Grr. Same problem again, sorry. (closes: Bug#85375) + + -- Lenart Janos <ocsi@debian.org> Fri, 9 Feb 2001 22:48:26 +0100 + +xmailbox (2.5-8.1) unstable; urgency=medium + + * xutils appended to Build-Depends. (closes: Bug#85375) + + -- Lenart Janos <ocsi@debian.org> Fri, 9 Feb 2001 15:50:28 +0100 + +xmailbox (2.5-8) unstable; urgency=low + + * New maintainter. (closes: Bug#82447) + * Menu entry added. (closes: Bug#76971) + * Fully repackaged, new Standards-Version. + + -- Lenart Janos <ocsi@debian.org> Wed, 24 Jan 2001 00:09:45 +0100 + +xmailbox (2.5-7.1) unstable; urgency=low + + * Non-maintainer upload. + * recompiled against modern xpm4g-dev to get proper library dependency + * debian/control: added Build-Depends + * debian/rules: call dpkg-gencontrol with -isp + + -- Branden Robinson <branden@debian.org> Thu, 7 Sep 2000 00:45:18 -0500 + +xmailbox (2.5-7) unstable; urgency=low + + * Compile with COM_AUDIO (only). + + -- Mark Baker <mbaker@iee.org> Wed, 18 Feb 1999 11:53:00 +0000 + +xmailbox (2.5-6) unstable; urgency=low + + * Really check /var/spool/mail instead of /usr/spool/mail (oops) + + -- Mark Baker <mbaker@iee.org> Wed, 11 Feb 1999 23:39:00 +0000 + +xmailbox (2.5-5) unstable; urgency=low + + * Updated standards-version to 2.4.0.0 (no changes) + * Check /var/spool/mail instead of /usr/spool/mail (it used to be + right, I think the patch must have not applied cleanly when changing + to a new upstream release, and I forgot to do it manually or something) + + -- Mark Baker <mbaker@iee.org> Wed, 11 Feb 1998 21:00:00 +0000 + +xmailbox (2.5-4) unstable; urgency=low + + * Clarified copyright file + + -- Mark Baker <mbaker@iee.org> Sun, 16 Nov 1997 18:44:19 +0000 + +xmailbox (2.5-3) unstable; urgency=low + + * Compile with sound support (closes: Bug#13991) + + -- Mark Baker <mbaker@iee.org> Sun, 19 Oct 1997 22:40:47 +0100 + +xmailbox (2.5-2) unstable; urgency=low + + * Make single-click run the MUA, as in older versions, but unlike + the upstream version of 2.5 (change to app-defaults file only) + + -- Mark Baker <mbaker@iee.org> Sun, 28 Sep 1997 19:58:22 +0100 + +xmailbox (2.5-1) unstable; urgency=low + + * New upstream release (closes: Bug#13396) + * Pristine source + + -- Mark Baker <mbaker@iee.org> Sat, 27 Sep 1997 11:14:35 +0100 + +xmailbox (2.4-4) unstable; urgency=low + + * Compiled with xpm4g. (closes: Bug#12955, Bug#12803) + + -- Mark Baker <mbaker@iee.org> Thu, 18 Sep 1997 21:15:09 +0100 + +xmailbox (2.4-3) unstable; urgency=low + + * Compiled against xlib6g + + -- Mark Baker <mbaker@iee.org> Tue, 09 Sep 1997 22:13:18 +0100 + +xmailbox (2.4-2) unstable; urgency=low + + * Compiled against libc6 + + -- Mark Baker <mbaker@iee.org> Fri, 20 Jun 1997 15:21:59 +0100 + +xmailbox (2.4-1) unstable; urgency=low + + * First debian release + + -- Mark Baker <mbaker@iee.org> Mon, 28 Apr 1997 23:07:13 +0100 --- xmailbox-2.5.orig/debian/copyright +++ xmailbox-2.5/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Lenart Janos <ocsi@debian.org> on +Wed, 24 Jan 2001 00:09:45 +0100. + +It was downloaded from sunsite.doc.ic.ac.uk:/packages/X11/ +by Mark Baker <mbaker@iee.org> + +Copyright: + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of the X Consortium shall + not be used in advertising or otherwise to promote the sale, use or + other dealings in this Software without prior written authorization + from the X Consortium. --- xmailbox-2.5.orig/debian/control +++ xmailbox-2.5/debian/control @@ -0,0 +1,14 @@ +Source: xmailbox +Section: mail +Priority: optional +Maintainer: Debian QA Group <packages@qa.debian.org> +Build-Depends: debhelper (>> 5), xutils, libxaw7-dev, libx11-dev, libxkbfile-dev, libxmu-dev, libxt-dev, x-dev +Standards-Version: 3.6.2 + +Package: xmailbox +Architecture: any +Depends: ${shlibs:Depends} +Description: mail notifier with animation and sound effects + xmailbox displays an icon which changes when new mail comes in. The + command to check for new mail is freely configurable, so you can even + check accounts on remote systems. --- xmailbox-2.5.orig/debian/rules +++ xmailbox-2.5/debian/rules @@ -0,0 +1,54 @@ +#!/usr/bin/make -f +# debian/rules for xmailbox by Lenart Janos. +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + xmkmf + $(MAKE) + cp xmailbox.man xmailbox.1x + touch build-stamp + +clean: + dh_testdir + dh_testroot + dh_clean Makefile xmailbox.1x xmailbox *.o xmailbox._man build-stamp + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_install + #Rename default file: + mv debian/xmailbox/etc/X11/app-defaults/XMailbox.ad debian/xmailbox/etc/X11/app-defaults/XMailbox + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs README + dh_installexamples + dh_installmenu + dh_installmanpages + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure