diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 55 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 11 | ||||
| -rw-r--r-- | debian/patches/00list | 2 | ||||
| -rw-r--r-- | debian/patches/02_docviewer.dpatch | 8 | ||||
| -rw-r--r-- | debian/patches/03_gimp_acquire_menu.dpatch | 8 | ||||
| -rw-r--r-- | debian/patches/10_broken_links.dpatch | 20 | ||||
| -rwxr-xr-x | debian/rules | 12 | ||||
| -rw-r--r-- | debian/xsane-common.links | 1 | ||||
| -rw-r--r-- | debian/xsane.desktop | 2 | ||||
| -rw-r--r-- | debian/xsane.menu | 4 |
11 files changed, 99 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog index 3c6bd34..885e45a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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. @@ -10,6 +24,47 @@ xsane (0.993-1) experimental; urgency=low -- 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: diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index 6f529d7..94957fc 100644 --- a/debian/control +++ b/debian/control @@ -3,18 +3,15 @@ Section: graphics Priority: optional Maintainer: Julien BLACHE <jblache@debian.org> Standards-Version: 3.7.2 -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, gettext, autotools-dev -Build-Conflicts: libpng10-dev +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: mozilla-browser | www-browser +Recommends: iceweasel | 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) +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 @@ -35,7 +32,7 @@ Section: graphics Architecture: all Replaces: xsane Recommends: xsane -Description: GTK+-based X11 frontend for SANE (Scanner Access Now Easy) +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 diff --git a/debian/patches/00list b/debian/patches/00list index 349899e..1c43793 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1,4 @@ 02_docviewer 03_gimp_acquire_menu +10_broken_links + diff --git a/debian/patches/02_docviewer.dpatch b/debian/patches/02_docviewer.dpatch index 0d402e0..8dd70e8 100644 --- a/debian/patches/02_docviewer.dpatch +++ b/debian/patches/02_docviewer.dpatch @@ -23,10 +23,10 @@ esac exit 0 @DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./src/xsane.h /tmp/dpep-work.2gLqkG/xsane-0.97/src/xsane.h ---- ./src/xsane.h 2005-01-22 16:18:40.000000000 +0100 -+++ /tmp/dpep-work.2gLqkG/xsane-0.97/src/xsane.h 2005-08-28 18:56:38.410683378 +0200 -@@ -231,7 +231,7 @@ +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 diff --git a/debian/patches/03_gimp_acquire_menu.dpatch b/debian/patches/03_gimp_acquire_menu.dpatch index d9832fe..d2b4e82 100644 --- a/debian/patches/03_gimp_acquire_menu.dpatch +++ b/debian/patches/03_gimp_acquire_menu.dpatch @@ -23,10 +23,10 @@ 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 @@ +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 "/" */ 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 index 696e018..7a628fd 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ endif autotools: autotools-stamp autotools-stamp: - -rm -f config.sub config.guess + 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 @@ -54,10 +54,10 @@ real-clean: rm -f autotools-stamp build-stamp # Add here commands to clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean - -rm -f config.sub config.guess - -rm -f po/*.gmo + rm -f config.sub config.guess + rm -f po/*.gmo dh_clean @@ -130,6 +130,7 @@ binary-indep: build install dh_installman -i # dh_installinfo -i dh_installchangelogs -i + dh_link -i dh_compress -i dh_fixperms -i dh_installdeb -i @@ -146,15 +147,12 @@ binary-arch: build install 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 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 index df5c05d..c320bc5 100644 --- a/debian/xsane.desktop +++ b/debian/xsane.desktop @@ -14,5 +14,5 @@ Exec=xsane Icon=xsane Terminal=false Type=Application -Categories=GTK;Application;Graphics;RasterGraphics;Scanning;OCR; +Categories=GTK;Graphics;RasterGraphics;Scanning;OCR; StartupNotify=true diff --git a/debian/xsane.menu b/debian/xsane.menu index 1a6d35d..76ef029 100644 --- a/debian/xsane.menu +++ b/debian/xsane.menu @@ -1,6 +1,6 @@ ?package(xsane):command="/usr/bin/xsane" needs="X11" \ - section="Apps/Graphics" title="xsane" \ + section="Applications/Graphics" title="XSane" \ icon="/usr/share/pixmaps/xsane.xpm" \ - description="xsane provides a graphical \ + description="XSane provides an advanced graphical \ user interface to control an image acquisition device \ such as a flatbed scanner or a camera." |