Imported Debian patch 0.97-3debian/0.97-3

32 files changed, 712 insertions, 324 deletions

diff --git a/debian/INSTALL.Debian b/debian/INSTALL.Debian
deleted file mode 100644
index 4937c05..0000000
--- a/debian/INSTALL.Debian
+++ /dev/null
@@ -1,26 +0,0 @@
-xsane and xsane-gimp1.1 are almost identical, with the exception of
-rules and changelog.  To change rules and changelog to make an xsane
-package, type:
-
-	./debian/rules xsane-files
-
-To change rules and changelog to make an xsane-gimp1.1 package, type:
-
-	./debian/rules xsane-gimp1.1-files
-
-
-The first line of changelog should list the package as "xsane" or
-"xsane-gimp1.1" for the respective packages.
-
-In rules, the "package =" and "gimp-version =" lines should be changed
-as follows:
-
-for xsane:
-
-package = xsane
-gimp-version=1.0
-
-	or
-
-package = xsane-gimp1.1
-gimp-version=1.1
diff --git a/debian/changelog b/debian/changelog
index e2b14a4..69f67e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,260 @@
+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.
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index 6484cc5..b23a37e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,27 +1,46 @@
 Source: xsane
 Section: graphics
 Priority: optional
-Maintainer: Kevin Dalley <kevind@rahul.net>
-Standards-Version: 3.0.0
-Build-Depends: libgimp1.2-dev (>= 1.2.0), libglib1.2-dev (>= 1.2.0), libgtk1.2-dev (>= 1.2.10-4), libjpeg62-dev, libpng-dev, libsane-dev (>= 1.0.7), libtiff3g-dev, libusb-dev, xlibs-dev (>= 4.0.1-11), zlib1g-dev (>= 1:1.1.3)
+Maintainer: Julien BLACHE <jblache@debian.org>
+Uploaders: Aurelien Jarno <aurel32@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.0.0), dpatch, libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libsane-dev (>= 1.0.11-3), zlib1g-dev, xlibs-dev (>= 4.0.1-11), gettext, autotools-dev
+Build-Conflicts: libpng10-dev
 
 Package: xsane
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: gimp1.2, hylafax-client | mgetty-fax, gv
-Conflicts: xsane-gimp1.1
-Description: a gtk based X11 frontend for SANE (Scanner Access Now Easy)
+Depends: xsane-common (= ${Source-Version}), ${shlibs:Depends}
+Recommends: mozilla-browser | www-browser
+Suggests: gimp, hylafax-client | mgetty-fax, gv, gocr
+Conflicts: xsane-gimp1.2, xsane-gimp1.3
+Replaces: xsane-gimp1.2, xsane-gimp1.3
+Description: GTK+-based X11 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 is open to everybody. The
- current source code is written for UNIX (including Linux) and is
- available under the GNU public license (commercial application and
+ 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: GTK+-based X11 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. 
  .
- 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, or 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/control.xsane b/debian/control.xsane
deleted file mode 100644
index 6484cc5..0000000
--- a/debian/control.xsane
+++ /dev/null
@@ -1,27 +0,0 @@
-Source: xsane
-Section: graphics
-Priority: optional
-Maintainer: Kevin Dalley <kevind@rahul.net>
-Standards-Version: 3.0.0
-Build-Depends: libgimp1.2-dev (>= 1.2.0), libglib1.2-dev (>= 1.2.0), libgtk1.2-dev (>= 1.2.10-4), libjpeg62-dev, libpng-dev, libsane-dev (>= 1.0.7), libtiff3g-dev, libusb-dev, xlibs-dev (>= 4.0.1-11), zlib1g-dev (>= 1:1.1.3)
-
-Package: xsane
-Section: graphics
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: gimp1.2, hylafax-client | mgetty-fax, gv
-Conflicts: xsane-gimp1.1
-Description: 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.). The SANE standard is
- free and its discussion and development is open to everybody. The
- current source code is written for UNIX (including Linux) and is
- available under the GNU public license (commercial application and
- backends are welcome, too, however).
- .
- 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, or serve as a frontend to a
- fax program, or send an image to a printer.
diff --git a/debian/control.xsane-gimp1.1 b/debian/control.xsane-gimp1.1
deleted file mode 100644
index 9afeab1..0000000
--- a/debian/control.xsane-gimp1.1
+++ /dev/null
@@ -1,30 +0,0 @@
-Source: xsane-gimp1.1
-Section: graphics
-Priority: optional
-Maintainer: Kevin Dalley <kevind@rahul.net>
-Standards-Version: 3.0.0
-Build-Depends: libc6-dev, libglib1.2-dev, libgtk1.2-dev, libjpeg62-dev, libpng2-dev, libsane-dev, libtiff3g-dev, zlib1g-dev, xlib6g-dev, libgimp1.1-dev (>= 1.1.32), libgimp1.1-dev (<< 1.1.33)
-
-Package: xsane-gimp1.1
-Section: graphics
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: xsane
-Suggests: gimp1.1 (>= 1.0.0), hylafax-client | mgetty-fax
-Description: 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.). The SANE standard is
- free and its discussion and development is open to everybody. The
- current source code is written for UNIX (including Linux) and is
- available under the GNU public license (commercial application and
- backends are welcome, too, however).
- .
- 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, or serve as a frontend to a
- fax program, or send an image to a printer.
- .
- This is the unstable 1.1 branch of GIMP. It is not intended for use
- with stable projects!
diff --git a/debian/copyright b/debian/copyright
index e2fd5b8..43bcebe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,32 @@
-This package was debianized by Kevin Dalley kevind@rahul.net.
+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>.
 
-The primary author of xsane is Oliver.Rauch@Wolfsburg.DE
-(Oliver.Rauch).  More information is in xsane.AUTHOR.
+It was downloaded from : ftp://ftp.mostang.com/pub/sane/xsane/
 
-It was downloaded from:
+Upstream Author : Oliver Rauch <Oliver.Rauch@xsane.org>
 
-http://www.wolfsburg.de/~rauch/sane/
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+Copyright:
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+	Copyright (C) 1998-2003 Oliver Rauch
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses'.
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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/doc-base-xsane-gimp1.1 b/debian/doc-base-xsane-gimp1.1
deleted file mode 100644
index d65db65..0000000
--- a/debian/doc-base-xsane-gimp1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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: Apps/Graphics
-
-Format: html
-Index: /usr/share/doc/xsane-gimp1.1/sane/sane-xsane-doc.html
-Files: /usr/share/doc/xsane-gimp1.1/sane/*.html
diff --git a/debian/menu.xsane b/debian/menu.xsane
deleted file mode 100644
index 7dfc1fa..0000000
--- a/debian/menu.xsane
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(xsane):command="/usr/bin/xsane" needs="X11" \
-	       section="Apps/Graphics" title="xsane" \
-		description="xsane provides a graphical \
-		user-interface to control an image acquisition device \
-		such as a flatbed scanner or a camera."
diff --git a/debian/menu.xsane-gimp1.1 b/debian/menu.xsane-gimp1.1
deleted file mode 100644
index 7a8b362..0000000
--- a/debian/menu.xsane-gimp1.1
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(xsane-gimp1.1):command="/usr/bin/xsane" needs="X11" \
-	       section="Apps/Graphics" title="xsane" \
-		description="xsane provides a graphical \
-		user-interface to control an image acquisition device \
-		such as a flatbed scanner or a camera."
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..3badab4
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,4 @@
+01_logo_docs
+02_docviewer
+03_gimp_acquire_menu
+10_batch_scan_bugfix
diff --git a/debian/patches/01_logo_docs.dpatch b/debian/patches/01_logo_docs.dpatch
new file mode 100644
index 0000000..fbe0641
--- /dev/null
+++ b/debian/patches/01_logo_docs.dpatch
@@ -0,0 +1,61 @@
+#!/bin/sh -e
+## logo_docs.dpatch.dpatch by Aurelien Jarno <aurel32@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+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 /scratch/xsane/xsane-0.91/doc/sane-backends-doc.html xsane-0.91/doc/sane-backends-doc.html
+--- /scratch/xsane/xsane-0.91/doc/sane-backends-doc.html	2003-06-03 23:31:25.000000000 +0200
++++ xsane-0.91/doc/sane-backends-doc.html	2003-06-03 23:37:13.000000000 +0200
+@@ -10,7 +10,7 @@
+ <body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
+ &nbsp;
+ <dd>
+-<img SRC="sane-logo2.jpg" height=150 width=128 align=LEFT></dd>
++<img SRC="xsane-logo2.jpg" height=150 width=128 align=LEFT></dd>
+ 
+ <blockquote>
+ <h1>
+diff -urNad /scratch/xsane/xsane-0.91/doc/sane-problems-doc.html xsane-0.91/doc/sane-problems-doc.html
+--- /scratch/xsane/xsane-0.91/doc/sane-problems-doc.html	2003-06-03 23:31:25.000000000 +0200
++++ xsane-0.91/doc/sane-problems-doc.html	2003-06-03 23:37:30.000000000 +0200
+@@ -10,7 +10,7 @@
+ <body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
+ &nbsp;
+ <dd>
+-<img SRC="sane-logo2.jpg" height=150 width=128 align=LEFT></dd>
++<img SRC="xsane-logo2.jpg" height=150 width=128 align=LEFT></dd>
+ 
+ <blockquote>&nbsp;
+ <br>&nbsp;
+diff -urNad /scratch/xsane/xsane-0.91/doc/sane-scantips-doc.html xsane-0.91/doc/sane-scantips-doc.html
+--- /scratch/xsane/xsane-0.91/doc/sane-scantips-doc.html	2003-06-03 23:31:25.000000000 +0200
++++ xsane-0.91/doc/sane-scantips-doc.html	2003-06-03 23:37:25.000000000 +0200
+@@ -10,7 +10,7 @@
+ <body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
+ &nbsp;
+ <dd>
+-<img SRC="sane-logo2.jpg" height=150 width=128 align=LEFT></dd>
++<img SRC="xsane-logo2.jpg" height=150 width=128 align=LEFT></dd>
+ 
+ <blockquote>
+ <h1>
diff --git a/debian/patches/02_docviewer.dpatch b/debian/patches/02_docviewer.dpatch
new file mode 100644
index 0000000..68082e0
--- /dev/null
+++ b/debian/patches/02_docviewer.dpatch
@@ -0,0 +1,46 @@
+#!/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 /home/julien/debian/pkg-build/SANE/xsane/0.94/xsane-0.94/src/xsane.h xsane-0.94/src/xsane.h
+--- /home/julien/debian/pkg-build/SANE/xsane/0.94/xsane-0.94/src/xsane.h	2004-06-10 17:35:52.000000000 +0200
++++ xsane-0.94/src/xsane.h	2004-06-10 17:35:52.000000000 +0200
+@@ -205,7 +205,7 @@
+ # elif defined(HAVE_OS2_H)
+ #  define DEFAULT_BROWSER "netscape"
+ # else
+-#  define DEFAULT_BROWSER "netscape"
++#  define DEFAULT_BROWSER "/usr/bin/sensible-browser"
+ # endif
+ #endif
+ 
+@@ -453,7 +453,7 @@
+ #define OCROUTPUTFILEOPT	"-o"
+ #define OCROUTFDOPT		"-x"
+ #define OCRPROGRESSKEY		""
+-#define BROWSER_NETSCAPE	"netscape"
++#define BROWSER_NETSCAPE	"/usr/bin/sensible-browser"
+ 
+ #define XSANE_MEDIUM_CALIB_BRIGHTNESS_MIN	-1000.0
+ #define XSANE_MEDIUM_CALIB_BRIGHTNESS_MAX	 1000.0
diff --git a/debian/patches/03_gimp_acquire_menu.dpatch b/debian/patches/03_gimp_acquire_menu.dpatch
new file mode 100644
index 0000000..d9832fe
--- /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: No description.
+
+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 /scratch/xsane/xsane-0.91/src/xsane-text.h xsane-0.91/src/xsane-text.h
+--- /scratch/xsane/xsane-0.91/src/xsane-text.h	2003-01-05 18:05:55.000000000 +0100
++++ xsane-0.91/src/xsane-text.h	2003-06-03 23:43:49.000000000 +0200
+@@ -726,8 +726,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/10_batch_scan_bugfix.dpatch b/debian/patches/10_batch_scan_bugfix.dpatch
new file mode 100644
index 0000000..a875c47
--- /dev/null
+++ b/debian/patches/10_batch_scan_bugfix.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_batch_scan_bugfix.dpatch by  <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix batch scanning bug.
+
+@DPATCH@
+diff -urNad xsane-0.97/src/xsane-batch-scan.c /tmp/dpep.7eXNXU/xsane-0.97/src/xsane-batch-scan.c
+--- xsane-0.97/src/xsane-batch-scan.c	2005-01-22 15:59:54.000000000 +0100
++++ /tmp/dpep.7eXNXU/xsane-0.97/src/xsane-batch-scan.c	2005-01-27 22:16:31.000000000 +0100
+@@ -505,12 +505,12 @@
+ 
+     while (xsane.scanning)
+     {
+-#if 0
++#if 1
+       if (gtk_events_pending())
+       {
+         gtk_main_iteration();
+       }
+-#elseif
++#else
+       gtk_main_iteration();
+ #endif
+     }
diff --git a/debian/postinst.xsane b/debian/postinst.xsane
deleted file mode 100644
index 8ab57e9..0000000
--- a/debian/postinst.xsane
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
-if [ "$1" = "configure" ]; then
-    if [ -d /usr/doc -a ! -e /usr/doc/xsane -a -d /usr/share/doc/xsane ]; then
-	ln -sf ../share/doc/xsane /usr/doc/xsane
-    fi
-    if command -v install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/xsane
-    fi
-fi
diff --git a/debian/postinst.xsane-gimp1.1 b/debian/postinst.xsane-gimp1.1
deleted file mode 100644
index 54f80ba..0000000
--- a/debian/postinst.xsane-gimp1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
-if [ "$1" = "configure" ]; then
-    if [ -d /usr/doc -a ! -e /usr/doc/xsane-gimp1.1 -a \
-		-d /usr/share/doc/xsane-gimp1.1 ]; then
-	ln -sf ../share/doc/xsane-gimp1.1 /usr/doc/xsane-gimp1.1
-    fi
-    if command -v install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/xsane
-    fi
-fi
diff --git a/debian/postrm.xsane b/debian/postrm.xsane
deleted file mode 100644
index 40590c4..0000000
--- a/debian/postrm.xsane
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
diff --git a/debian/postrm.xsane-gimp1.1 b/debian/postrm.xsane-gimp1.1
deleted file mode 100644
index 40590c4..0000000
--- a/debian/postrm.xsane-gimp1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
diff --git a/debian/prerm.xsane b/debian/prerm.xsane
deleted file mode 100644
index 4dcaecf..0000000
--- a/debian/prerm.xsane
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/xsane ]; then
-    rm -f /usr/doc/xsane
-fi
-if [ "$1" = "upgrade" -o "$1" = "remove" ]; then
-    if command -v install-docs >/dev/null 2>&1; then
-	install-docs -r xsane
-    fi
-fi
diff --git a/debian/prerm.xsane-gimp1.1 b/debian/prerm.xsane-gimp1.1
deleted file mode 100644
index d1beb2d..0000000
--- a/debian/prerm.xsane-gimp1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a \
-	-L /usr/doc/xsane-gimp1.1 ]; then
-	rm -f /usr/doc/xsane-gimp1.1
-	if command -v install-docs >/dev/null 2>&1; then
-		install-docs -r xsane
-	fi
-fi
diff --git a/debian/rules b/debian/rules
index b7087cd..696e018 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,135 +1,164 @@
 #!/usr/bin/make -f
-# Sample debian.rules file - for GNU Hello (1.3).
-# Copyright 1994,1995 by Ian Jackson.
-# I hereby give you perpetual unlimited permission to copy,
-# modify and relicense this file, provided that you do not remove
-# my name from the file itself.  (I assert my moral right of
-# paternity under the Copyright, Designs and Patents Act 1988.)
-# This file may have to be extensively modified
-# Copyright 1996 by Kevin Dalley
-#
-
-
-CC = gcc
-CFLAGS = -O2 -g
-# LDFLAGS = -s LDFLAGS is not correctly defined in Makefile.in
-prefix=/usr
-package=xsane
-gimp-version=1.2
-
-build:
-	$(checkdir)
-	-rm -f debian/control
-	cp debian/control.$(package) debian/control
-	./configure --prefix=$(prefix) --sysconfdir=/etc \
-		--datadir='$$(prefix)/share/doc/$(package)' \
-		 --mandir='$$(prefix)/share/man'
-	$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
-	touch build
-
-clean:
-	$(checkdir)
-	-rm -f build
-	-$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
-	-rm -rf *~ debian/*~ debian/files*
-	-rm -rf debian/tmp-xsane debian/tmp-xsane-gimp1.1
-	-rm -f debian/control
-	cp debian/control.$(package) debian/control
-
-binary-indep:	checkroot build
-	$(checkdir)
-
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
-binary-arch:	checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp-xsane debian/tmp-xsane-gimp1.1
-	install -d debian/tmp-$(package) debian/tmp-$(package)/DEBIAN
-	install -d debian/tmp-$(package)$(prefix)/share/doc/$(package)
-	install -d debian/tmp-$(package)$(prefix)/bin
-	install debian/postrm.$(package) debian/tmp-$(package)/DEBIAN/postrm
-	install debian/prerm.$(package) debian/tmp-$(package)/DEBIAN/prerm
-	install debian/postinst.$(package) debian/tmp-$(package)/DEBIAN/postinst
-	install -d debian/tmp-$(package)/usr/share/doc-base
-	install -m 0644 debian/doc-base-$(package) \
-		debian/tmp-$(package)/usr/share/doc-base/xsane
-	$(MAKE) prefix=`pwd`/debian/tmp-$(package)$(prefix) \
-		sysconfdir=`pwd`/debian/tmp-$(package)/etc \
-		CC="$(CC)" CFLAGS="$(CFLAGS)" \
-		INSTALL_PROGRAM='install -s' \
-		install
-	install -d debian/tmp-$(package)$(prefix)/lib/gimp/$(gimp-version)/plug-ins
-	ln -sf ../../../../bin/xsane \
-		debian/tmp-$(package)$(prefix)/lib/gimp/$(gimp-version)/plug-ins
-	for file in xsane.* ; \
-	do \
-		install -m 644 $${file} \
-			debian/tmp-$(package)$(prefix)/share/doc/$(package); \
-		gzip -9v debian/tmp-$(package)$(prefix)/share/doc/$(package)/$${file}; \
-	done
-	rm -f debian/tmp-$(package)$(prefix)/share/doc/$(package)/xsane.COPYING.gz
-	ln -s xsane.CHANGES.gz \
-		debian/tmp-$(package)$(prefix)/share/doc/$(package)/changelog.gz
-	ln -s ../sane \
-		debian/tmp-$(package)$(prefix)/share/doc/$(package)/html
-	gzip -9v debian/tmp-$(package)$(prefix)/share/man/man[15]/*
-	install -m 0644 debian/copyright debian/tmp-$(package)$(prefix)/share/doc/$(package)/.
-	install -m 0644 debian/changelog \
-		debian/tmp-$(package)$(prefix)/share/doc/$(package)/changelog.Debian
-	rm -f debian/tmp-$(package)$(prefix)/share/doc/$(package)/sane/xsane/xsane-license.txt
-	ln -s ../../../../common-licenses/GPL debian/tmp-$(package)$(prefix)/share/doc/$(package)/sane/xsane/xsane-license.txt
-	gzip -9v \
-		debian/tmp-$(package)$(prefix)/share/doc/$(package)/changelog.Debian
-	install -d debian/tmp-$(package)/usr/lib/menu
-	install -m 0644 debian/menu.$(package) debian/tmp-$(package)/usr/lib/menu/$(package)
-	dpkg-shlibdeps debian/tmp-$(package)$(prefix)/bin/xsane
-	strip debian/tmp-$(package)$(prefix)/bin/xsane
-	dpkg-gencontrol -isp -p$(package) -Pdebian/tmp-$(package)
-	dpkg --build debian/tmp-$(package) ..
-
-define checkdir
-	test -f xsane.INSTALL -a -f debian/rules
-endef
-
-# Below here is fairly generic really
-
-binary:		binary-indep binary-arch
-
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-# change files so that xsane-gimp1.1 will be built
-xsane-gimp1.1-files:
-	$(checkdir)
-	rm -f debian/changelog.new
-	sed -e'1,1s/xsane /xsane-gimp1.1 /' debian/changelog > \
-		debian/changelog.new
-	mv debian/changelog.new debian/changelog
-	rm -f debian/rules.new
-	sed -e's/^package=xsane$$/package=xsane-gimp1.1/' \
-		-e 's/^gimp-version=1.2$$/gimp-version=1.1/' debian/rules > \
-		debian/rules.new
-	mv debian/rules.new debian/rules
-	chmod a+x debian/rules
-
-# change files so that xsane will be built
-xsane-files:
-	$(checkdir)
-	rm -f debian/changelog.new
-	sed -e'1,1s/xsane-gimp1.1 /xsane /' debian/changelog > \
-		debian/changelog.new
-	mv debian/changelog.new debian/changelog
-	rm -f debian/rules.new
-	sed -e's/^package=xsane-gimp1.1$$/package=xsane/' \
-		-e 's/^gimp-version=1.1$$/gimp-version=1.2/' debian/rules > \
-		debian/rules.new
-	mv debian/rules.new debian/rules
-	chmod a+x debian/rules
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+# 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.
+	-$(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_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_undocumented -a
+	dh_installchangelogs -a xsane.CHANGES
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+#	dh_makeshlibs -a
+	dh_installdeb -a
+#	dh_perl -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/substvar-gimp1.1 b/debian/substvar-gimp1.1
deleted file mode 100644
index 4219b4f..0000000
--- a/debian/substvar-gimp1.1
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.1), libgimp1.1.7 (>= 1.1.7-1), libglib1.2 (>= 1.2.0), libgtk1.2 (>= 1.2.4-2), libjpeg62, libpng2, libsane (>= 1.0.1-3), libtiff3g, xlib6g (>= 3.3.4-1), zlib1g (>= 1:1.1.3)
diff --git a/debian/substvars b/debian/substvars
deleted file mode 100644
index e6a2cc5..0000000
--- a/debian/substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.2.4-4), libgimp1.2 (>= 1.2.0), libglib1.2 (>= 1.2.0), libgtk1.2 (>= 1.2.10-4), libjpeg62, libpng3, libsane (>= 1.0.7), libtiff3g, libusb-0.1-4 (>= 1:0.1.5-2), xlibs (>> 4.1.0), zlib1g (>= 1:1.1.3)
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/doc-base-xsane b/debian/xsane-common.doc-base
index 5159f67..d804d5a 100644
--- a/debian/doc-base-xsane
+++ b/debian/xsane-common.doc-base
@@ -2,7 +2,7 @@ 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
+ 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
@@ -11,5 +11,5 @@ Abstract: This manual describes how to use xsane as a frontend to
 Section: Apps/Graphics
 
 Format: html
-Index: /usr/share/doc/xsane/sane/sane-xsane-doc.html
-Files: /usr/share/doc/xsane/sane/*.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.desktop b/debian/xsane.desktop
new file mode 100644
index 0000000..df5c05d
--- /dev/null
+++ b/debian/xsane.desktop
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Encoding=UTF-8
+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;Application;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..1c0c73b
--- /dev/null
+++ b/debian/xsane.docs
@@ -0,0 +1,10 @@
+xsane.ACCELKEYS
+xsane.AUTHOR
+xsane.BACKENDS
+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..1a6d35d
--- /dev/null
+++ b/debian/xsane.menu
@@ -0,0 +1,6 @@
+?package(xsane):command="/usr/bin/xsane" needs="X11" \
+	        section="Apps/Graphics" title="xsane" \
+                icon="/usr/share/pixmaps/xsane.xpm" \
+		description="xsane provides a 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..6d55a03
--- /dev/null
+++ b/debian/xsane.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+HTMLDOCDIR=/usr/share/doc/xsane/html
+NEWHTMLDOCDIR=../xsane-common/html
+
+if [ -d $HTMLDOCDIR -a ! -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#