Update to 0.99:

xsane-0.98b -> 0.99:
--------------------

 - added preferences/setup options:
   - save_ps_flatdecoded
   - save_pdf_flatdecoded
   - fax_ps_flatdecoded
   - printer[i].ps_flatdecoded

 - changed xsane-preferences reading routines for printer definitions and
   preset area definitions

 - changed postscript and tiff saving routines:
   - split in subroutines:
     - create_document_header (ps, pdf)
     - save image as page (ps, pdf, tiff)
     - create_document_trailer (ps, pdf)

 - split xsane.c into xsane.c, xsane-fax-project.c and xsane-mail-project.c

 - created xsane-multipage.c that adds a multipage project dialog
   supported file formats:
   - ps
   - pdf
   - tiff

 - corrected viewer to display bits/sample and size correct

 - changed handling of viewer filename and filetype selection:
   when a new viewer window is created then it copies the active
   filename and filetype. Changing the viewer´s selection does not
   change the prefered setting any more.

 - when no resolution option is available then xsane uses a resolution
   of 72.0 dpi. This e.g. is used for postscript and PDF.

 - changed tiff saving routine:
   - added deflate (zip) compression for 8 bit and 16 bit / sample images
   - corrected jpeg rgb compression

 - changed mixed up e-mail names (mail, email, e-mail):
   - all xsane internal names are: email
   - all user visible texts are  : e-mail
   - changed acceleration key for email mode to GDK_E
   - changed command line option from --mail and -m to --email and -e

 - changed name of notebook "image" to "filetype"

 - when force_filename is set then the filetype is defined by the filename
   instead of preferences.filetype

 - project dialog position is saved in devices preferences now

 - when a dialog is closed then the position is stored in preferences
   so it can be saved when the window is invisible at program exit

 - changed handling of ADF:
   - removed ADF scanmode selection from setup
   - added entry for number of pages to scan in xsane main dialog
   - next scan is not started by
       g_signal_emit_by_name(xsane.start_button, "clicked"); /* press START button */
     any more. This executed the next scan before all active scan subroutines
     have been finished. Now we use
       gtk_timeout_add(100, (GtkFunction)xsane_scan_dialog, NULL);
     to start xsane_scan_dialog after 100ms.

 - batch scan window now uses preview levels (zoomed previews) to display batch icons

 - added ASMTP authentication PLAIN and LOGIN

 - changed size definition of preview window for GTK2 to gtk_window_resize()

 - added $(DESTDIR) before each destination path in all Makefile.in

 - made usage of MKINSTALLDIRS unique in all Makefile.in

 - cleaned up subdir intl

 - translations: U=updated (* for 0.99-pre1), N=not updated, A=added/new
   cs da de es fr hu it ja nl pl pt pt_BR ro ru sk sl sr sv tr vi zh
   U  U  U  N  N  U  N  N  U* U* N  N     N  U  N  U  N  N  U* N  N
last upd    96 95    96 95       96 96    96    98    76 92    96 96

3 files changed, 60 insertions, 39 deletions

diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index b9bb40b72f9..c965df685b4 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2005/12/31 12:32:38 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2006/01/22 00:09:21 wiz Exp $
 
-DISTNAME=	xsane-0.98b
-PKGREVISION=	1
+DISTNAME=	xsane-0.99
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.xsane.org/download/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
@@ -19,7 +18,7 @@ COMMENT=	New improved frontend for SANE
 
 BUILD_USES_MSGFMT=	yes
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/graphics/xsane/PLIST b/graphics/xsane/PLIST
index 6efc0e3054d..2da79327927 100644
--- a/graphics/xsane/PLIST
+++ b/graphics/xsane/PLIST
@@ -1,6 +1,27 @@
-@comment $NetBSD: PLIST,v 1.9 2005/12/31 00:04:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/01/22 00:09:21 wiz Exp $
 bin/xsane
 man/man1/xsane.1
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xsane.mo
+${PKGLOCALEDIR}/locale/zh/LC_MESSAGES/xsane.mo
 share/sane/xsane/Mustek-logo.xpm
 share/sane/xsane/Plustek-logo.xpm
 share/sane/xsane/UMAX-logo.xpm
@@ -13,23 +34,27 @@ share/sane/xsane/doc/sane-xsane-batch-scan-doc.html
 share/sane/xsane/doc/sane-xsane-color-correction-doc.html
 share/sane/xsane/doc/sane-xsane-copy-doc.html
 share/sane/xsane/doc/sane-xsane-doc.html
+share/sane/xsane/doc/sane-xsane-email-doc.html
 share/sane/xsane/doc/sane-xsane-empty-doc.html
 share/sane/xsane/doc/sane-xsane-fax-doc.html
 share/sane/xsane/doc/sane-xsane-gimp-doc.html
+share/sane/xsane/doc/sane-xsane-guide-doc.html
 share/sane/xsane/doc/sane-xsane-histogram-doc.html
-share/sane/xsane/doc/sane-xsane-mail-doc.html
 share/sane/xsane/doc/sane-xsane-medium-definition-doc.html
+share/sane/xsane/doc/sane-xsane-multipage-doc.html
 share/sane/xsane/doc/sane-xsane-preview-doc.html
 share/sane/xsane/doc/sane-xsane-save-doc.html
+share/sane/xsane/doc/sane-xsane-scan-options-doc.html
 share/sane/xsane/doc/sane-xsane-setup-copy-doc.html
 share/sane/xsane/doc/sane-xsane-setup-display-doc.html
+share/sane/xsane/doc/sane-xsane-setup-email-doc.html
 share/sane/xsane/doc/sane-xsane-setup-enhancement-doc.html
 share/sane/xsane/doc/sane-xsane-setup-fax-doc.html
-share/sane/xsane/doc/sane-xsane-setup-image-doc.html
-share/sane/xsane/doc/sane-xsane-setup-mail-doc.html
+share/sane/xsane/doc/sane-xsane-setup-filetype-doc.html
 share/sane/xsane/doc/sane-xsane-setup-save-doc.html
 share/sane/xsane/doc/sane-xsane-standard-doc.html
 share/sane/xsane/doc/sane-xsane-viewer-doc.html
+share/sane/xsane/doc/xsane-adf-pages.jpg
 share/sane/xsane/doc/xsane-advanced.jpg
 share/sane/xsane/doc/xsane-aspect-ratio.jpg
 share/sane/xsane/doc/xsane-autoenhance.jpg
@@ -41,26 +66,42 @@ share/sane/xsane/doc/xsane-batch-scan.jpg
 share/sane/xsane/doc/xsane-blur.jpg
 share/sane/xsane/doc/xsane-brightness.jpg
 share/sane/xsane/doc/xsane-clone.jpg
+share/sane/xsane/doc/xsane-color-correction.jpg
 share/sane/xsane/doc/xsane-colormode.jpg
 share/sane/xsane/doc/xsane-contrast.jpg
+share/sane/xsane/doc/xsane-copy-number.jpg
 share/sane/xsane/doc/xsane-copy.jpg
 share/sane/xsane/doc/xsane-default.jpg
 share/sane/xsane/doc/xsane-delete-preview-cache.jpg
 share/sane/xsane/doc/xsane-despeckle.jpg
 share/sane/xsane/doc/xsane-disk.jpg
 share/sane/xsane/doc/xsane-edit-medium.jpg
+share/sane/xsane/doc/xsane-email-project.jpg
+share/sane/xsane/doc/xsane-email.jpg
 share/sane/xsane/doc/xsane-fax-project.jpg
 share/sane/xsane/doc/xsane-fax.jpg
 share/sane/xsane/doc/xsane-gamma.jpg
 share/sane/xsane/doc/xsane-gimp.jpg
+share/sane/xsane/doc/xsane-guide-1-decoration.jpg
+share/sane/xsane/doc/xsane-guide-10-scan.jpg
+share/sane/xsane/doc/xsane-guide-2-menu.jpg
+share/sane/xsane/doc/xsane-guide-3-options.jpg
+share/sane/xsane/doc/xsane-guide-4.jpg
+share/sane/xsane/doc/xsane-guide-4a-adf-pages.jpg
+share/sane/xsane/doc/xsane-guide-4b-xsane-mode.jpg
+share/sane/xsane/doc/xsane-guide-5-saving-options.jpg
+share/sane/xsane/doc/xsane-guide-6-scan-options.jpg
+share/sane/xsane/doc/xsane-guide-7-medium-selection.jpg
+share/sane/xsane/doc/xsane-guide-8-resolution.jpg
+share/sane/xsane/doc/xsane-guide-9-color-correction.jpg
 share/sane/xsane/doc/xsane-histogram.jpg
 share/sane/xsane/doc/xsane-logo.jpg
-share/sane/xsane/doc/xsane-mail-project.jpg
-share/sane/xsane/doc/xsane-mail.jpg
-share/sane/xsane/doc/xsane-medium.jpg
 share/sane/xsane/doc/xsane-medium-add.jpg
+share/sane/xsane/doc/xsane-medium.jpg
 share/sane/xsane/doc/xsane-mirror-x.jpg
 share/sane/xsane/doc/xsane-mirror-y.jpg
+share/sane/xsane/doc/xsane-multipage-project.jpg
+share/sane/xsane/doc/xsane-multipage.jpg
 share/sane/xsane/doc/xsane-negative.jpg
 share/sane/xsane/doc/xsane-new.jpg
 share/sane/xsane/doc/xsane-ocr.jpg
@@ -79,8 +120,8 @@ share/sane/xsane/doc/xsane-pipette-black.jpg
 share/sane/xsane/doc/xsane-pipette-gray.jpg
 share/sane/xsane/doc/xsane-pipette-white.jpg
 share/sane/xsane/doc/xsane-preferences.jpg
-share/sane/xsane/doc/xsane-preset-area.jpg
 share/sane/xsane/doc/xsane-preset-area-context-menu.jpg
+share/sane/xsane/doc/xsane-preset-area.jpg
 share/sane/xsane/doc/xsane-preview.jpg
 share/sane/xsane/doc/xsane-printer.jpg
 share/sane/xsane/doc/xsane-rename.jpg
@@ -98,14 +139,16 @@ share/sane/xsane/doc/xsane-scale.jpg
 share/sane/xsane/doc/xsane-scansource.jpg
 share/sane/xsane/doc/xsane-setup-copy.jpg
 share/sane/xsane/doc/xsane-setup-display.jpg
+share/sane/xsane/doc/xsane-setup-email.jpg
 share/sane/xsane/doc/xsane-setup-enhancement.jpg
 share/sane/xsane/doc/xsane-setup-fax.jpg
-share/sane/xsane/doc/xsane-setup-image.jpg
-share/sane/xsane/doc/xsane-setup-mail.jpg
+share/sane/xsane/doc/xsane-setup-filetype.jpg
 share/sane/xsane/doc/xsane-setup-ocr.jpg
 share/sane/xsane/doc/xsane-setup-save.jpg
 share/sane/xsane/doc/xsane-standard.jpg
+share/sane/xsane/doc/xsane-step.jpg
 share/sane/xsane/doc/xsane-store.jpg
+share/sane/xsane/doc/xsane-target.jpg
 share/sane/xsane/doc/xsane-threshold.jpg
 share/sane/xsane/doc/xsane-viewer-window.jpg
 share/sane/xsane/doc/xsane-viewer.jpg
@@ -125,27 +168,6 @@ share/sane/xsane/xsane-gpl.txt
 share/sane/xsane/xsane-logo.xpm
 share/sane/xsane/xsane-startimage.pnm
 share/sane/xsane/xsane-style.rc
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xsane.mo
-${PKGLOCALEDIR}/locale/zh/LC_MESSAGES/xsane.mo
 @dirrm share/sane/xsane/doc
 @dirrm share/sane/xsane
 @comment in sane-backends: @dirrm share/sane
diff --git a/graphics/xsane/distinfo b/graphics/xsane/distinfo
index 978285d7314..d5556d866fb 100644
--- a/graphics/xsane/distinfo
+++ b/graphics/xsane/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/12/31 00:04:03 wiz Exp $
+$NetBSD: distinfo,v 1.13 2006/01/22 00:09:21 wiz Exp $
 
-SHA1 (xsane-0.98b.tar.gz) = 146bfc0b6654087c79fe4c7a6296806377bac960
-RMD160 (xsane-0.98b.tar.gz) = 3ec8d8ccc4539145fe20abc01d7a44d71a44c328
-Size (xsane-0.98b.tar.gz) = 2899655 bytes
+SHA1 (xsane-0.99.tar.gz) = b824f189bfe57579865b5a553b45f8a4935f7944
+RMD160 (xsane-0.99.tar.gz) = 256cee2363c7786909b65beb300596195c51bf01
+Size (xsane-0.99.tar.gz) = 2937568 bytes