summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog720
-rw-r--r--debian/compat1
-rw-r--r--debian/control42
-rw-r--r--debian/copyright32
-rw-r--r--debian/patches/00list8
-rw-r--r--debian/patches/01_printing_defaults.dpatch21
-rw-r--r--debian/patches/02_docviewer.dpatch37
-rw-r--r--debian/patches/03_gimp_acquire_menu.dpatch39
-rw-r--r--debian/patches/04_inhibit_clickthrough.dpatch59
-rw-r--r--debian/patches/05_options_handling_fix.dpatch242
-rw-r--r--debian/patches/06_fix_pdf_xref.dpatch21
-rw-r--r--debian/patches/10_broken_links.dpatch20
-rwxr-xr-xdebian/rules162
-rw-r--r--debian/xsane-common.dirs1
-rw-r--r--debian/xsane-common.doc-base15
-rw-r--r--debian/xsane-common.links1
-rw-r--r--debian/xsane.desktop17
-rw-r--r--debian/xsane.dirs3
-rw-r--r--debian/xsane.docs9
-rw-r--r--debian/xsane.links2
-rw-r--r--debian/xsane.menu6
-rw-r--r--debian/xsane.postinst16
22 files changed, 1474 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..328b454
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,720 @@
+xsane (0.996-1) unstable; urgency=low
+
+ * New upstream release.
+
+ * debian/xsane.postinst:
+ + Make maintainer script set -e.
+
+ * debian/patches/06_fix_pdf_xref.dpatch:
+ + Updated; this release fixes the single-page case but the multipage case
+ was left out.
+
+ -- Julien BLACHE <jblache@debian.org> Wed, 26 Nov 2008 22:35:41 +0100
+
+xsane (0.995-6) unstable; urgency=low
+
+ * debian/patches/06_fix_pdf_xref.dpatch:
+ + Added; mark non-existent PDF objects as free in the xref table
+ (closes: #499104).
+
+ -- Julien BLACHE <jblache@debian.org> Wed, 17 Sep 2008 21:40:10 +0200
+
+xsane (0.995-5) unstable; urgency=low
+
+ * debian/control:
+ + xsane Recommends: cups-client for the lp binary.
+
+ * debian/patches/01_printing_defaults.dpatch:
+ + Added; switch printing defaults from lpr to lp (closes: #468274).
+
+ -- Julien BLACHE <jblache@debian.org> Mon, 08 Sep 2008 11:04:02 +0200
+
+xsane (0.995-4) unstable; urgency=low
+
+ * debian/control:
+ + Bump Standards-Version to 3.8.0 (no changes).
+ * debian/xsane.desktop:
+ + Remove Encoding key (closes: #489790).
+
+ * debian/patches/05_options_handling_fix.dpatch:
+ + Added; duplicate strings for options with a constraint type of
+ SANE_CONSTRAINT_STRING_LIST, as the constraint is not guaranteed to
+ be stable in memory, and actually isn't when the net backend is used.
+ Based on Brad Sawatzky's patch (closes: #487475, #307088).
+ * debian/patches/03_gimp_acquire_menu.dpatch:
+ + Updated; add missing patch description.
+
+ -- Julien BLACHE <jblache@debian.org> Fri, 25 Jul 2008 19:04:12 +0200
+
+xsane (0.995-3) unstable; urgency=low
+
+ * debian/patches/04_inhibit_clickthrough.dpatch:
+ + Added; finally give up and inhibit the license clickthrough. They
+ largely made me do it (closes: #132679).
+ * debian/xsane-common.doc-base:
+ + Fix doc-base section.
+
+ -- Julien BLACHE <jblache@debian.org> Fri, 11 Apr 2008 19:03:59 +0200
+
+xsane (0.995-2) unstable; urgency=low
+
+ * debian/control:
+ + Bump Standards-Version to 3.7.3 (no changes).
+
+ -- Julien BLACHE <jblache@debian.org> Sat, 01 Mar 2008 16:59:01 +0100
+
+xsane (0.995-1) unstable; urgency=low
+
+ * New upstream release.
+ + Enlarged buffer for the "No devices" help text (closes: #442294).
+ + LCMS (color management) support.
+ * debian/patches/11_contect_typo.dpatch:
+ + Removed; merged upstream.
+ * debian/patches/12_pbar_fixes.dpatch:
+ + Removed; fixed upstream with a different fix.
+ * debian/control:
+ + Build-Depends: liblcms1-dev for color management support.
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 22 Nov 2007 11:42:18 +0100
+
+xsane (0.994-1) experimental; urgency=low
+
+ * New upstream beta release.
+
+ -- Julien BLACHE <jblache@debian.org> Wed, 7 Mar 2007 13:12:27 +0100
+
+xsane (0.993-1) experimental; urgency=low
+
+ * New upstream beta release.
+
+ -- Julien BLACHE <jblache@debian.org> Tue, 27 Feb 2007 22:22:40 +0100
+
+xsane (0.99+0.991-6) unstable; urgency=low
+
+ * debian/patches/12_pbar_fixes.dpatch:
+ + Added; Reduce progress bar updates/redraws by rounding the progress
+ value. Patch by Joris van Rooij <jrrzz@il.fontys.nl> (closes: #432609).
+ * debian/xsane.desktop:
+ + Remove non-existent "Application" category.
+ * debian/xsane-common.links:
+ + Add an index.html symlink to sane-xsane-doc.html in the HTML doc.
+
+ -- Julien BLACHE <jblache@debian.org> Fri, 24 Aug 2007 11:37:26 +0200
+
+xsane (0.99+0.991-5) unstable; urgency=low
+
+ * debian/xsane.menu:
+ + Update for the new menu structure.
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 05 Aug 2007 18:14:18 +0200
+
+xsane (0.99+0.991-4) unstable; urgency=low
+
+ * debian/control:
+ + Remove obsolete Build-Conflicts: libpng10-dev.
+ + Remove obsolete Conflicts/Replaces: xsane-gimp1.{2,3}.
+ + Update browser recommendation.
+ + Improve short description.
+ * debian/rules:
+ + Do not ignore errors from make distclean.
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 02 Aug 2007 18:15:18 +0200
+
+xsane (0.99+0.991-3) unstable; urgency=low
+
+ * debian/patches/10_broken_links.dpatch:
+ + Added; fix broken links in HTML documentation (closes: #415299).
+ * debian/patches/11_contect_typo.dpatch:
+ + Added; fix "contect" typo in xsane-text.h; original patch by
+ Martin Pitt <martin.pitt@ubuntu.com> (closes: #420749).
+
+ -- Julien BLACHE <jblache@debian.org> Fri, 27 Apr 2007 21:46:28 +0200
+
+xsane (0.99+0.991-2) unstable; urgency=low
+
+ * debian/control:
+ + Bumped Standards-Version to 3.7.2 (no changes).
+ + Fix dependency on xsane-common to be binNMU-safe.
+ + Remove Uploaders.
+
+ Thank you Aurélien JARNO for your help during these years.
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 7 Jan 2007 19:00:11 +0100
+
+xsane (0.99+0.991-1) unstable; urgency=low
+
+ * New upstream bugfix release (0.991).
+
+ -- Julien BLACHE <jblache@debian.org> Tue, 24 Jan 2006 23:14:44 +0100
+
+xsane (0.99-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Julien BLACHE <jblache@debian.org> Tue, 10 Jan 2006 21:58:08 +0100
+
+xsane (0.98b-2) unstable; urgency=low
+
+ * debian/control:
+ + Removed build-dependency on xlibs-dev (closes: bug#343945).
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 8 Jan 2006 00:43:52 +0100
+
+xsane (0.98b-1) unstable; urgency=low
+
+ * Bugfix release.
+
+ -- Julien BLACHE <jblache@debian.org> Sat, 3 Dec 2005 14:51:29 +0100
+
+xsane (0.98-1) unstable; urgency=low
+
+ * New upstream release.
+ + Adds PDF support, including in mail mode (closes: #311510).
+ + Fixes batch scan (closes: #337208).
+ * debian/patches/11_manapge_fixes.dpatch:
+ + Removed; merged upstream.
+ * debian/patches/12_de.po_fixes.dpatch:
+ + Removed; merged upstream.
+ * debian/patches/10_batch_scan_bugfix.dpatch:
+ + Removed; merged upstream.
+ * debian/patches/01_logo_docs.dpatch:
+ + Removed; not necessary anymore.
+
+ -- Julien BLACHE <jblache@debian.org> Mon, 21 Nov 2005 21:49:19 +0100
+
+xsane (0.97-4) unstable; urgency=low
+
+ * debian/control:
+ + Bumped Standards-Version to 3.6.2 (no changes).
+ * debian/patches/11_manpage_fixes.dpatch:
+ + Added; typo fixes for the manpage (closes: #302676).
+ * debian/patches/12_de.po_fixes.dpatch:
+ + Added; typo fixes for the german translation (closes: #313862).
+ * debian/patches/02_docviewer.dpatch:
+ + Fixed; do not change the value of BROWSER_NETSCAPE (closes: #321835).
+ * debian/xsane.postinst:
+ + Fix bashism in postinst.
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 28 Aug 2005 19:03:36 +0200
+
+xsane (0.97-3) unstable; urgency=medium
+
+ * debian/postinst:
+ + Fixed the link target directory.
+ + Empty /usr/share/doc/html before trying to remove it (closes:
+ #292718).
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 3 Feb 2005 16:24:20 +0100
+
+xsane (0.97-2) unstable; urgency=low
+
+ * debian/patches/10_batch_scan_bugfix.dpatch:
+ + Added; fix batch scanning bug, patch from Oliver Rauch.
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 27 Jan 2005 22:14:08 +0100
+
+xsane (0.97-1) unstable; urgency=low
+
+ * New upstream release.
+ + Fixes "filechooser chews up CPU" problem (closes: #287596).
+
+ -- Julien BLACHE <jblache@debian.org> Sat, 22 Jan 2005 20:53:34 +0100
+
+xsane (0.96-1) unstable; urgency=low
+
+ * New upstream release.
+ + The preferences parser has been fixed so that it won't segfault anymore
+ when it doesn't recognize an entry (closes: #143704).
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 9 Sep 2004 11:26:13 +0200
+
+xsane (0.95-1) unstable; urgency=low
+
+ * New upstream release.
+ + debian/patches/10_fix_histo.dpatch: removed; merged upstream.
+
+ -- Julien BLACHE <jblache@debian.org> Mon, 16 Aug 2004 18:56:07 +0200
+
+xsane (0.94-4) unstable; urgency=medium
+
+ * Fixed assertion failures when the histogram window is closed
+ (closes: #259073).
+ * debian/control:
+ + Removed obsolete build-dependency on gcc-3.3 (closes: #262243).
+ + Removed unneeded build-dependency on xlibs-dev.
+
+ -- Julien BLACHE <jblache@debian.org> Tue, 3 Aug 2004 18:14:44 +0200
+
+xsane (0.94-3) unstable; urgency=low
+
+ * libtiff4 transition.
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 29 Jul 2004 08:16:16 +0200
+
+xsane (0.94-2) unstable; urgency=low
+
+ * debian/xsane.postinst
+ + Add a workaround for dpkg bug when replacing a directory with a symlink
+ (closes: #255403).
+ * debian/xsane.desktop
+ + Updated, thanks to Dan Korostelev.
+ + Added Catalan and Spanish translations, courtesy of Jordi Mallach
+ (closes: #254550).
+ + Added a French translation.
+ + I hope I didn't mess things up wrt UTF8...
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 4 Jul 2004 11:40:28 +0200
+
+xsane (0.94-1) unstable; urgency=low
+
+ * New upstream release.
+ + Might break RC file compatibility; if it segfaults on startup, remove
+ your ~/.sane/xsane/xsane.rc (do NOT report that problem).
+ * debian/xsane.desktop
+ + Include fixed xsane.desktop file, courtesy of Dan Korostelev
+ (closes: #247480).
+ * debian/control
+ + Recommends: mozilla-browser | www-browser, as www-browser is a virtual package.
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 10 Jun 2004 17:45:40 +0200
+
+xsane (0.93-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/10_gimp2.0.dpatch:
+ + removed, merged upstream.
+ * debian/copyright:
+ + applied patch from #241999 (closes: #241999).
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 29 Apr 2004 14:48:59 +0200
+
+xsane (0.92-3) unstable; urgency=low
+
+ * xsane-common returns from the dead. Spare some archive space by splitting
+ out documentation in an arch: all package (closes: #233459).
+ * GIMP 2.0 support, finally (closes: #185436, #233496).
+ * Added GNOME/KDE menu entry, courtesy of Dan Korostelev.
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 1 Apr 2004 16:20:39 +0200
+
+xsane (0.92-2) unstable; urgency=low
+
+ * debian/patches/00list: strip the .dpatch suffix, so that the package
+ builds with older versions of dpatch (closes: #229541).
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 25 Jan 2004 12:19:20 +0100
+
+xsane (0.92-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 18 Jan 2004 16:31:42 +0100
+
+xsane (0.91-6) unstable; urgency=low
+
+ * gimp1.2 has been renamed to gimp, reflect this change in debian/control.
+ * Bumped Standards-Version to 3.6.1 (no changes).
+ * debian/compat: use DH_COMPAT=4.
+ * Use libpng10 instead of libpng2.
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 14 Sep 2003 15:54:18 +0200
+
+xsane (0.91-5) unstable; urgency=low
+
+ * Julien BLACHE <jblache@debian.org>
+ * debian/control:
+ + Temporary Build-Dependency on gcc-3.3 (>= 3.3.1-0pre0), which should
+ fix the ICE on arm.
+ * debian/rules:
+ + Should build with -O2 on arm again.
+ * Aurélien Jarno <aurel32@debian.org>
+ * Changed back icon to full colors.
+ * Converted to dpatch. Build-depends on dpatch.
+ * Dont run ./configure twice during the build
+
+ -- Julien BLACHE <jblache@debian.org> Wed, 2 Jul 2003 12:20:45 +0200
+
+xsane (0.91-4) unstable; urgency=low
+
+ * Okay, the ICE on arm still exists, build with -O1 again.
+
+ -- Julien BLACHE <jblache@debian.org> Sat, 31 May 2003 17:31:31 +0200
+
+xsane (0.91-3) unstable; urgency=low
+
+ * GCC 3.3 is in unstable, arm should now build with -O2 (hopefully).
+ * Fix libpng breakage, build-depends on libpng2-dev again.
+ * Do not ship sane-backends-doc.html, sane-pnm-doc.html, they're out-of-date
+ and not useful at all. Also use xsane-logo2.jpg in sane-problems-doc.html
+ and sane-scantips-doc.html (closes: #194222).
+ * Use /usr/bin/sensible-browser rather than www-browser as the default
+ browser.
+ * Standards-Version bumped to 3.5.10 (no changes).
+
+ -- Julien BLACHE <jblache@debian.org> Sat, 31 May 2003 15:50:12 +0200
+
+xsane (0.91-2) unstable; urgency=low
+
+ * Build-depend on libpng10-dev, rather than libpng2-dev.
+ * Use -O1 on arm, as -O2 triggers an ICE.
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 15 May 2003 14:16:58 +0200
+
+xsane (0.91-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes saving files when running as a GIMP plugin (closes: #190437).
+
+ -- Julien BLACHE <jblache@debian.org> Mon, 12 May 2003 19:07:59 +0200
+
+xsane (0.90-4) unstable; urgency=medium
+
+ * Rebuild against libsane (>= 1.0.11-3) to get rid of the libgphoto2-2
+ dependency.
+ * Recommends: www-browser.
+ * Suggests: gocr.
+ * Nuked xsane-gimp1.2.
+ * Use -www-broswer rather than netscape as the default browser for the
+ help system.
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 4 May 2003 16:34:12 +0200
+
+xsane (0.90-3) unstable; urgency=low
+
+ * Added missing gettext Build-Depends.
+ * Bumped Standards-Version to 3.5.8.
+ * In GIMP, scanners are now available from File/Acquire/XSane/*.
+ * Build xsane with GIMP 1.2 support, which means xsane-gimp1.2 is now a dummy
+ package, and xsane-common no longer exists.
+ * Provide a menu-policy-compliant icon.
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 2 Feb 2003 14:25:56 +0100
+
+xsane (0.90-2) unstable; urgency=low
+
+ * Use -a switch in the binary-arch target for all debhelper scripts. Woops. (closes: #174382).
+ * Back out patch for #126118 as it seems unneeded.
+
+ -- Julien BLACHE <jblache@debian.org> Thu, 26 Dec 2002 19:46:39 +0100
+
+xsane (0.90-1) unstable; urgency=low
+
+ * New upstream release.
+ * Manpage now documents -s/--save option (closes: #172544).
+
+ -- Julien BLACHE <jblache@debian.org> Tue, 17 Dec 2002 13:37:50 +0100
+
+xsane (0.89-3) unstable; urgency=low
+
+ * Rebuilt against new libgphoto2.
+ * Changed Uploaders: field so that Aurélien's uploads won't be tagged as
+ NMU again.
+
+ -- Julien BLACHE <jblache@debian.org> Sun, 1 Dec 2002 11:44:00 +0100
+
+xsane (0.89-2) unstable; urgency=low
+
+ * Added a build rule to debian/rules to be Policy-compliant (wrt #167415).
+ * distclean may fail in clean-nogimp.
+ * Explain how the build takes place.
+
+ -- Julien BLACHE <jblache@debian.org> Sat, 2 Nov 2002 11:40:38 +0100
+
+xsane (0.89-1) unstable; urgency=low
+
+ * New upstream release.
+ * No longer auto-selects a 0-pixels-wide area (closes: #164469).
+ * PostScript output includes DSC Page comment (closes: #164189).
+ * Fixed mistakes in description (closes: #165138).
+ * Use the xsane icon provided in source package for menus (closes: #165741).
+
+ -- Julien BLACHE <jblache@debian.org> Wed, 23 Oct 2002 18:11:35 +0200
+
+xsane (0.88-2) unstable; urgency=low
+
+ * New maintainers.
+ * New upstream release (closes: #114604, #152597, #152921).
+ * Tempfiles handling corrected (closes: #55191).
+ * Repackaged from scratch using debhelper.
+ * Standards-Version bumped to 3.5.6.
+ * Applied patch to fix FPE on alpha (closes: #126118).
+ * Build xsane and xsane-gimp1.2 flavours (closes: #81635).
+ * Build a xsane-common containing locales, data and documentation.
+ * Install documentation into /usr/share/doc/xsane-common/html/.
+ * Built against latest gimp 1.2 (closes: #109223).
+ * l10n path fixed (closes: #114876, #154256).
+ * libusb dependency fixed (closes: #126117).
+ * libpng dependency sorted out (closes: #156883, #156627).
+
+ -- Julien BLACHE <jblache@debian.org> Sat, 12 Oct 2002 11:44:47 +0200
+
+xsane (0.88-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 6 Oct 2002 19:48:27 -0700
+
+xsane (0.84-2) unstable; urgency=low
+
+ * relinked with libusb-0.1-4.
+
+ -- Kevin Dalley <kevind@rahul.net> Fri, 15 Mar 2002 14:20:02 +0000
+
+xsane (0.84-1) unstable; urgency=low
+
+ * new upstream release.
+ * relinked with new libpng-dev (closes: #136711).
+
+ -- Kevin Dalley <kevind@rahul.net> Thu, 14 Mar 2002 02:23:44 +0000
+
+xsane (0.72-2) unstable; urgency=low
+
+ * New upstream version of xsane (closes: #105785).
+
+ -- Kevin Dalley <kevind@rahul.net> Wed, 3 Oct 2001 00:36:17 -0700
+
+xsane (0.72-1) unstable; urgency=low
+
+ * New upstream version of xsane. Many changes.
+
+ -- Kevin Dalley <kevind@rahul.net> Mon, 12 Mar 2001 10:32:10 +0000
+
+xsane (0.70-1) unstable; urgency=low
+
+ * new upstream release of xsane.
+
+ -- Kevin Dalley <kevind@rahul.net> Mon, 15 Jan 2001 04:16:25 -0800
+
+xsane (0.63-1) unstable; urgency=low
+
+ * new upstream version of xsane
+ * link sane-gimp1.1 with libgimp1.1-1.1.29.
+ * change control files so that packages sane and sane-gimp1.1 are
+ explicitly described as working with gimp and gimp1.1 respectively.
+ The package sane now mentions the packages sane-gimp1.1 and vice
+ versa.
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 5 Nov 2000 16:43:07 -0800
+
+xsane (0.62-1) unstable; urgency=low
+
+ * New upstream version of xsane.
+
+ -- Kevin Dalley <kevind@rahul.net> Sat, 21 Oct 2000 16:35:58 -0700
+
+xsane (0.61-2) unstable; urgency=low
+
+ * link xsane-gimp1.1 with libgimp1.1, which is new library.
+
+ -- Kevin Dalley <kevind@rahul.net> Sat, 21 Oct 2000 16:25:04 -0700
+
+xsane (0.61-1) unstable; urgency=low
+
+ * new upstream release of xsane.
+
+ -- Kevin Dalley <kevind@rahul.net> Sat, 9 Sep 2000 15:06:04 -0700
+
+xsane (0.59-1) unstable; urgency=low
+
+ * new upstream release of xsane
+ * added preview support for 16bpp
+ * miscellaneous changes and improvements
+
+ -- Kevin Dalley <kevind@rahul.net> Tue, 4 Jul 2000 16:47:55 -0700
+
+xsane (0.50-7) unstable; urgency=low
+
+ * link xsane-gimp1.1 with libgimp1.1.22, which is the most recent
+ libgimp1.1 in unstable.
+
+ -- Kevin Dalley <kevind@rahul.net> Mon, 3 Jul 2000 23:03:21 -0700
+
+xsane (0.50-6) unstable; urgency=low
+
+ * link xsane-gimp1.1 with libgimp1.1.19, which is the most recent
+ libgimp1.1 in unstable.
+
+ -- Kevin Dalley <kevind@rahul.net> Fri, 7 Apr 2000 14:51:00 -0700
+
+xsane (0.50-5) frozen unstable; urgency=low
+
+ * added to Build-Depends: libjpeg62-dev, libsane-dev, zlib1g-dev,
+ libtiff3g-dev, libpng2-dev (closes: #61836, #61837)
+
+ -- Kevin Dalley <kevind@rahul.net> Wed, 5 Apr 2000 08:35:17 -0700
+
+xsane (0.50-4) frozen unstable; urgency=low
+
+ * Add Build-Depends to control files for xsane and xsane-gimp1.1 (closes:
+ #60923).
+
+ -- Kevin Dalley <kevind@rahul.net> Mon, 27 Mar 2000 03:17:21 -0800
+
+xsane (0.50-3) frozen unstable; urgency=low
+
+ * link xsane-gimp1.1 with libgimp1.1.17, which is the most recent
+ libgimp1.1 in frozen.
+
+ -- Kevin Dalley <kevind@rahul.net> Mon, 28 Feb 2000 02:34:45 +0000
+
+xsane (0.50-2) frozen unstable; urgency=low
+
+ * link xsane-gimp1.1 with libgimp1.1.15, which is the most recent
+ libgimp1.1 in frozen.
+
+ -- Kevin Dalley <kevind@rahul.net> Sat, 22 Jan 2000 02:00:21 -0800
+
+xsane (0.50-1) unstable; urgency=low
+
+ * fixed a number of bugs in 0.49
+ * xsane now conflicts with gimp1.1, which increases the chances of
+ getting the correct versions of gimp with each version of xsane.
+ Unfortunately, xsane-gimp1.1 cannot conflict with gimp, since gimp1.1
+ provides gimp.
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 16 Jan 2000 11:32:55 -0800
+
+xsane (0.49-1) unstable; urgency=low
+
+ * removed LZW compression from TIFF.
+ * many other changes and updates.
+ * fixed html link (closes: #51107).
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 9 Jan 2000 23:03:58 -0800
+
+xsane (0.42-1) unstable; urgency=low
+
+ * fixed problem with saving file to png
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 7 Nov 1999 03:05:56 -0800
+
+xsane (0.41-2) unstable; urgency=low
+
+ * corrected link to xsane which is by gimp
+
+ -- Kevin Dalley <kevind@rahul.net> Mon, 1 Nov 1999 14:24:15 -0800
+
+xsane-gimp1.1 (0.41-1) unstable; urgency=low
+
+ * various small fixes.
+ * moved documentation to /usr/share/doc (closes: #37791).
+ * registers xsane documentation with doc-base.
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 31 Oct 1999 05:37:48 -0800
+
+xsane (0.40-1) unstable; urgency=low
+
+ * new release of xsane
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 24 Oct 1999 13:37:12 -0700
+
+xsane (0.39-2) unstable; urgency=low
+
+ * corrected documentation link for xsane-gimp1.1
+
+ -- Kevin Dalley <kevind@rahul.net> Fri, 15 Oct 1999 10:06:15 -0700
+
+xsane (0.39-1) unstable; urgency=low
+
+ * new upstream release
+
+ -- Kevin Dalley <kevind@rahul.net> Fri, 15 Oct 1999 01:30:15 -0700
+
+xsane (0.38-1) unstable; urgency=low
+
+ * changed brightness and contrast range maximum form 300 to 400 %
+ * added continuous update to histogram sliders and preview selection
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 10 Oct 1999 12:25:17 -0700
+
+xsane (0.37-1) unstable; urgency=low
+
+ * implemented real single-bit format for tiff
+ * setup/jpeg quality selection is enabled if jpeglib or libtiff is available
+ * miscellaneous other bug fixes and enhancements.
+ * separate sane-gimp1.1 from xsane
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 10 Oct 1999 04:40:11 -0700
+
+xsane (0.33-2) unstable; urgency=low
+
+ * link xsane-gimp1.1 with libgimp-1.1.so.7 (closes: #44512)
+
+ -- Kevin Dalley <kevind@rahul.net> Wed, 8 Sep 1999 15:29:25 -0700
+
+xsane (0.33-1) unstable; urgency=low
+
+ * updated to version 0.33 of xsane
+
+ -- Kevin Dalley <kevind@rahul.net> Sat, 28 Aug 1999 14:07:06 -0700
+
+xsane (0.31-1) unstable; urgency=low
+
+ * added support for Automatic Document Feeder (scan until error)
+ * many other changes
+
+ -- Kevin Dalley <kevind@rahul.net> Mon, 2 Aug 1999 23:14:58 -0700
+
+xsane (0.30-1) unstable; urgency=low
+
+ * pipette functions: middle mouse button defines shadow/gray/highlight
+ for color components, left mouse button only defines gray values!
+ * improved calculation of auto enhancement values
+ * many more improvements
+
+ -- Kevin Dalley <kevind@rahul.net> Fri, 23 Jul 1999 00:10:42 -0700
+
+xsane (0.29-1) unstable; urgency=low
+
+ * xsane-mode can be selected as command line option
+ * fixed bugs
+
+ -- Kevin Dalley <kevind@rahul.net> Fri, 16 Jul 1999 18:41:39 -0700
+
+xsane (0.28-2) unstable; urgency=low
+
+ * change in xsane-front-gtk.c prevents core dump in fax with some
+ scanners.
+
+ -- Kevin Dalley <kevind@rahul.net> Tue, 13 Jul 1999 00:29:36 -0700
+
+xsane (0.28-1) unstable; urgency=low
+
+ * increased contrast to improve scanning of negatives
+ * added selection for number of copies in copy mode
+ * added option negative into enhancement and changed create_gamma
+ draw_histogram and auto_enhancement to work with it!
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 11 Jul 1999 11:55:21 -0700
+
+xsane (0.27-1) unstable; urgency=low
+
+ * user can now reduce the preview area.
+ * fax options are saved.
+
+ -- Kevin Dalley <kevind@rahul.net> Fri, 2 Jul 1999 00:44:28 -0700
+
+xsane (0.26-1) unstable; urgency=low
+
+ * added Pipette functions (pick black, gray and white) - mouse pointer
+ does change to pipetty icon
+ * many other changes.
+ * Now explicitly depends upon libsane, if compiled with fixed version of
+ sane (1.0.1-3).
+ * closes: #37756.
+
+ -- Kevin Dalley <kevind@rahul.net> Sun, 27 Jun 1999 11:46:47 -0700
+
+xsane (0.25-1) unstable; urgency=low
+
+ * miscellaneous changes, updated release
+
+ -- Kevin Dalley <kevind@rahul.net> Wed, 19 May 1999 01:40:40 -0700
+
+xsane (0.22-1) unstable; urgency=low
+
+ * first Debian release of xsane, a gtk based X11 frontend for SANE
+
+ -- Kevin Dalley <kevind@rahul.net> Mon, 26 Apr 1999 23:03:13 -0700
+
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..491230f
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,42 @@
+Source: xsane
+Section: graphics
+Priority: optional
+Maintainer: Julien BLACHE <jblache@debian.org>
+Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), dpatch, libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, liblcms1-dev, libsane-dev (>= 1.0.11-3), zlib1g-dev, gettext, autotools-dev
+
+Package: xsane
+Section: graphics
+Architecture: any
+Depends: xsane-common (= ${source:Version}), ${shlibs:Depends}
+Recommends: iceweasel | www-browser, cups-client
+Suggests: gimp, hylafax-client | mgetty-fax, gv, gocr
+Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
+ xsane can be run as a stand-alone program or through the GIMP image
+ manipulation program. In stand-alone mode, xsane can save an image
+ to a file in a variety of image formats, serve as a frontend to a
+ fax program, or send an image to a printer.
+ .
+ SANE stands for "Scanner Access Now Easy" and is an application
+ programming interface (API) that provides standardized access to any
+ raster image scanner hardware (flatbed scanner, hand-held scanner,
+ video- and still-cameras, frame-grabbers, etc.). The SANE standard is
+ free and its discussion and development are open to everybody. The
+ current source code is written to support several operating systems,
+ including GNU/Linux, OS/2, Win32 and various Unices and is available
+ under the GNU General Public License (commercial applications and
+ backends are welcome, too, however).
+
+Package: xsane-common
+Section: graphics
+Architecture: all
+Replaces: xsane
+Recommends: xsane
+Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
+ xsane can be run as a stand-alone program or through the GIMP image
+ manipulation program. In stand-alone mode, xsane can save an image
+ to a file in a variety of image formats, serve as a frontend to a
+ fax program, or send an image to a printer.
+ .
+ This package contains architecture-independent files needed by xsane
+ (locales, help).
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..52b22a1
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,32 @@
+This package was first debianized by Kevin Dalley kevind@rahul.net.
+It is now maintained by Julien BLACHE <jblache@debian.org> and
+Aurélien JARNO <aurel32@debian.org>.
+
+It was downloaded from : ftp://ftp.sane-project.org/pub/sane/xsane/
+
+Upstream Author : Oliver Rauch <Oliver.Rauch@xsane.org>
+
+
+Copyright:
+
+ Copyright (C) 1998-2005 Oliver Rauch
+
+License:
+
+ This program is free software; you can 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 of the License, or
+ (at your option) any later version.
+
+ This program 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+On Debian systems, a copy of the GNU General Public License (GPL) is available
+in the file /usr/share/common-licenses/GPL.
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..3d24b66
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,8 @@
+01_printing_defaults
+02_docviewer
+03_gimp_acquire_menu
+04_inhibit_clickthrough
+05_options_handling_fix
+06_fix_pdf_xref
+10_broken_links
+
diff --git a/debian/patches/01_printing_defaults.dpatch b/debian/patches/01_printing_defaults.dpatch
new file mode 100644
index 0000000..7f037bc
--- /dev/null
+++ b/debian/patches/01_printing_defaults.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_printing_defaults.dpatch by <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change default printing options, switch from lpr to lp.
+
+@DPATCH@
+diff -urNad xsane-0.995~/src/xsane.h xsane-0.995/src/xsane.h
+--- xsane-0.995~/src/xsane.h 2008-09-08 11:02:36.000000000 +0200
++++ xsane-0.995/src/xsane.h 2008-09-08 11:03:17.191704659 +0200
+@@ -510,8 +510,8 @@
+
+ #define OUT_FILENAME "out.pnm"
+ #define PRINTERNAME "new printer"
+-#define PRINTERCOMMAND "lpr"
+-#define PRINTERCOPYNUMBEROPTION "-#"
++#define PRINTERCOMMAND "lp"
++#define PRINTERCOPYNUMBEROPTION "-n"
+ #define FAXPROJECT "faxproject"
+ #define FAXCOMMAND "sendfax"
+ #define FAXRECEIVEROPT "-d"
diff --git a/debian/patches/02_docviewer.dpatch b/debian/patches/02_docviewer.dpatch
new file mode 100644
index 0000000..8dd70e8
--- /dev/null
+++ b/debian/patches/02_docviewer.dpatch
@@ -0,0 +1,37 @@
+#!/bin/sh -e
+## 02_docviewer.dpatch.dpatch by Aurelien Jarno <aurel32@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change default browser to /usr/bin/sensible-browser.
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad xsane-0.995~/src/xsane.h xsane-0.995/src/xsane.h
+--- xsane-0.995~/src/xsane.h 2007-08-13 09:20:32.000000000 +0200
++++ xsane-0.995/src/xsane.h 2007-11-22 11:24:15.068421579 +0100
+@@ -251,7 +251,7 @@
+ # elif defined(HAVE_OS2_H)
+ # define DEFAULT_BROWSER "netscape"
+ # else
+-# define DEFAULT_BROWSER "netscape"
++# define DEFAULT_BROWSER "/usr/bin/sensible-browser"
+ # endif
+ #endif
+
diff --git a/debian/patches/03_gimp_acquire_menu.dpatch b/debian/patches/03_gimp_acquire_menu.dpatch
new file mode 100644
index 0000000..0909faf
--- /dev/null
+++ b/debian/patches/03_gimp_acquire_menu.dpatch
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+## 03_gimp_acquire_menu.dpatch.dpatch by Aurelien Jarno <aurel32@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Group XSane actions in their own submenu in the Acquire menu.
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad xsane-0.995~/src/xsane-text.h xsane-0.995/src/xsane-text.h
+--- xsane-0.995~/src/xsane-text.h 2007-08-13 09:16:43.000000000 +0200
++++ xsane-0.995/src/xsane-text.h 2007-11-22 11:24:49.170421498 +0100
+@@ -869,8 +869,8 @@
+ #define XSANE_GIMP_INSTALL_HELP _("This function provides access to scanners and other image acquisition devices through the SANE (Scanner Access Now Easy) interface.")
+
+ /* Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/" */
+-#define XSANE_GIMP_MENU_DIALOG _("<Toolbox>/File/Acquire/XSane: Device dialog...")
+-#define XSANE_GIMP_MENU _("<Toolbox>/File/Acquire/XSane: ")
++#define XSANE_GIMP_MENU_DIALOG _("<Toolbox>/File/Acquire/XSane/Device dialog...")
++#define XSANE_GIMP_MENU _("<Toolbox>/File/Acquire/XSane/")
+ #define XSANE_GIMP_MENU_DIALOG_OLD _("<Toolbox>/Xtns/XSane/Device dialog...")
+ #define XSANE_GIMP_MENU_OLD _("<Toolbox>/Xtns/XSane/")
+
diff --git a/debian/patches/04_inhibit_clickthrough.dpatch b/debian/patches/04_inhibit_clickthrough.dpatch
new file mode 100644
index 0000000..d38727b
--- /dev/null
+++ b/debian/patches/04_inhibit_clickthrough.dpatch
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_inhibit_clickthrough.dpatch by <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Finally give up and inhibit the license clickthrough.
+
+@DPATCH@
+diff -urNad xsane-0.995~/src/xsane.c xsane-0.995/src/xsane.c
+--- xsane-0.995~/src/xsane.c 2007-09-28 17:24:56.000000000 +0200
++++ xsane-0.995/src/xsane.c 2008-04-11 18:56:55.120439147 +0200
+@@ -1901,11 +1901,11 @@
+ /* ---------------------------------------------------------------------------------------------------------------------- */
+
+ static int xsane_pref_restore(void)
+-/* returns true if this is the first time this xsane version is called */
++/* Originally: returns true if this is the first time this xsane version is called */
+ {
+ char filename[PATH_MAX];
+ int fd;
+- int result = TRUE;
++ int result = FALSE;
+ int i;
+
+ DBG(DBG_proc, "xsane_pref_restore\n");
+@@ -1919,6 +1919,7 @@
+ preferences_restore(fd);
+ close(fd);
+
++#if 0
+ /* the version test only is done for the local xsane.rc file because each user */
+ /* shall accept (or not) the license for xsane */
+ if (preferences.xsane_version_str)
+@@ -1928,6 +1929,7 @@
+ result = FALSE; /* this version already has been started */
+ }
+ }
++#endif /* 0 */
+ }
+ else /* no local sane file, look for system file */
+ {
+@@ -5795,7 +5797,10 @@
+ xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */
+ }
+
++ xsane_pref_restore();
++ xsane_pref_save();
+
++#if 0 /* Original XSane code */
+ if (xsane_pref_restore()) /* restore preferences, returns TRUE if license is not accpted yet */
+ {
+ if (xsane_display_eula(1)) /* show license and ask for accept/not accept */
+@@ -5808,6 +5813,7 @@
+ xsane_pref_save();
+ }
+ }
++#endif /* Original XSane code */
+
+ xsane_pref_restore_media();
+
diff --git a/debian/patches/05_options_handling_fix.dpatch b/debian/patches/05_options_handling_fix.dpatch
new file mode 100644
index 0000000..31619f7
--- /dev/null
+++ b/debian/patches/05_options_handling_fix.dpatch
@@ -0,0 +1,242 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_options_handling_fix.dpatch by <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Duplicate string values for options with constraint type of
+## DP: SANE_CONSTRAINT_STRING_LIST. The string list is not guaranteed to
+## DP: be stable, and actually isn't stable when the net backend is used.
+
+@DPATCH@
+diff -urNad xsane-0.995~/src/xsane-back-gtk.c xsane-0.995/src/xsane-back-gtk.c
+--- xsane-0.995~/src/xsane-back-gtk.c 2008-07-25 18:53:38.000000000 +0200
++++ xsane-0.995/src/xsane-back-gtk.c 2008-07-25 18:53:45.764102480 +0200
+@@ -2226,11 +2226,13 @@
+ /* ----------------------------------------------------------------------------------------------------------------- */
+
+ void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],
+- const char *val, DialogElement *elem,
++ const char *val, SANE_Constraint_Type constraint_type, DialogElement *elem,
+ GtkTooltips *tooltips, const char *desc, SANE_Int settable)
+ {
+ GtkWidget *hbox, *label, *option_menu, *menu, *item;
+ MenuItem *menu_items;
++ int dup_string;
++ char *strval;
+ int i, num_items;
+
+ DBG(DBG_proc, "xsane_back_gtk_option_menu_new(%s)\n", name);
+@@ -2248,16 +2250,23 @@
+
+ menu_items = malloc((num_items + 1) * sizeof(menu_items[0]));
+
++ dup_string = (constraint_type == SANE_CONSTRAINT_STRING_LIST);
++
+ menu = gtk_menu_new();
+ for (i = 0; i < num_items; ++i)
+ {
+- item = gtk_menu_item_new_with_label(_BGT(str_list[i]));
++ if (dup_string)
++ strval = strdup(str_list[i]);
++ else
++ strval = str_list[i];
++
++ item = gtk_menu_item_new_with_label(_BGT(strval));
+ gtk_container_add(GTK_CONTAINER(menu), item);
+ g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_back_gtk_option_menu_callback, menu_items + i);
+
+ gtk_widget_show(item);
+
+- menu_items[i].label = str_list[i];
++ menu_items[i].label = strval;
+ menu_items[i].elem = elem;
+ menu_items[i].index = i;
+ }
+@@ -2403,14 +2412,15 @@
+ xsane.standard_hbox = NULL;
+ xsane.advanced_hbox = NULL;
+
+- /* free the menu labels of integer/fix-point word-lists: */
++ /* free the menu labels */
+ for (i = 0; i < xsane.num_elements; ++i)
+ {
+ if (xsane.element[i].menu)
+ {
+ opt = xsane_get_option_descriptor(xsane.dev, i);
+ elem = xsane.element + i;
+- if (opt->type != SANE_TYPE_STRING)
++ if ((opt->type != SANE_TYPE_STRING)
++ || (opt->constraint_type == SANE_CONSTRAINT_STRING_LIST))
+ {
+ for (j = 0; j < elem->menu_size; ++j)
+ {
+diff -urNad xsane-0.995~/src/xsane-back-gtk.h xsane-0.995/src/xsane-back-gtk.h
+--- xsane-0.995~/src/xsane-back-gtk.h 2008-07-25 18:53:38.000000000 +0200
++++ xsane-0.995/src/xsane-back-gtk.h 2008-07-25 18:53:45.764102480 +0200
+@@ -117,7 +117,7 @@
+ gfloat quant, int automatic,
+ DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
+ extern void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],
+- const char *val, DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
++ const char *val, SANE_Constraint_Type constraint_type, DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
+ extern void xsane_back_gtk_text_entry_new(GtkWidget *parent, const char *name, const char *val,
+ DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
+ extern void xsane_back_gtk_push_button_callback(GtkWidget *widget, gpointer data);
+diff -urNad xsane-0.995~/src/xsane-front-gtk.c xsane-0.995/src/xsane-front-gtk.c
+--- xsane-0.995~/src/xsane-front-gtk.c 2008-07-25 18:53:38.000000000 +0200
++++ xsane-0.995/src/xsane-front-gtk.c 2008-07-25 18:53:58.887267644 +0200
+@@ -64,10 +64,10 @@
+ int *state, void *xsane_toggle_button_callback);
+ GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc,
+ void *xsane_button_callback, gpointer data);
+-void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, int option_number, const char *desc,
++void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, SANE_Constraint_Type constraint_type, int option_number, const char *desc,
+ void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
+ void xsane_option_menu_new_with_pixmap(GdkWindow *window, GtkBox *parent, const char *xpm_d[], const char *desc,
+- char *str_list[], const char *val,
++ char *str_list[], const char *val, SANE_Constraint_Type constraint_type,
+ GtkWidget **data, int option,
+ void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
+ void xsane_range_new(GtkBox *parent, char *labeltext, const char *desc,
+@@ -1007,12 +1007,14 @@
+
+ /* ---------------------------------------------------------------------------------------------------------------------- */
+
+-void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, int option_number, const char *desc,
++void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, SANE_Constraint_Type constraint_type, int option_number, const char *desc,
+ void *option_menu_callback, SANE_Int settable, const gchar *widget_name)
+ {
+ GtkWidget *option_menu, *menu, *item;
+ MenuItem *menu_items;
+ DialogElement *elem;
++ int dup_string;
++ char *strval;
+ int i, num_items;
+
+ DBG(DBG_proc, "xsane_option_menu_new\n");
+@@ -1031,9 +1033,16 @@
+ gtk_widget_set_name(menu, widget_name);
+ }
+
++ dup_string = (constraint_type == SANE_CONSTRAINT_STRING_LIST);
++
+ for (i = 0; i < num_items; ++i)
+ {
+- item = gtk_menu_item_new_with_label(_BGT(str_list[i]));
++ if (dup_string)
++ strval = strdup(str_list[i]);
++ else
++ strval = str_list[i];
++
++ item = gtk_menu_item_new_with_label(_BGT(strval));
+ gtk_container_add(GTK_CONTAINER(menu), item);
+
+ if (option_menu_callback)
+@@ -1047,7 +1056,7 @@
+
+ gtk_widget_show(item);
+
+- menu_items[i].label = str_list[i];
++ menu_items[i].label = strval;
+ menu_items[i].elem = elem;
+ menu_items[i].index = i;
+ }
+@@ -1075,7 +1084,7 @@
+ /* ---------------------------------------------------------------------------------------------------------------------- */
+
+ void xsane_option_menu_new_with_pixmap(GdkWindow *window, GtkBox *parent, const char *xpm_d[], const char *desc,
+- char *str_list[], const char *val,
++ char *str_list[], const char *val, SANE_Constraint_Type constraint_type,
+ GtkWidget **data, int option,
+ void *option_menu_callback, SANE_Int settable, const gchar *widget_name)
+ {
+@@ -1094,7 +1103,7 @@
+ gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 2);
+ gtk_widget_show(pixmapwidget);
+
+- xsane_option_menu_new(hbox, str_list, val, option, desc, option_menu_callback, settable, widget_name);
++ xsane_option_menu_new(hbox, str_list, val, constraint_type, option, desc, option_menu_callback, settable, widget_name);
+ gtk_widget_show(hbox);
+ }
+
+diff -urNad xsane-0.995~/src/xsane-front-gtk.h xsane-0.995/src/xsane-front-gtk.h
+--- xsane-0.995~/src/xsane-front-gtk.h 2008-07-25 18:53:38.000000000 +0200
++++ xsane-0.995/src/xsane-front-gtk.h 2008-07-25 18:53:45.768101033 +0200
+@@ -54,10 +54,10 @@
+ extern GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc,
+ void *xsane_button_callback, gpointer data);
+ extern void xsane_pixmap_new(GtkWidget *parent, char *title, int width, int height, XsanePixmap *hist);
+-extern void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, int option_number, const char *desc,
++extern void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, SANE_Constraint_Type constraint_type, int option_number, const char *desc,
+ void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
+ extern void xsane_option_menu_new_with_pixmap(GdkWindow *window, GtkBox *parent, const char *xpm_d[], const char *desc,
+- char *str_list[], const char *val,
++ char *str_list[], const char *val, SANE_Constraint_Type constraint_type,
+ GtkWidget **data, int option,
+ void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
+ extern void xsane_range_new(GtkBox *parent, char *labeltext, const char *desc,
+diff -urNad xsane-0.995~/src/xsane.c xsane-0.995/src/xsane.c
+--- xsane-0.995~/src/xsane.c 2008-07-25 18:53:45.132101694 +0200
++++ xsane-0.995/src/xsane.c 2008-07-25 18:53:45.772100494 +0200
+@@ -876,7 +876,7 @@
+ str_list[j] = 0;
+ sprintf(str, "%d", (int) val);
+
+- xsane_option_menu_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(parent), image_xpm, desc, str_list, str, &resolution_widget, well_known_option,
++ xsane_option_menu_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(parent), image_xpm, desc, str_list, str, opt->constraint_type, &resolution_widget, well_known_option,
+ xsane_resolution_list_callback, SANE_OPTION_IS_SETTABLE(opt->cap), widget_name);
+
+ free(str_list);
+@@ -931,7 +931,7 @@
+
+
+ xsane_option_menu_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(parent), image_xpm, desc,
+- str_list, str, &resolution_widget, well_known_option,
++ str_list, str, opt->constraint_type, &resolution_widget, well_known_option,
+ xsane_resolution_list_callback, SANE_OPTION_IS_SETTABLE(opt->cap), widget_name);
+ free(str_list);
+ }
+@@ -1490,7 +1490,7 @@
+ set = malloc(opt->size);
+ status = xsane_control_option(xsane.dev, xsane.well_known.scansource, SANE_ACTION_GET_VALUE, set, 0);
+
+- xsane_option_menu_new(hbox, (char **) opt->constraint.string_list, set, xsane.well_known.scansource,
++ xsane_option_menu_new(hbox, (char **) opt->constraint.string_list, set, opt->constraint_type, xsane.well_known.scansource,
+ _BGT(opt->desc), 0, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
+ }
+ break;
+@@ -1529,7 +1529,7 @@
+ set = malloc(opt->size);
+ status = xsane_control_option(xsane.dev, xsane.well_known.scanmode, SANE_ACTION_GET_VALUE, set, 0);
+
+- xsane_option_menu_new(hbox, (char **) opt->constraint.string_list, set, xsane.well_known.scanmode,
++ xsane_option_menu_new(hbox, (char **) opt->constraint.string_list, set, opt->constraint_type, xsane.well_known.scanmode,
+ _BGT(opt->desc), xsane_scanmode_menu_callback, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
+ }
+ break;
+@@ -4635,7 +4635,7 @@
+ }
+ str_list[j] = 0;
+ sprintf(str, "%d", val);
+- xsane_back_gtk_option_menu_new(parent, title, str_list, str, elem, xsane.tooltips, _BGT(opt->desc),
++ xsane_back_gtk_option_menu_new(parent, title, str_list, str, opt->constraint_type, elem, xsane.tooltips, _BGT(opt->desc),
+ SANE_OPTION_IS_SETTABLE(opt->cap));
+ free(str_list);
+ gtk_widget_show(parent->parent);
+@@ -4733,7 +4733,7 @@
+ }
+ str_list[j] = 0;
+ sprintf(str, "%g", SANE_UNFIX(val));
+- xsane_back_gtk_option_menu_new(parent, title, str_list, str, elem, xsane.tooltips, _BGT(opt->desc), SANE_OPTION_IS_SETTABLE(opt->cap));
++ xsane_back_gtk_option_menu_new(parent, title, str_list, str, opt->constraint_type, elem, xsane.tooltips, _BGT(opt->desc), SANE_OPTION_IS_SETTABLE(opt->cap));
+ free (str_list);
+ gtk_widget_show(parent->parent);
+ }
+@@ -4770,7 +4770,7 @@
+ (strcmp (opt->name, SANE_NAME_SCAN_SOURCE) != 0) ) /* do not show scansource */
+ {
+ /* use a "list-selection" widget */
+- xsane_back_gtk_option_menu_new(parent, title, (char **) opt->constraint.string_list, buf,
++ xsane_back_gtk_option_menu_new(parent, title, (char **) opt->constraint.string_list, buf, opt->constraint_type,
+ elem, xsane.tooltips, _BGT(opt->desc), SANE_OPTION_IS_SETTABLE(opt->cap));
+ gtk_widget_show (parent->parent);
+ }
diff --git a/debian/patches/06_fix_pdf_xref.dpatch b/debian/patches/06_fix_pdf_xref.dpatch
new file mode 100644
index 0000000..60cc285
--- /dev/null
+++ b/debian/patches/06_fix_pdf_xref.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_fix_pdf_xref.dpatch by <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Mark non-existent objects as free in the xref table.
+
+@DPATCH@
+diff -urNad xsane-0.995~/src/xsane-multipage-project.c xsane-0.995/src/xsane-multipage-project.c
+--- xsane-0.995~/src/xsane-multipage-project.c 2007-05-17 14:57:31.000000000 +0200
++++ xsane-0.995/src/xsane-multipage-project.c 2008-09-17 21:54:28.871207862 +0200
+@@ -973,6 +973,10 @@
+ else if (output_format == XSANE_PDF)
+ {
+ xsane_save_pdf_create_document_header(outfile, &xref, pages, preferences.save_pdf_flatedecoded);
++
++ /* Objects 4 and 5 are unused and do not exist */
++ xref.obj[4] = 0;
++ xref.obj[5] = 0;
+ }
+ }
+ #ifdef HAVE_LIBTIFF
diff --git a/debian/patches/10_broken_links.dpatch b/debian/patches/10_broken_links.dpatch
new file mode 100644
index 0000000..8e30119
--- /dev/null
+++ b/debian/patches/10_broken_links.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_broken_links.dpatch by <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix broken links in HTML documentation.
+
+@DPATCH@
+diff -urNad xsane-0.995~/doc/sane-xsane-doc.html xsane-0.995/doc/sane-xsane-doc.html
+--- xsane-0.995~/doc/sane-xsane-doc.html 2007-03-03 14:11:32.000000000 +0100
++++ xsane-0.995/doc/sane-xsane-doc.html 2007-11-22 11:25:36.385421627 +0100
+@@ -165,8 +165,7 @@
+ <li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
+ <li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
+ <li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
+-<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
+-<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
++<li><a href="sane-xsane-setup-email-doc.html">Mail setup</a></li>
+ <li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
+ <li><a href="sane-xsane-setup-color-management-doc.html">Color management setup</a></li>
+ </ul>
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..7a628fd
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,162 @@
+#!/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
+
+# Include dpatch rules
+include /usr/share/dpatch/dpatch.make
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+
+autotools: autotools-stamp
+autotools-stamp:
+ rm -f config.sub config.guess
+ ln -s /usr/share/misc/config.sub config.sub
+ ln -s /usr/share/misc/config.guess config.guess
+ touch autotools-stamp
+
+config.status: autotools-stamp configure
+ dh_testdir
+ # Add here commands to configure the package.
+ ./configure --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --enable-gimp
+
+build: build-stamp
+build-stamp: patch-stamp config.status
+ dh_testdir
+
+ # Add here commands to compile the package.
+ # Point the docdir to xsane-common, as the doc is in this package
+ $(MAKE) xsanedocdir=\$${datadir}/doc/xsane-common/html
+
+ touch build-stamp
+
+clean: real-clean unpatch
+real-clean:
+ dh_testdir
+ dh_testroot
+ rm -f autotools-stamp build-stamp
+
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ rm -f config.sub config.guess
+ rm -f po/*.gmo
+
+ dh_clean
+
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # The docdir is set to a directory provided by xsane-common
+ # so that the documentation can be found at runtime
+ $(MAKE) install prefix=$(CURDIR)/debian/xsane/usr \
+ xsanedocdir=\$${datadir}/doc/xsane-common/html
+
+ install -m 0644 src/xsane-32x32.xpm \
+ debian/xsane/usr/share/pixmaps/xsane.xpm
+
+ install -m 0644 debian/xsane.desktop \
+ debian/xsane/usr/share/applications
+
+ # we don't want the locales, nor the HTML documentation to be in
+ # this package (provided in xsane-common)
+ rm -rf debian/xsane/usr/share/sane
+ rm -rf debian/xsane/usr/share/doc/xsane/html
+ rm -rf debian/xsane/usr/share/locale
+ rm -rf debian/xsane/usr/share/doc/xsane-common
+
+ rm -rf debian/xsane/usr/sbin
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+
+ ./configure --prefix=/usr --mandir=\$${prefix}/share/man
+
+ $(MAKE) -C doc install prefix=$(CURDIR)/debian/xsane-common/usr \
+ xsanedocdir=\$${datadir}/doc/xsane-common/html
+
+ rm -rf debian/xsane-common/usr/share/pixmaps
+
+ # remove outdated/useless documentation
+ rm -f debian/xsane-common/usr/share/doc/xsane-common/html/sane-backends-doc.html
+ rm -f debian/xsane-common/usr/share/doc/xsane-common/html/sane-pnm-doc.html
+
+ # manpages go in the binary packages
+ rm -rf debian/xsane-common/usr/share/man
+
+ $(MAKE) -C po install prefix=$(CURDIR)/debian/xsane-common/usr
+
+ install -d debian/xsane-common/usr/share/sane/xsane
+ install -m 0644 src/xsane-style.rc debian/xsane-common/usr/share/sane/xsane
+ install -m 0644 src/xsane-startimage.pnm debian/xsane-common/usr/share/sane/xsane
+ install -m 0644 src/xsane-calibration.pnm debian/xsane-common/usr/share/sane/xsane
+ install -m 0644 src/xsane-logo.xpm debian/xsane-common/usr/share/sane/xsane
+ install -m 0644 src/xsane-gpl.txt debian/xsane-common/usr/share/sane/xsane
+ install -m 0644 src/xsane-eula.txt debian/xsane-common/usr/share/sane/xsane
+ cd src && \
+ for logo in *-logo.xpm; do \
+ install -m 0644 $${logo} ../debian/xsane-common/usr/share/sane/xsane/$${logo} ; \
+ done && \
+ cd -
+
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i
+# dh_installexamples -i
+ dh_installman -i
+# dh_installinfo -i
+ dh_installchangelogs -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdocs -a
+# dh_installexamples -a
+ dh_installmenu -a
+ dh_installman -a
+# dh_installinfo -a
+ dh_installchangelogs -a xsane.CHANGES
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch real-clean
diff --git a/debian/xsane-common.dirs b/debian/xsane-common.dirs
new file mode 100644
index 0000000..c1da623
--- /dev/null
+++ b/debian/xsane-common.dirs
@@ -0,0 +1 @@
+usr/share/pixmaps
diff --git a/debian/xsane-common.doc-base b/debian/xsane-common.doc-base
new file mode 100644
index 0000000..4df3e91
--- /dev/null
+++ b/debian/xsane-common.doc-base
@@ -0,0 +1,15 @@
+Document: xsane
+Title: Xsane
+Author: Oliver Rauch
+Abstract: This manual describes how to use xsane as a frontend to
+ hardware scanners. Xsane is a gtk-based X11 frontend for SANE
+ (Scanner Access Now Easy). SANE stands for "Scanner Access Now Easy"
+ and is an application programming interface (API) that provides
+ standardized access to any raster image scanner hardware (flatbed
+ scanner, hand-held scanner, video- and still-cameras, frame-grabbers,
+ etc.).
+Section: Graphics
+
+Format: html
+Index: /usr/share/doc/xsane-common/html/sane-xsane-doc.html
+Files: /usr/share/doc/xsane-common/html/*.html
diff --git a/debian/xsane-common.links b/debian/xsane-common.links
new file mode 100644
index 0000000..00c171b
--- /dev/null
+++ b/debian/xsane-common.links
@@ -0,0 +1 @@
+usr/share/doc/xsane-common/html/sane-xsane-doc.html usr/share/doc/xsane-common/html/index.html
diff --git a/debian/xsane.desktop b/debian/xsane.desktop
new file mode 100644
index 0000000..76bf10e
--- /dev/null
+++ b/debian/xsane.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Name=XSane Image scanning program
+Name[ru]=Программа для сканирования изображений
+Name[ca]=Programa d'escaneig d'imatges XSane
+Name[es]=Programa de escaneo de imágenes XSane
+Name[fr]=Programme d'acquisition d'images XSane
+Comment=A program to work with scanner. Can be used as a scanning, copier, OCR, fax tools.
+Comment[ru]=Программа для работы со сканером. Может быть использована в качестве копировального аппарата, факса, и др.
+Comment[ca]=Un programa per a treballar amb escànners. Es pot utilitzar com una eina d'escanejat, copiat, OCR i fax.
+Comment[es]=Un programa para trabajar con escáners. Se puede utilizar como una herramienta para escanear, copiar, OCR y fax.
+Comment[fr]=Un programme d'acquisition d'images pour votre scanner. Peut également photocopier, faxer ou faire de la reconnaissance de caractères.
+Exec=xsane
+Icon=xsane
+Terminal=false
+Type=Application
+Categories=GTK;Graphics;RasterGraphics;Scanning;OCR;
+StartupNotify=true
diff --git a/debian/xsane.dirs b/debian/xsane.dirs
new file mode 100644
index 0000000..c79467c
--- /dev/null
+++ b/debian/xsane.dirs
@@ -0,0 +1,3 @@
+usr/lib/gimp/2.0/plug-ins
+usr/share/pixmaps
+usr/share/applications
diff --git a/debian/xsane.docs b/debian/xsane.docs
new file mode 100644
index 0000000..d05dba6
--- /dev/null
+++ b/debian/xsane.docs
@@ -0,0 +1,9 @@
+xsane.ACCELKEYS
+xsane.AUTHOR
+xsane.BEGINNERS-INFO
+xsane.BUGS
+xsane.LOGO
+xsane.PROBLEMS
+xsane.ROOT
+xsane.TODO
+xsane.VENDOR-STRINGS
diff --git a/debian/xsane.links b/debian/xsane.links
new file mode 100644
index 0000000..af2ac1d
--- /dev/null
+++ b/debian/xsane.links
@@ -0,0 +1,2 @@
+usr/bin/xsane usr/lib/gimp/2.0/plug-ins/xsane
+usr/share/doc/xsane-common/html usr/share/doc/xsane/html
diff --git a/debian/xsane.menu b/debian/xsane.menu
new file mode 100644
index 0000000..76ef029
--- /dev/null
+++ b/debian/xsane.menu
@@ -0,0 +1,6 @@
+?package(xsane):command="/usr/bin/xsane" needs="X11" \
+ section="Applications/Graphics" title="XSane" \
+ icon="/usr/share/pixmaps/xsane.xpm" \
+ description="XSane provides an advanced graphical \
+ user interface to control an image acquisition device \
+ such as a flatbed scanner or a camera."
diff --git a/debian/xsane.postinst b/debian/xsane.postinst
new file mode 100644
index 0000000..b0b66df
--- /dev/null
+++ b/debian/xsane.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+HTMLDOCDIR=/usr/share/doc/xsane/html
+NEWHTMLDOCDIR=../xsane-common/html
+
+if [ -d "$HTMLDOCDIR" ] && [ ! -L "$HTMLDOCDIR" ]; then
+ # Remove old directory and files that are now provided by xsane-common
+ rm -rf "$HTMLDOCDIR"
+ # Create a link to the new directory
+ ln -s "$NEWHTMLDOCDIR" "$HTMLDOCDIR"
+fi
+
+
+#DEBHELPER#