Updated xlog to 1.2.2:

- Changes for xlog version 1.2.1 and 1.2.2
  * Debian: correct the Build-Depends line.
  * This is a bugfix release, which fixes compilation against version 2.4
    of the GTK+ libraries. There is no need to upgrade if you use version
    2.6 of this library.

- Changes for xlog version 1.2
  * Import support for the OH1AA logbook. Tested by Jarmo, OH1MRR.
  * A keyerwindow has been added, opened from the 'Tools -> Keyer' menu. This
    is a simple interface to cwdaemon and will allow you to run a contest.
    It features programmable function keys, macro's, switch between CQ and
    S&P mode, an auto increment counter and short numbers. See the MANUAL for
    a description.
  * Ctrl-H opens help, Ctrl-R the keyerwindow.
  * The list of hamlib-rigs in the preferences dialog is now sorted. Thanks
    to Jean-Luc F5IBH for proposing.
  * You can use the 'del' key to delete a selected QSO and the 'insert' key
    to add a QSO.
  * We now have slightly different icons for the worked before dialog and
    the keyer window.
  * A safe backup method has been added, you can now select a backup directory
    in the 'Logs' page of the preferences dialog. This directory can be on
    another drive or on a network mounted directory. Proposed by Matt, GW0VNR.
  * When using hamlib, only the needed backend is loaded at startup. This
    saves about 2 Mb of memory compared to the old method, which would load
    all backends.
  * When using hamlib it is now possible to use the FCC emission designators
    for modes. Check the option in the hamlib page of the preferences dialog.
    Another proposal by Matt, GW0VNR.
  * When selecting 'Logs -> Merge' or Ctrl-M you are presented with a dialog
    which can be used to merge 2 logs.
  * The manual has been rewritten so it can contain images.
  * To make xlog more HIG compliant, Ctrl-Q will now quit the program and
    Ctrl-W will close a log.
  * Fixed a crash when locale conversion fails when reading the manual. Thanks
    to Boguslaw, SQ5TB for reporting.
  * Many minor bugfixes.
  * Slovak translations by Michal Karas, OM4AA.
  * French MANUAL and FAQ by Jean-Luc Coulon, F5IBH.

- Changes for xlog version 1.1
  * Several cleanups in the function which creates the main window, the toolbar
    now uses the GtkAction API, toolbar items are now also accessable through
    the edit menu and the vertical handlebar can move freely to the left.
  * "Tab" in the menu has been renamed to "Page".
  * You can hide the number column by using the log-editor and entering a zero
    column width for this column.
  * The BUGS file has been added to the help menu, with a description on how to
    report bugs.
  * The logeditor has been redesigned so it fits on a 800x600 display.
  * Most of the dialogs have been cleaned up and partly rewritten, so they
    will load faster.
  * Xlog now correctly recognizes the 60 meters band. Thanks to Harv Nelson,
    AI9NL for notifying.
  * At ADIF import, frequencies with a comma are converted to a dot.
  * A gtk+ version check has been added, which will display an error at
    startup if the version is below 2.4.
  * An error will be displayed when trying to load a non-xlog file.
  * The labels export format has been renamed TSV (Tab Separated Value).
  * You can decide which fields to export in the TSV format (used by glabels),
    by going to Settings->Dialogs and checking wanted the fields in the
    "Save As" page.
  * When hamlib is enabled, rounding of the digits is now also possible when
    the s-meter is not visible.
  * When entering a logname in the new log dialog, dash (-) and underscore (_)
    are now also allowed.
  * Polish MANUAL and FAQ added by Boguslaw Ciastek, SQ5TB.
  * The position of the paned window is now remembered at program exit.

3 files changed, 40 insertions, 16 deletions

diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index 067e506c91f..fbaface0de8 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:18 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/16 12:35:49 wulf Exp $
 #
 
-DISTNAME=	xlog-1.0
+DISTNAME=	xlog-1.2.2
 CATEGORIES=	ham
 MASTER_SITES=	http://www.qsl.net/pg4i/download/
 
@@ -18,4 +18,5 @@ CONFIGURE_ARGS=	--enable-hamlib
 .include "../../ham/hamlib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/xlog/PLIST b/ham/xlog/PLIST
index 050adfccd0a..5ba1342ecb1 100644
--- a/ham/xlog/PLIST
+++ b/ham/xlog/PLIST
@@ -1,18 +1,23 @@
-@comment $NetBSD: PLIST,v 1.4 2005/01/23 09:02:54 wulf Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/08/16 12:35:49 wulf Exp $
 bin/xlog
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xlog.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xlog.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xlog.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xlog.mo
+man/man1/xlog.1
+share/application-registry/xlog.applications
 share/applications/xlog.desktop
 share/applnk/Applications/xlog.desktop
-share/application-registry/xlog.applications
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xlog.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xlog.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xlog.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xlog.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xlog.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xlog.mo
 share/mime-info/xlog.keys
 share/mime-info/xlog.mime
 share/mime/packages/xlog.xml
 share/mimelnk/text/x-xlog.desktop
 share/pixmaps/gnome-mime-text-x-xlog.png
+share/pixmaps/xlog/cwdaemon.png
 share/pixmaps/xlog/gnome-mime-text-x-xlog.png
+share/pixmaps/xlog/jigsaw.png
 share/pixmaps/xlog/mini-clock.xpm
 share/pixmaps/xlog/mini-trx.xpm
 share/pixmaps/xlog/mini-xlog.xpm
@@ -28,20 +33,38 @@ share/pixmaps/xlog/s6.xpm
 share/pixmaps/xlog/s7.xpm
 share/pixmaps/xlog/s8.xpm
 share/pixmaps/xlog/s9.xpm
+share/pixmaps/xlog/xlog-b4.png
 share/pixmaps/xlog/xlog-icon.png
-share/pixmaps/xlog/xlog-logo.png
+share/pixmaps/xlog/xlog-keyer.png
 share/pixmaps/xlog/xlog.png
 share/pixmaps/xlog/xlog.xpm
-share/xlog/dxcc/cty.dat
-share/xlog/dxcc/xlog.dat
 share/xlog/AUTHORS
+share/xlog/BUGS
 share/xlog/ChangeLog
 share/xlog/FAQ
+share/xlog/FAQ.fr
+share/xlog/FAQ.pl
 share/xlog/MANUAL
+share/xlog/MANUAL.fr
+share/xlog/MANUAL.pl
 share/xlog/THANKS
 share/xlog/TODO
+share/xlog/dxcc/cty.dat
+share/xlog/dxcc/xlog.dat
+share/xlog/images/xlog-defaultsdialog.png
+share/xlog/images/xlog-dupecheckdialog.png
+share/xlog/images/xlog-keyerwindow.png
+share/xlog/images/xlog-logeditor.png
+share/xlog/images/xlog-mainwindow.png
+share/xlog/images/xlog-mergelogdialog.png
+share/xlog/images/xlog-newlogdialog.png
+share/xlog/images/xlog-openlogdialog.png
+share/xlog/images/xlog-preferencesdialog-hamlib.png
+share/xlog/images/xlog-preferencesdialog-info.png
+share/xlog/images/xlog-printdialog.png
+share/xlog/images/xlog-workedwindow.png
 share/xlog/qsllabels.glabels
-man/man1/xlog.1
 @dirrm share/pixmaps/xlog
 @dirrm share/xlog/dxcc
+@dirrm share/xlog/images
 @dirrm share/xlog
diff --git a/ham/xlog/distinfo b/ham/xlog/distinfo
index 54665e98ad6..8772e8df8bb 100644
--- a/ham/xlog/distinfo
+++ b/ham/xlog/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/22 21:06:07 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/08/16 12:35:49 wulf Exp $
 
-SHA1 (xlog-1.0.tar.gz) = bbc5d38d2d105a1cdf0890de92702895565123ea
-RMD160 (xlog-1.0.tar.gz) = 65c116f950707940122990035a46a7f934a39921
-Size (xlog-1.0.tar.gz) = 432066 bytes
+SHA1 (xlog-1.2.2.tar.gz) = ed97c7f57a6f5e02a13a9764a057e338fd8df11b
+RMD160 (xlog-1.2.2.tar.gz) = fc005bc05efa62110e09b3d218d7b084860f42ca
+Size (xlog-1.2.2.tar.gz) = 798514 bytes