[Pkg-wmaker-commits] [wmbiff] 43/92: Imported Debian patch 0.3.8-3
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 02:59:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmbiff.
commit 56d9b7bd52a0aafe6c153dd63f881d6600c82749
Merge: 8ec6b37 13ce02c
Author: Jordi Mallach <jordi at debian.org>
Date: Tue Apr 16 18:19:47 2002 +0200
Imported Debian patch 0.3.8-3
ChangeLog | 518 +++++++++++++++-
NEWS | 282 +++++++++
README | 84 ++-
README.licq | 23 +
TODO | 15 +
debian/changelog | 259 +++++++-
debian/control | 16 +-
debian/copyright | 8 +-
debian/dirs | 5 +-
debian/docs | 4 +-
debian/{docs => examples} | 1 -
debian/menu | 4 +-
debian/rules | 41 +-
wmbiff/Client.h | 125 ++++
wmbiff/Imap4Client.c | 454 ++++++++++++++
wmbiff/LicqClient.c | 91 +++
wmbiff/Makefile | 155 ++++-
wmbiff/Pop3Client.c | 498 +++++++++------
wmbiff/Pop3Client.h | 34 -
wmbiff/ShellClient.c | 114 ++++
wmbiff/charutil.c | 221 +++++++
wmbiff/charutil.h | 34 +
wmbiff/maildirClient.c | 135 ++++
wmbiff/mboxClient.c | 133 ++++
wmbiff/sample.wmbiffrc | 54 +-
wmbiff/socket.c | 61 ++
wmbiff/test-wmbiffrc.shell | 24 +
wmbiff/tlsComm.c | 451 ++++++++++++++
wmbiff/tlsComm.h | 55 ++
wmbiff/wmbiff-master-led.xpm | 2 +-
wmbiff/wmbiff-master.xpm | 1 -
debian/wmbiff.1x => wmbiff/wmbiff.1 | 81 ++-
wmbiff/wmbiff.c | 1166 +++++++++++++++++------------------
wmbiff/wmbiffrc.5 | 198 ++++++
wmgeneral/list.h | 2 +-
wmgeneral/wmgeneral.c | 54 +-
wmgeneral/wmgeneral.h | 6 +-
37 files changed, 4408 insertions(+), 1001 deletions(-)
diff --cc debian/changelog
index 0ae7aea,0000000..384ec92
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,0 +1,282 @@@
++wmbiff (0.3.8-3) unstable; urgency=low
++
++ * Apply patch from Neil Spring to change the semantics of the
++ -geometry switch, to make it standard (closes: #142958).
++
++ -- Jordi Mallach <jordi at debian.org> Tue, 16 Apr 2002 18:19:47 +0200
++
++wmbiff (0.3.8-2) unstable; urgency=low
++
++ * Moving to main, now that gnutls made it into ftp-master.
++ * debian/control: changed section to x11 (as opposed to mail,
++ as wmbiff is getting more and more non-mail features).
++
++ -- Jordi Mallach <jordi at debian.org> Wed, 3 Apr 2002 19:17:06 +0200
++
++wmbiff (0.3.8-1) unstable; urgency=low
++
++ * New upstream release.
++ * Not moving to ftp-master yet, waiting for gnutls/gcrypt.
++ * debian/control: added note about the new GnomeICU support.
++
++ -- Jordi Mallach <jordi at debian.org> Tue, 26 Mar 2002 18:15:07 +0100
++
++wmbiff (0.3.7-3) unstable; urgency=low
++
++ * What if... I really bump Build-Deps?
++
++ -- Jordi Mallach <jordi at debian.org> Tue, 19 Feb 2002 15:11:19 +0100
++
++wmbiff (0.3.7-2) unstable; urgency=medium
++
++ * Really recompiled against gnutls3 (really closes: #132229).
++ * debian/control: Tighten again Build-Deps to gnutls (>> 0.3.5-3).
++
++ -- Jordi Mallach <jordi at debian.org> Sun, 17 Feb 2002 23:27:17 +0100
++
++wmbiff (0.3.7-1) unstable; urgency=medium
++
++ * New upstream release.
++ + IMAP now has an alternative syntax that allows "@" in
++ passwords (closes: #130899).
++ * Recompiled against fixed gnutls3, *sigh* (closes: #132229).
++ * wmbiff/Makefile: correct error in install rule.
++ * debian/control: promote Build-Depends to gnutls (>> 0.3.5-1).
++ * debian/rules:
++ + tweaks to install rule for the new upstream Makefile.
++ + removed manual D_B_O nostrip support, as we're using debhelper
++ anyway.
++
++ -- Jordi Mallach <jordi at debian.org> Thu, 8 Feb 2002 20:06:47 +0100
++
++wmbiff (0.3.5-1) unstable; urgency=low
++
++ * New upstream release (closes: #128863, #128865).
++ * debian/control: Build-Depend on gnutls (>= 0.3.2-3),
++ libgcrypt (>= 1.1.5-3) (closes: #128678, #129458).
++ * debian/changelog: removed emacs stuff.
++
++ -- Jordi Mallach <jordi at debian.org> Fri, 18 Jan 2002 19:28:22 +0100
++
++wmbiff (0.3.4-2) unstable; urgency=low
++
++ * debian/control: typo fix: s/maiboxes/mailboxes/ (closes: #125486).
++ * debian/rules: removed dh_make cruft.
++
++ -- Jordi Mallach <jordi at debian.org> Tue, 18 Dec 2001 11:50:19 +0100
++
++wmbiff (0.3.4-1) unstable; urgency=low
++
++ * New upstream release.
++ * This release adds authentication protocol selection for IMAP and Pop3
++ mailboxes (closes: #118691).
++
++ -- Jordi Mallach <jordi at debian.org> Fri, 23 Nov 2001 17:14:11 +0100
++
++wmbiff (0.3.3-1) unstable; urgency=low
++
++ * New upstream release.
++
++ -- Jordi Mallach <jordi at debian.org> Mon, 29 Oct 2001 15:16:05 +0100
++
++wmbiff (0.3.2-1) unstable; urgency=low
++
++ * New upstream release.
++ * debian/control:
++ + moved to non-US.
++ + Build-Depend on gnutls-dev (>= 0.2.4-2) and libgcrypt-dev.
++ + Standards-Version: 3.5.6.0.
++ + adjusted description for the new mailbox types support.
++ * debian/docs: added TODO.
++
++ -- Jordi Mallach <jordi at debian.org> Tue, 23 Oct 2001 20:57:17 +0200
++
++wmbiff (0.3.1-3) unstable; urgency=low
++
++ * Rebuilt with dpkg-dev 1.9.14.1.
++
++ -- Jordi Mallach <jordi at debian.org> Wed, 27 Jun 2001 21:00:06 +0200
++
++wmbiff (0.3.1-2) unstable; urgency=low
++
++ * Okay, really add NEWS to the docs.
++ * debian/rules: removed dh_testversion calls. Will you shut up now,
++ lintian?
++
++ -- Jordi Mallach <jordi at debian.org> Wed, 27 Jun 2001 13:57:37 +0200
++
++wmbiff (0.3.1-1) unstable; urgency=low
++
++ * New upstream release.
++ * debian/control: Standards-Version: 3.5.5.0.
++ * debian/docs: added NEWS.
++ * wmbiff now uses /var/mail as mail spool dir.
++
++ -- Jordi Mallach <jordi at debian.org> Tue, 26 Jun 2001 15:00:05 +0200
++
++wmbiff (0.3.0-1) unstable; urgency=low
++
++ * New upstream release.
++ * This version fixes a broken behaviour of the new parsing, which had
++ lost some backwards compatibility (closes: #95849).
++ * debian/copyright: updated download location, new upstreams are using
++ SourceForge now.
++
++ -- Jordi Mallach <jordi at debian.org> Wed, 16 May 2001 12:53:30 +0200
++
++wmbiff (0.2q1-1) unstable; urgency=low
++
++ * New upstream release.
++ * Patches merged upstream again.
++ * wmbiff/Makefile: *sigh*, again he forgot to bump the version number.
++ * Got two nice patches from Rob Funk <rfunk at funknet.net>:
++ + wmbiff/Imap4Client.c: fix for imap servers which quote the folder
++ name (closes: #95077)
++ + wmbiff/mboxClient.c: wmbiff only considered new mails those which
++ had a "N" as first flag, so "ON" messages wouldn't be shown as new
++ (closes: #95128)
++ Thanks Rob!
++ * Mark Hurley sent another patch, which fixes a little issue with empty
++ mailboxes not updating (closes: #94450).
++
++ -- Jordi Mallach <jordi at debian.org> Mon, 30 Apr 2001 13:46:03 +0200
++
++wmbiff (0.2q-2) unstable; urgency=low
++
++ * The `duh, I did it again' release.
++ * wmbiff/Client.h: yeah, we want to undefine all the debugging stuff now.
++ * wmbiff/wmbiff.c: we have 5 mailboxes, not 4 (thanks to Jorge Garc�a).
++
++ -- Jordi Mallach <jordi at debian.org> Wed, 11 Apr 2001 23:25:23 +0200
++
++wmbiff (0.2q-1) unstable; urgency=low
++
++ * New upstream release.
++ * Removed new patches, applied upstream.
++ * wmbiff/Makefile: fix WMBIFF_VERSION (again).
++
++ -- Jordi Mallach <jordi at debian.org> Mon, 9 Apr 2001 15:09:20 +0200
++
++wmbiff (0.2p-1) unstable; urgency=low
++
++ * New upstream release.
++ * All the Debian patches have been merged upstream.
++ * This release introduces maildir support, which closes: #75005.
++ * wmbiff/Makefile: added DESTDIR, EXTRAFLAGS and some INSTALL things,
++ to install manpages with proper permissions.
++ * debian/rules:
++ + update D_B_O things for the manpages installation
++ + add DESTDIR to the install rule
++ + remove dh_installman invocation
++ * debian/control: updated description for Maildir.
++ * debian/{wmbiff.1,wmbiffrc.5,manpages}: removed.
++
++ -- Jordi Mallach <jordi at debian.org> Tue, 13 Mar 2001 18:21:38 +0100
++
++wmbiff (0.2n-2) unstable; urgency=low
++
++ * The `if you want to test, install the appropriate package' release.
++ * Fixed a major upstream bug that renders this new wmbiff unusable.
++ Thanks to Guillaume Morin, J�r�me Marant and Mark Hurley for their
++ help identifying the bug, and Jorge Garc�a <Jorge.Garcia at uv.es> for
++ writing a patch. Basically, the new upstream broke backwards
++ compatibility of wmbiffrc with Gennady's wmbiff, fixed that.
++ This patch also fixes wmbiff not using $MAIL or defaulting to
++ /var/spool/mail/$USER if no ~/.wmbiffrc is found (closes: #87778).
++ * wmbiff/wmbiff.c: updated WMBIFF_VERSION to current "0.2n".
++ * wmbiff/{socket.c, wmbiff.c}: removed <sys/time.h> includes.
++ * debian/{wmbiff.1, wmbiffrc.5}: updated for IMAP4 and Licq support.
++ * debian/rules: quote around $(CFLAGS), oops. No wonder how I found this,
++ right?
++
++ -- Jordi Mallach <jordi at debian.org> Thu, 1 Mar 2001 22:57:51 +0100
++
++wmbiff (0.2n-1) unstable; urgency=low
++
++ * New upstream release, from a fork. I've been doing Google searches for
++ Gennady Belyakov since December 1999, when he started to be
++ unresponsive, without positive results. Mark Hurley just told me there
++ was some guy releasing new versions, so I'll use Yong-iL Joh's branch
++ from now on. This new version adds licq and IMAP4 support, and more.
++ * Reapplied the patches to this new version, some of them seem to be
++ obsolete by upstream changes... there's no changelog, so it's a bit hard
++ to know.
++ * Applied the patches from OpenBSD's port.
++ * wmbiff/Makefile: changes to install rule.
++ * debian/rules:
++ + DH_COMPAT=3 and the changes needed
++ + DEB_BUILD_OPTIONS support
++ + s/`pwd`/$(CURDIR)
++ * debian/control:
++ + Standards-Version: 3.5.2.0
++ + Updated Build-Depends for X4
++ + removed Suggests: menu
++ + updated Description.
++ * debian/copyright: updated authors and URL.
++ * debian/manpages: added for dh_installman.
++
++ -- Jordi Mallach <jordi at debian.org> Mon, 26 Feb 2001 14:47:21 +0100
++
++wmbiff (0.2-4) unstable; urgency=low
++
++ * wmbiff/wmbiff.c:
++ + add an ifdef to get rid of that stupid, annoying
++ debug message that bloated all our .xsession-errors files. This should
++ have been fixed about 6 months ago, how lazy.
++ + apply patch from Jorge Garcia <Jorge.Garcia at uv.es>: if a mailbox has
++ > 1000 messages and after a rescan less than 1000 remain, the first
++ character in the number display should be removed (closes: #63048).
++ The patch also fixes a possible segfault when too many files are open.
++ * debian/control:
++ + changed maintainer email address.
++ + added Build-Depends.
++ * debian/wmbiffrc.5: months late, wmbiffrc finally has its manpage.
++ * debian/wmbiff.1: small modifications to reflect the new wmbiffrc.5.
++ * debian/rules:
++ + install wmbiffrc.5.
++ + revert changes to wmbiff/Makefile, all the modifications are handled
++ here now.
++ * In advance to Overfiend's rage and destruction against /usr/X11R6, I'm
++ installing the binary and manpages in /usr, and removing the "1x" suffix
++ to the manpage. Conforms with new Policy 3.2.0.0.
++ * Upload the tar.gz as well, the old one was broken.
++
++ -- Jordi Mallach <jordi at debian.org> Fri, 11 Aug 2000 04:16:03 +0200
++
++wmbiff (0.2-3) frozen unstable; urgency=low
++
++ * debian/copyright: fixed location of common-licenses.
++ * Fixed some errors on the manpage.
++ * debian/rules: moved sample.wmbiffrc to examples/.
++ * debian/control: updated to Standards-Version: 3.1.1.1.
++ * Compiled against new xlib6g 3.3.6.
++
++ -- Jordi Mallach <jordi at sindominio.net> Thu, 13 Jan 2000 13:28:57 +0100
++
+wmbiff (0.2-2) unstable; urgency=low
+
+ * Wrote a manpage for wmbiff. I still need to write a wmbiffrc(5)
+ manpage, in the meanwhile, sample.wmbiffrc file is a good start.
+ * Removed my second surname from the maintainer's name entry.
+
+ -- Jordi Mallach <jordi at sindominio.net> Sat, 18 Dec 1999 20:04:07 +0100
+
+wmbiff (0.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * (Auto)Mail fetch support added.
+
+ -- Jordi Mallach P�rez <jordi at sindominio.net> Sat, 27 Nov 1999 01:31:22 +0100
+
+wmbiff (0.1a-1) unstable; urgency=low
+
+ * New upstream release.
+ * This version fixes unwanted beeps on new mail arrival.
+
+ -- Jordi Mallach P�rez <jordi at sindominio.net> Sat, 20 Nov 1999 03:10:58 +0100
+
+wmbiff (0.1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Jordi Mallach P�rez <jordi at sindominio.net> Thu, 18 Nov 1999 02:53:59 +0100
-
- Local variables:
- mode: debian-changelog
- End:
diff --cc debian/control
index bb62366,0000000..8ca8e7e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,16 -1,0 +1,20 @@@
+Source: wmbiff
+Section: x11
+Priority: optional
- Maintainer: Jordi Mallach <jordi at sindominio.net>
- Standards-Version: 3.0.1
++Maintainer: Jordi Mallach <jordi at debian.org>
++Build-Depends: xlibs-dev, gnutls-dev (>> 0.3.5-3), libgcrypt-dev (>= 1.1.5-3), debhelper (>= 3.0.0)
++Standards-Version: 3.5.6.2
+
+Package: wmbiff
+Architecture: any
+Depends: ${shlibs:Depends}
- Suggests: menu (>= 2.1.4)
+Description: A dockable app that displays information about mailboxes
- wmBiff is an WindowMaker docking utility, that displays the number of read
++ WMBiff is an WindowMaker docking utility, that displays the number of read
+ and unread messages in up to five mailboxes.
+ You can also define actions to execute on new mail arrival (for example,
- play a sound file).
- At this moment only unix-style mailboxes are supported.
++ play a sound file), [auto]fetchmail from a remote server or to execute your
++ mail reader with a mouse click. WMBiff also supports notification of
++ incoming Licq messages, so you can put Licq in the background.
++ .
++ At this moment, wmbiff supports unix-style, maildir, pop3, APOP, IMAP
++ and IMAPS mailboxes, as well as Licq and GnomeICU history files.
diff --cc debian/copyright
index 4b7ce8a,0000000..e393618
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,14 -1,0 +1,16 @@@
- This package was debianized by Jordi Mallach <jordi at sindominio.net> on
++This package was debianized by Jordi Mallach <jordi at debian.org> on
+Thu, 18 Nov 1999 02:53:59 +0100.
+
- It was downloaded from http://ccat.elect.ru/wmbiff/
++It was downloaded from http://sourceforge.net/projects/wmbiff.
+
- Upstream Author: Gennady Belyakov <gb at ccat.elect.ru>
++Upstream Author: Gennady Belyakov <gb at ccat.elect.ru>,
++ Yong-iL Joh <tolkien at mizi.com>
++ and others.
+
+Copyright:
+
+This software is copyright (c) by Gennady Belyakov
+You are free to distribute this software under the terms of
+the GNU General Public License.
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in /usr/share/common-licenses/GPL file.
diff --cc debian/dirs
index 30dbcc2,0000000..f693d65
mode 100644,000000..100644
--- a/debian/dirs
+++ b/debian/dirs
@@@ -1,2 -1,0 +1,3 @@@
- usr/X11R6/bin
- usr/X11R6/man/man1
++usr/bin
++usr/share/man/man1
++usr/share/man/man5
diff --cc debian/docs
index 79fe291,0000000..34b132a
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,2 -1,0 +1,4 @@@
++NEWS
+README
- wmbiff/sample.wmbiffrc
++README.licq
++TODO
diff --cc debian/examples
index 79fe291,0000000..78111c9
mode 100644,000000..100644
--- a/debian/examples
+++ b/debian/examples
@@@ -1,2 -1,0 +1,1 @@@
- README
+wmbiff/sample.wmbiffrc
diff --cc debian/menu
index 1bcfa65,0000000..4a2ccae
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,2 -1,0 +1,2 @@@
- ?package(wmbiff):needs=X11 section=Apps/Net\
- title="WMbiff" command="/usr/X11R6/bin/wmbiff"
++?package(wmbiff):needs=X11 section=Apps/Net \
++ title="WMbiff" command="/usr/bin/wmbiff"
diff --cc debian/rules
index d6036ec,0000000..fe046c4
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,78 -1,0 +1,65 @@@
+#!/usr/bin/make -f
+# 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
+
+# This is the debhelper compatability version to use.
- export DH_COMPAT=1
++export DH_COMPAT=3
++
++CFLAGS = -O2 -Wall
++
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++CFLAGS += -g
++endif
++
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+
-
- # Add here commands to compile the package.
- $(MAKE) -f wmbiff/Makefile
++ (cd wmbiff ; $(MAKE) CFLAGS="$(CFLAGS)")
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
- rm -f build-stamp
++ rm -f build-stamp install-stamp
+
- # Add here commands to clean up after the build process.
- -$(MAKE) -f wmbiff/Makefile clean
++ (cd wmbiff ; $(MAKE) clean)
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
- # Add here commands to install the package into debian/tmp.
- $(MAKE) -f wmbiff/Makefile install prefix=`pwd`/debian/tmp
++ (cd wmbiff ; $(MAKE) PREFIX=$(CURDIR)/debian/wmbiff/usr install)
+
+ touch install-stamp
+
- # 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_testversion
+ dh_testdir
+ dh_testroot
- # dh_installdebconf
+ dh_installdocs
- # dh_installexamples
++ dh_installexamples
+ dh_installmenu
- # dh_installemacsen
- # dh_installpam
- # dh_installinit
- # dh_installcron
- dh_installmanpages wmbiff.1x.gz
- # dh_installinfo
- # dh_undocumented wmbiff.1x.gz
++# dh_installman
+ dh_installchangelogs ChangeLog
- dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
- # You may want to make some executables suid here.
- # dh_suidregister
- # dh_makeshlibs
+ dh_installdeb
- # dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --cc wmgeneral/wmgeneral.c
index 56b7bd6,acda07e..2eb5e93
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@@ -380,7 -382,7 +382,7 @@@ void openXwindow(int argc, char *argv[]
char *geometry = NULL;
int dummy=0;
-- int i, wx, wy;
++ int i;
for (i=1; argv[i]; i++) {
if (!strcmp(argv[i], "-display")) {
@@@ -472,10 -474,10 +474,16 @@@
XMapWindow(display, win);
if (geometry) {
-- if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) {
-- fprintf(stderr, "Bad geometry string.\n");
++ int wx, wy, x, y;
++
++ if (sscanf(geometry, "+%d+%d", &wx, &wy) == 2) {
++ XMoveWindow(display, win, wx, wy);
++ } else if (sscanf(geometry, "%dx%d+%d+%d", &x, &y, &wx, &wy) == 4) {
++ XMoveWindow(display, win, wx, wy);
++ } else {
++ fprintf(stderr, "Unsupported geometry string '%s'\n",
++ geometry);
exit(1);
}
-- XMoveWindow(display, win, wx, wy);
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git
More information about the Pkg-wmaker-commits
mailing list