From 4bc4b41457cf5caca82a936deffeb7874dddd446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 2 Dec 2014 20:19:00 +0100 Subject: Imported Upstream version 1.0.14 --- debian/changelog | 540 --------------------------- debian/compat | 1 - debian/control | 29 -- debian/copyright | 36 -- debian/patches/00list | 7 - debian/patches/01_xcam.c_dead_code.dpatch | 29 -- debian/patches/02_xcam_man_typo.dpatch | 39 -- debian/patches/03_scanadf_options_fix.dpatch | 46 --- debian/patches/04_cap_always_settable.dpatch | 21 -- debian/patches/05_xcam_off_by_one.dpatch | 19 - debian/patches/06_word_list_fix.dpatch | 42 --- debian/rules | 100 ----- debian/sane.dirs | 1 - debian/sane.docs | 4 - debian/sane.menu | 12 - debian/xscanimage-icon-32x32-2.xpm | 192 ---------- 16 files changed, 1118 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/patches/00list delete mode 100644 debian/patches/01_xcam.c_dead_code.dpatch delete mode 100644 debian/patches/02_xcam_man_typo.dpatch delete mode 100644 debian/patches/03_scanadf_options_fix.dpatch delete mode 100644 debian/patches/04_cap_always_settable.dpatch delete mode 100644 debian/patches/05_xcam_off_by_one.dpatch delete mode 100644 debian/patches/06_word_list_fix.dpatch delete mode 100755 debian/rules delete mode 100644 debian/sane.dirs delete mode 100644 debian/sane.docs delete mode 100644 debian/sane.menu delete mode 100644 debian/xscanimage-icon-32x32-2.xpm diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 8e5d929..0000000 --- a/debian/changelog +++ /dev/null @@ -1,540 +0,0 @@ -sane-frontends (1.0.14-9) unstable; urgency=low - - * debian/control: - + Bump Standards-Version to 3.8.3 (no changes). - - * debian/patches/06_word_list_fix.dpatch: - + Added; fix word list handling when the current value is not part of the - list (closes: #556166). - - -- Julien BLACHE Sat, 14 Nov 2009 10:46:58 +0100 - -sane-frontends (1.0.14-8) unstable; urgency=low - - * debian/control: - + Bump Standards-Version to 3.8.2 (no changes). - - * debian/patches/04_cap_always_settable.dpatch: - + Added; remove check for SANE_CAP_ALWAYS_SETTABLE which has been removed - upstream in SANE 1.0.20 (and was never used, not part of the standard). - * debian/patches/05_xcam_off_by_one.dpatch: - + Added; fix an off-by-one in xcam. - - -- Julien BLACHE Fri, 26 Jun 2009 13:51:25 +0200 - -sane-frontends (1.0.14-7) unstable; urgency=low - - * debian/control: - + Bump Standards-Version to 3.8.0 (no changes). - * debian/patches/03_scanadf_options_fix.dpatch: - + Added; get option descriptor 0 before getting the value for option 0. - This is a standard-compliance fix needed for proper operation with the - net backend. - - -- Julien BLACHE Tue, 05 Aug 2008 12:01:06 +0200 - -sane-frontends (1.0.14-6) unstable; urgency=low - - * debian/patches/02_xcam_man_typo.dpatch: - + Updated; more typo fixes (closes: #466593). - * debian/control: - + Bump Standards-Version to 3.7.3 (no changes). - - -- Julien BLACHE Sat, 01 Mar 2008 15:35:24 +0100 - -sane-frontends (1.0.14-5) unstable; urgency=low - - * debian/patches/02_xcam_man_typo.dpatch: - + Added; Fix typo in xcam(1) (closes: #445715). - - -- Julien BLACHE Sun, 14 Oct 2007 11:49:00 +0200 - -sane-frontends (1.0.14-4) unstable; urgency=low - - * debian/sane.menu: - + Update for the new menu structure. - - -- Julien BLACHE Sun, 05 Aug 2007 18:13:01 +0200 - -sane-frontends (1.0.14-3) unstable; urgency=low - - * debian/control: - + Remove Conflicts/Replaces on the old sane-gimp1.{2,3} packages. - * debian/rules: - + Do not ignore make distclean errors. - - -- Julien BLACHE Thu, 02 Aug 2007 18:01:02 +0200 - -sane-frontends (1.0.14-2) unstable; urgency=low - - * debian/control: - + Bumped Standards-Version to 3.7.2 (no changes). - + Remove Uploaders. - - Thank you Aurélien JARNO for your help during these years. - - -- Julien BLACHE Sun, 15 Oct 2006 17:22:54 +0200 - -sane-frontends (1.0.14-1) unstable; urgency=low - - * New upstream release. - + Bugfixes and improvements for xcam and scanadf. - * debian/control: - + Bumped Standards-Version to 3.6.2 (no changes). - * debian/copyright: - + Update ftp URL. - + Update FSF address. - * debian/patches/01_sanei_update.dpatch: - + Removed. - * debian/patches/01_xcam.c_dead_code.dpatch: - + Added; kills dead code in xcam.c::load_defaults(). - - -- Julien BLACHE Tue, 20 Sep 2005 19:32:05 +0200 - -sane-frontends (1.0.13-2) unstable; urgency=medium - - * debian/patches/01_sanei_update.dpatch: - + Added; update sanei from sane-backends 1.0.15 to fix a deadlock when - scanning over the network (both saned and xscanimage attempt to read at - the same time) (closes: #284320). - - -- Julien BLACHE Thu, 9 Dec 2004 15:38:41 +0100 - -sane-frontends (1.0.13-1) unstable; urgency=low - - * New upstream release. - * debian/patches: - + All patches removed, merged upstream. - * debian/control: - + Removed unneeded build-dependency on xlibs-dev. - * debian/menu, debian/rules: - + Added icon for xscanimage/xcam (closes: #244489). - - -- Julien BLACHE Sun, 17 Oct 2004 19:15:09 +0200 - -sane-frontends (1.0.12-2) unstable; urgency=low - - * debian/control: - + added build-depends on dpatch. - * debian/rules: - + support dpatch. - * debian/patches/10_preview_resize.dpatch: - + added, fixes the selection when the preview window has been - resized (closes: #242003). - * debian/patches/11_xcam_layout.dpatch: - + added, fixes the xcam window layout when resized. - * debian/patches/12_gsgdialog_type_fix.dpatch: - + added, type mismatch in the GSGDialog type definition. - - -- Julien BLACHE Thu, 29 Apr 2004 21:23:36 +0200 - -sane-frontends (1.0.12-1) unstable; urgency=low - - * New upstream release. - * debian/copyright: s/Copyright/License/ (closes: #242000). - - -- Julien BLACHE Sat, 17 Apr 2004 15:10:55 +0200 - -sane-frontends (1.0.11+cvs20040402-1) unstable; urgency=low - - * Pulled from CVS, for proper GIMP 2.0 support. - * Built with GIMP 2.0 support (closes: #183698). - * Build-Depends on GIMP 2.0 and GTK+ 2.0. - - -- Julien BLACHE Fri, 2 Apr 2004 10:44:38 +0200 - -sane-frontends (1.0.11-3) unstable; urgency=low - - * gimp1.2 has been renamed to gimp, reflect this change in the control file. - * Bumped Standards-Version to 3.6.1 (no changes). - * debian/compat: use DH_COMPAT=4. - - -- Julien BLACHE Sun, 14 Sep 2003 15:43:59 +0200 - -sane-frontends (1.0.11-2) unstable; urgency=medium - - * Rebuild against libsane (>= 1.0.11-3) to get rid of the libgphoto2-2 - dependency. - - -- Julien BLACHE Sun, 4 May 2003 14:28:53 +0200 - -sane-frontends (1.0.11-1) unstable; urgency=low - - * New upstream release. - * All patches from 1.0.10-1 were applied upstream. - * Killed sane-gimp1.2 for good, now Conflicts: sane-gimp1.2. - * Bumped Standards-Version to 3.5.9 (no changes). - - -- Julien BLACHE Sat, 26 Apr 2003 18:12:03 +0200 - -sane-frontends (1.0.10-1) unstable; urgency=low - - * New upstream release. - * Pulled xscanimage.c from CVS - * In GIMP, scanners are now available from File/Acquire/xscanimage/* - (closes: #176430). - * In GIMP, the resolution of the resulting image is set according to the - scanner's settings (closes: #176428). - * Build sane with GIMP 1.2 support, which means sane-gimp1.2 is now a dummy - package for a smooth upgrade (closes: #176754). - * Bumped Standards-Version to 3.5.8. - - -- Julien BLACHE Sun, 2 Feb 2003 18:31:11 +0100 - -sane-frontends (1.0.9-4) unstable; urgency=low - - * Various patches to xscanimage - * Pack the options in a scrolled window (closes: #174132). - * Use radio menu items for the length unit (#174132 too). - * It is now impossible to hit the "Browse" button twice (closes: #174137). - - -- Julien BLACHE Tue, 24 Dec 2002 15:29:07 +0100 - -sane-frontends (1.0.9-3) unstable; urgency=low - - * Rebuilt against new libgphoto2. - * Changed Uploaders: field so that Aurélien's uploads won't be tagged as - NMU again. - * Build-Depends updated. - - -- Julien BLACHE Sun, 1 Dec 2002 11:38:49 +0100 - -sane-frontends (1.0.9-2) unstable; urgency=low - - * Added a build rule to debian/rules to be Policy-compliant (closes: #167415). - * distclean may fail in clean-nogimp. - * Explain how the build takes place. - * Updated libusb build-depends. - * Improved description wrt scanadf. - - -- Julien BLACHE Sat, 2 Nov 2002 10:57:38 +0100 - -sane-frontends (1.0.9-1) unstable; urgency=low - - * New upstream release. - * Fixed packages descriptions (wrt #165138). - - -- Julien BLACHE Thu, 24 Oct 2002 19:34:51 +0200 - -sane-frontends (1.0.8-2) unstable; urgency=low - - * New maintainers. - * New upstream release (closes: #103109, #135264). - * xcam and find-scanner manpages added (closes: #39470). - * xscanimage now refers to sane-find-scanner (closes: 109428). - * Repackaged from scratch, using debhelper. - * Standards-Version bumped to 3.5.6. - * Build-Depends updated (closes: #115272, #95381). - * Copyright updated (closes: #146055). - * Build sane and sane-gimp1.2 flavours. - * Removed README.Debian, libsane's one is far more complete. - - -- Julien BLACHE Sat, 12 Oct 2002 11:31:23 +0200 - -sane-frontends (1.0.8-1) unstable; urgency=low - - * New upstream release. New frontend scanadf, focusing on scanners with - automatic document feeders. - - -- Kevin Dalley Sun, 6 Oct 2002 18:14:23 -0700 - -sane-frontends (1.0.7-2.1) unstable; urgency=medium - - * Non-Maintainer Upload. - * Remove libc6-dev Build-Depends, as it's build-essential (closes: Bug#115272). - * Build-Depends on libusb-dev >= 0.1.5-2. - * Update config.{sub,guess} on build, avoiding problems on newer architectures. - Thus added Build-Depends on autotools-dev. - * Strip .note and .comment sections. - - -- Julien BLACHE Mon, 1 Apr 2002 13:12:51 +0200 - -sane-frontends (1.0.7-2) unstable; urgency=low - - * relink with libusb-0.1-4. - - -- Kevin Dalley Fri, 15 Mar 2002 18:33:29 +0000 - -sane-frontends (1.0.7-1) unstable; urgency=low - - * new upstream release. - - -- Kevin Dalley Thu, 14 Mar 2002 00:18:10 +0000 - -sane-frontends (1.0.6-1) unstable; urgency=low - - * new upstream release. - - -- Kevin Dalley Mon, 28 Jan 2002 00:21:42 -0800 - -sane-frontends (1.0.5-3) unstable; urgency=low - - * rebuilt with new version of libgimp-1.2.2-2. (closes: #110065). - - -- Kevin Dalley Tue, 2 Oct 2001 22:31:06 -0700 - -sane-frontends (1.0.5-1) unstable; urgency=low - - * new upstream release of sane. - - -- Kevin Dalley Mon, 13 Aug 2001 01:13:12 -0700 - -sane-frontends (1.0.4-1) unstable; urgency=low - - * new upstream release of sane - * frontends are now separate from backends. - * improved description of package (closes: #81481) - - -- Kevin Dalley Sun, 28 Jan 2001 11:25:28 -0800 - -sane (1.0.1-1999-10-21-12) frozen unstable; urgency=low - - * add libjpeg62-dev, tetex-bin, tetex-extra to Build-Depends (closes: - #61834, 61835). - - -- Kevin Dalley Wed, 5 Apr 2000 10:37:38 -0700 - -sane (1.0.1-1999-10-21-11) frozen unstable; urgency=low - - * Add Build-Depends to control files for sane and sane-gimp1.1 (closes: - #60923). - - -- Kevin Dalley Mon, 27 Mar 2000 03:16:55 -0800 - -sane (1.0.1-1999-10-21-10) frozen unstable; urgency=low - - * Improve description in control file (closes: #57032). - * link sane-gimp1.1 with libgimp1.1.17, which is the most recent - libgimp1.1 in frozen. - - -- Kevin Dalley Mon, 28 Feb 2000 02:37:20 +0000 - -sane (1.0.1-1999-10-21-9) frozen unstable; urgency=low - - * link sane-gimp1.1 with libgimp1.1.15, which is the most recent - libgimp1.1 in frozen. - - -- Kevin Dalley Sat, 22 Jan 2000 01:57:55 -0800 - -sane (1.0.1-1999-10-21-8) unstable; urgency=low - - * sane now conflicts with gimp1.1, which increases the chances of - getting the correct versions of gimp with each version of sane - (closes: #55070). Unfortunately, sane-gimp1.1 cannot conflict with - gimp, since gimp1.1 provides gimp. - - -- Kevin Dalley Sun, 16 Jan 2000 11:41:52 -0800 - -sane (1.0.1-1999-10-21-7) unstable; urgency=low - - * link with libgimp1.1.14 (closes: #53982) - * remove conflict of libsane-gimp1.1 with itself (closes: #49709). - * Each version of sane and sane-gimp1.1 now depend upon the same release - of libsane (closes: #50927). - * shlibs dependencies is updated to ">= 1.0.1-1999-10-21-7" to reduce - chances of problem #50927. - - -- Kevin Dalley Sun, 9 Jan 2000 13:22:57 -0800 - -sane (1.0.1-1999-10-21-6) unstable; urgency=low - - * add conflict between libsane and older version of sane, sane-gimp1.1 - due to moving documentation from sane to libsane (closes: #50735). - - -- Kevin Dalley Sat, 20 Nov 1999 15:15:30 -0400 - -sane (1.0.1-1999-10-21-5) unstable; urgency=low - - * added link for /usr/lib/libsane-dll.so, again. - - -- Kevin Dalley Fri, 19 Nov 1999 00:03:40 -0400 - -sane (1.0.1-1999-10-21-4) unstable; urgency=low - - * corrected problematic stripping of "libsane.la" (closes: #50099). - * move much of documentation from sane package to libsane and - libsane-dev package. - * move find-scanner to libsane - - -- Kevin Dalley Wed, 17 Nov 1999 23:08:44 -0400 - -sane (1.0.1-1999-10-21-3) unstable; urgency=low - - * added link for /usr/lib/libsane-dll.so - - -- Kevin Dalley Mon, 25 Oct 1999 01:24:30 -0700 - -sane (1.0.1-1999-10-21-2) unstable; urgency=low - - * corrected link of libsane.so.1 - - -- Kevin Dalley Sun, 24 Oct 1999 14:43:14 -0700 - -sane (1.0.1-1999-10-21-1) unstable; urgency=low - - * cvs server version from 1999-10-21 - * many bugs fixed in various backends - - -- Kevin Dalley Fri, 22 Oct 1999 22:06:52 -0700 - -sane (1.0.1-6) unstable; urgency=low - - * relink sane-gimp1.1 with libgimp1.1.10 - - -- Kevin Dalley Thu, 14 Oct 1999 23:33:18 -0700 - -sane (1.0.1-5) unstable; urgency=low - - * relink sane-gimp1.1 with libgimp1.1.9 - * separate sane-gimp1.1 from sane - - -- Kevin Dalley Sun, 10 Oct 1999 03:42:37 -0700 - -sane (1.0.1-4) unstable; urgency=low - - * added sane-gimp1.1 (used with gimp1.1) at the same time as sane for - gimp-1.0.x. - - -- Kevin Dalley Wed, 30 Jun 1999 00:54:57 -0700 - -sane (1.0.1-3) unstable; urgency=low - - * try to fix problems with shared libraries. Install libsane-dll.so in - /usr/lib so that programs linked with libsane will run. (Needed to - fix xsane bug #37756). - - -- Kevin Dalley Mon, 31 May 1999 22:15:16 -0700 - -sane (1.0.1-2) unstable; urgency=low - - * remove dependencies for libsane - - -- Kevin Dalley Fri, 30 Apr 1999 23:08:50 -0700 - -sane (1.0.1-1) unstable; urgency=low - - * version 1.0.1 - * new backend for Sharp scanner - * update backends for Kodak DC25, HP, Microtek, Micro, Mustek, Nikon - Coolscan, snapscan, UMAX. - * fixes problem with HP scanner (closes #32516) - * includes backend for dc210 (closes #31377) - - -- Kevin Dalley Tue, 27 Apr 1999 01:24:33 -0700 - -sane (1.00-2) unstable; urgency=low - - * removed examples directory. Moved examples/tools to tools directory. - - -- Kevin Dalley Mon, 5 Apr 1999 02:04:53 -0700 - -sane (1.00-1) unstable; urgency=low - - * 1.00 is released - * artec is back in dll.conf - * many more scanner supported and more changes - - -- Kevin Dalley Sat, 5 Dec 1998 01:00:30 -0800 - -sane (0.74-2) unstable; urgency=low - - * temporarily comment out artec in dll.conf, due to bad interaction with - Umax scanner. If artec is used as a scanner, uncomment artec from - dll.conf - * automatically generates conffiles, thanks for - Roman.Hodek@informatik.uni-erlangen.de (fixes bug #26545) - * fixes problem with creation of /usr/share/sane during build process - (bug #26314) - - -- Kevin Dalley Sun, 20 Sep 1998 18:00:28 -0700 - -sane (0.74-1) unstable; urgency=low - - * first release of 0.74 - - -- Kevin Dalley Sat, 22 Aug 1998 23:06:26 -0700 - -sane (0.72-1) frozen unstable; urgency=low - - * first official release which supports libgtk1-0.99.9 - - -- Kevin Dalley Fri, 10 Apr 1998 02:29:52 -0700 - -sane (0.71-2) frozen unstable; urgency=low - - * fixed spelling in control files (fixes bug# 19003) - * modified to match latest change in libgtk-0.99.5 - * change datadir to /usr/share/sane - * compatible with libgtk1-0.99.8 (fixes bug #19595) - - -- Kevin Dalley Sun, 22 Mar 1998 19:44:10 -0800 - -sane (0.71-1) unstable; urgency=low - - * new release, which adds support for the following scanners: - Polaroid Digital Microscope Camera (DMC) backend - Apple scanner backend - Nikon CoolScan backend - * removed execute permission in doc directory (fixes: bug #17949) - * modified manual page referring to symbolic link of xscanimage (fixes: - bug #18071) - - -- Kevin Dalley Fri, 27 Feb 1998 23:03:08 -0800 - -sane (0.70-1) unstable; urgency=low - - * update to version 0.70 of sane, adds AGFA SnapScan backend, updates - UMAX backend - - * add patches 2-5 to SnapScan backend which allows other scanners - to work - - -- Kevin Dalley Sat, 31 Jan 1998 17:32:53 -0800 - -sane (0.69-2) unstable; urgency=low - - * correct umax-scanner.h so that Astra 1200S is legal - - -- Kevin Dalley Sun, 25 Jan 1998 09:44:45 -0800 - -sane (0.69-1) unstable; urgency=low - - * update to version 0.69 of sane - - -- Kevin Dalley Fri, 23 Jan 1998 20:24:01 -0800 - -sane (0.68-4) unstable; urgency=low - - * modified gtkglue.c to correspond with changes to libgtk1 - - -- Kevin Dalley Tue, 6 Jan 1998 22:24:14 -0800 - -sane (0.68-3) unstable; urgency=low - - * change plug-in directory to 0.99 to match gimp changes, add explicit - gimp dependency. - * added README.debian - * install find-scanner - * install many documentation files - - -- Kevin Dalley Fri, 2 Jan 1998 21:51:52 -0800 - -sane (0.68-2) unstable; urgency=low - - * corrected control file - - -- Kevin Dalley Sun, 21 Dec 1997 18:26:23 -0800 - -sane (0.68-1) unstable; urgency=low - - * update to version 0.68 of sane - - -- Kevin Dalley Fri, 5 Dec 1997 00:42:27 -0800 - -sane (0.67-1) unstable; urgency=low - - * first Debian release of sane - - -- Kevin Dalley Tue, 18 Nov 1997 21:38:41 -0800 - - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index b6c7ba5..0000000 --- a/debian/control +++ /dev/null @@ -1,29 +0,0 @@ -Source: sane-frontends -Section: graphics -Priority: optional -Maintainer: Julien BLACHE -Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 5), dpatch, libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libsane-dev (>= 1.0.11-3), autotools-dev - -Package: sane -Section: graphics -Architecture: any -Depends: ${shlibs:Depends} -Suggests: gimp -Description: scanner graphical frontends - This package includes : - o xscanimage, a scanner graphical frontend with GIMP 2.0 support - o scanadf, a command-line frontend for scanners with Automatic Document Feeder - o xcam, for acquiring images continuously from cameras. - . - An alternative to xscanimage called xsane is packaged separately. - . - The scanner frontends use SANE. 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). diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 8c5b2d6..0000000 --- a/debian/copyright +++ /dev/null @@ -1,36 +0,0 @@ -This package was first debianized by Kevin Dalley kevind@rahul.net. -It is now maintained by Julien BLACHE and -Aurélien JARNO . - -It was downloaded from: ftp://ftp.sane-project.org/pub/sane/ - -Upstream Authors: - see /usr/share/doc/sane/AUTHORS - -Copyright: - Copyright (C) 1995 Spencer Kimball - Copyright (C) 1995 Peter Mattis - Copyright (C) 1997, 1998 David Mosberger - Copyright (C) 1997 Tristan Tarrant - Copyright (C) 1997, 1998 Andreas Beck - Copyright (C) 1999 Tom Martone - -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 deleted file mode 100644 index d65c845..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,7 +0,0 @@ -01_xcam.c_dead_code -02_xcam_man_typo -03_scanadf_options_fix -04_cap_always_settable -05_xcam_off_by_one -06_word_list_fix - diff --git a/debian/patches/01_xcam.c_dead_code.dpatch b/debian/patches/01_xcam.c_dead_code.dpatch deleted file mode 100644 index 41a33e0..0000000 --- a/debian/patches/01_xcam.c_dead_code.dpatch +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_xcam.c_dead_code.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove dead code in src/xcam.c::load_defaults() - -@DPATCH@ -diff -urNad sane-frontends-1.0.14~/src/xcam.c sane-frontends-1.0.14/src/xcam.c ---- sane-frontends-1.0.14~/src/xcam.c 2005-09-20 19:30:01.000000000 +0200 -+++ sane-frontends-1.0.14/src/xcam.c 2005-09-20 19:30:59.289245755 +0200 -@@ -536,16 +536,14 @@ - load_defaults (int silent) - { - char filename[PATH_MAX]; -- int fd; - - DBG (DBG_debug, "xcam, load_defaults: enter\n"); - if (make_default_filename (sizeof (filename), filename, dialog->dev_name) - < 0) - return; -- if (fd < 0) -- return; -+ - load_settings (filename, silent); -- sanei_load_values (fd, dialog->dev); -+ - DBG (DBG_debug, "xcam, load_defaults: exit\n"); - } - diff --git a/debian/patches/02_xcam_man_typo.dpatch b/debian/patches/02_xcam_man_typo.dpatch deleted file mode 100644 index cd35ecc..0000000 --- a/debian/patches/02_xcam_man_typo.dpatch +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_xcam_man_typo.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix various typos in xcam.man. - -@DPATCH@ -diff -urNad sane-frontends-1.0.14~/doc/xcam.man sane-frontends-1.0.14/doc/xcam.man ---- sane-frontends-1.0.14~/doc/xcam.man 2008-03-01 15:30:54.000000000 +0100 -+++ sane-frontends-1.0.14/doc/xcam.man 2008-03-01 15:32:35.802703418 +0100 -@@ -1,4 +1,4 @@ --.TH xcam 1 "11 April 2005" -+.TH xcam 1 "19 February 2008" - .IX xcam - .SH NAME - xcam - a graphical camera frontend for SANE -@@ -12,7 +12,7 @@ - .B xcam - provides a graphical user-interface to control an image - acquisition device such as a flatbed scanner or a camera. It allows --scanning invidual images and can be invoked directly from the command-line. -+scanning individual images and can be invoked directly from the command-line. - - .B xcam - acts as a stand-alone program that saves acquired images in a suitable -@@ -43,12 +43,11 @@ - .PP - The - .B --help (-h) --.B xcam - flag prints a short summary of options. - .PP - .TP - .B SANE_DEBUG_XCAM --This environment variable controls the debug level xscanimage. Higher -+This environment variable controls the debug level of xcam. Higher - debug levels increase the verbosity of the output. - - Value Descsription diff --git a/debian/patches/03_scanadf_options_fix.dpatch b/debian/patches/03_scanadf_options_fix.dpatch deleted file mode 100644 index 4c1b8cb..0000000 --- a/debian/patches/03_scanadf_options_fix.dpatch +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_scanadf_options_fix.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Get option descriptor 0 before getting the value for option 0. - -@DPATCH@ -diff -urNad sane-frontends-1.0.14~/src/scanadf.c sane-frontends-1.0.14/src/scanadf.c ---- sane-frontends-1.0.14~/src/scanadf.c 2005-09-18 13:51:00.000000000 +0200 -+++ sane-frontends-1.0.14/src/scanadf.c 2008-08-05 12:00:14.826083326 +0200 -@@ -550,15 +550,33 @@ - const SANE_Option_Descriptor * opt; - SANE_Int num_dev_options; - int i, option_count; -+ SANE_Status status; - - /* and now build the full table of long options: */ - -- sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); -+ opt = sane_get_option_descriptor (device, 0); -+ if (opt == NULL) -+ { -+ fprintf (stderr, "Could not get option descriptor for option 0\n"); -+ exit (1); -+ } -+ -+ status = sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); -+ if (status != SANE_STATUS_GOOD) -+ { -+ fprintf (stderr, "Could not get value for option 0: %s\n", sane_strstatus (status)); -+ exit (1); -+ } - - option_count = 0; -- for (i = 0; i < num_dev_options; ++i) -+ for (i = 1; i < num_dev_options; ++i) - { - opt = sane_get_option_descriptor (device, i); -+ if (opt == NULL) -+ { -+ fprintf (stderr, "Could not get option descriptor for option %d\n", i); -+ exit (1); -+ } - - if (!SANE_OPTION_IS_SETTABLE (opt->cap)) - continue; diff --git a/debian/patches/04_cap_always_settable.dpatch b/debian/patches/04_cap_always_settable.dpatch deleted file mode 100644 index e812c3d..0000000 --- a/debian/patches/04_cap_always_settable.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_cap_always_settable.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove check for SANE_CAP_ALWAYS_SETTABLE; the flag is not part -## DP: of the standard and has been removed upstream in SANE 1.0.20. - -@DPATCH@ -diff -urNad sane-frontends-1.0.14~/src/gtkglue.c sane-frontends-1.0.14/src/gtkglue.c ---- sane-frontends-1.0.14~/src/gtkglue.c 2005-04-16 15:12:07.000000000 +0200 -+++ sane-frontends-1.0.14/src/gtkglue.c 2009-06-26 13:32:04.997585725 +0200 -@@ -1476,8 +1476,7 @@ - || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget) - continue; - -- if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE)) -- gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); -+ gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); - } - } - diff --git a/debian/patches/05_xcam_off_by_one.dpatch b/debian/patches/05_xcam_off_by_one.dpatch deleted file mode 100644 index deb56a0..0000000 --- a/debian/patches/05_xcam_off_by_one.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_xcam_off_by_one.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix an off-by-one. - -@DPATCH@ -diff -urNad sane-frontends-1.0.14~/src/xcam.c sane-frontends-1.0.14/src/xcam.c ---- sane-frontends-1.0.14~/src/xcam.c 2009-06-26 13:50:19.000000000 +0200 -+++ sane-frontends-1.0.14/src/xcam.c 2009-06-26 13:50:47.774585321 +0200 -@@ -1289,7 +1289,7 @@ - - /* test for pnm formats */ - strncpy (testfilename, preferences.filename, sizeof (testfilename)); -- testfilename[sizeof (testfilename)] = 0; -+ testfilename[sizeof (testfilename) - 1] = 0; - g_strreverse (testfilename); - if (!((!strncmp (testfilename, "mnp.", 4)) || - (!strncmp (testfilename, "mgp.", 4)) || diff --git a/debian/patches/06_word_list_fix.dpatch b/debian/patches/06_word_list_fix.dpatch deleted file mode 100644 index 90d223c..0000000 --- a/debian/patches/06_word_list_fix.dpatch +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 06_word_list_fix.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix word list handling when current value is not part of the list. - -@DPATCH@ -diff -urNad sane-frontends-1.0.14~/src/gtkglue.c sane-frontends-1.0.14/src/gtkglue.c ---- sane-frontends-1.0.14~/src/gtkglue.c 2009-11-14 10:46:03.248492255 +0100 -+++ sane-frontends-1.0.14/src/gtkglue.c 2009-11-14 10:46:07.941492660 +0100 -@@ -913,6 +913,7 @@ - char **str_list; - int i, j; - int num_vector_opts = 0, *vector_opts; -+ SANE_Bool val_in_list; - - main_hbox = gtk_hbox_new (FALSE, 2); - -@@ -1073,13 +1074,23 @@ - case SANE_CONSTRAINT_WORD_LIST: - /* use a "list-selection" widget */ - num_words = opt->constraint.word_list[0]; -+ if (num_words == 0) -+ { -+ fprintf (stderr, "panel_build: empty word list!\n"); -+ break; -+ } -+ val_in_list = SANE_FALSE; - str_list = malloc ((num_words + 1) * sizeof (str_list[0])); - for (j = 0; j < num_words; ++j) - { -+ if (opt->constraint.word_list[j + 1] == val) -+ val_in_list = SANE_TRUE; - sprintf (str, "%d", opt->constraint.word_list[j + 1]); - str_list[j] = strdup (str); - } - str_list[j] = 0; -+ if (!val_in_list) -+ val = opt->constraint.word_list[1]; - sprintf (str, "%d", val); - option_menu_new (parent, title, str_list, str, elem, - dialog->tooltips, opt->desc, diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 2db7de8..0000000 --- a/debian/rules +++ /dev/null @@ -1,100 +0,0 @@ -#!/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 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info --datadir=\$${prefix}/share - -build: build-stamp -build-stamp: patch-stamp config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: real-clean unpatch -real-clean: - dh_testdir - dh_testroot - rm -f build-stamp autotools-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - - rm -f config.sub config.guess - - dh_clean - - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/sane - $(MAKE) install prefix=$(CURDIR)/debian/sane/usr - - cp $(CURDIR)/debian/xscanimage-icon-32x32-2.xpm $(CURDIR)/debian/sane/usr/share/sane - -# Build architecture-independent files here. -binary-indep: -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs -# dh_installexamples - dh_installmenu - dh_installman -# dh_installinfo -# dh_undocumented - dh_installchangelogs Changelog - dh_link usr/bin/xscanimage usr/lib/gimp/2.0/plug-ins/xscanimage - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install patch unpatch real-clean autotools diff --git a/debian/sane.dirs b/debian/sane.dirs deleted file mode 100644 index a356f1d..0000000 --- a/debian/sane.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/gimp/2.0/plug-ins diff --git a/debian/sane.docs b/debian/sane.docs deleted file mode 100644 index 9731ce9..0000000 --- a/debian/sane.docs +++ /dev/null @@ -1,4 +0,0 @@ -AUTHORS -NEWS -PROBLEMS -README diff --git a/debian/sane.menu b/debian/sane.menu deleted file mode 100644 index c803ed2..0000000 --- a/debian/sane.menu +++ /dev/null @@ -1,12 +0,0 @@ -?package(sane):command="/usr/bin/xscanimage" needs="X11" \ - section="Applications/Graphics" title="xscanimage" \ - icon="/usr/share/sane/xscanimage-icon-32x32-2.xpm" \ - description="xscanimage provides a graphical \ - user interface to control an image acquisition device \ - such as a flatbed scanner or a camera." -?package(sane):command="/usr/bin/xcam" needs="X11" \ - section="Applications/Graphics" title="xcam" \ - icon="/usr/share/sane/xscanimage-icon-32x32-2.xpm" \ - description="xcam provides a graphical \ - user interface to control an image acquisition device \ - such as a flatbed scanner or a camera." diff --git a/debian/xscanimage-icon-32x32-2.xpm b/debian/xscanimage-icon-32x32-2.xpm deleted file mode 100644 index 67e3657..0000000 --- a/debian/xscanimage-icon-32x32-2.xpm +++ /dev/null @@ -1,192 +0,0 @@ -/* XPM */ -static char *xscanimage-icon-32x32-2[] = { -/* columns rows colors chars-per-pixel */ -"32 32 154 2", -" c #000000", -". c #0B0B0B", -"X c #131313", -"o c #171817", -"O c #1C1C1C", -"+ c #222222", -"@ c #272827", -"# c #2C2C2C", -"$ c #333333", -"% c #3B3B3B", -"& c #434343", -"* c #484847", -"= c #4C4C4B", -"- c #545454", -"; c #5C5B5B", -": c #4E5C6A", -"> c #575C61", -", c #525E68", -"< c #4D6377", -"1 c #5E646A", -"2 c #5A6775", -"3 c #5D6E79", -"4 c #636364", -"5 c #696867", -"6 c #6C6C6B", -"7 c #606971", -"8 c #6C6F74", -"9 c #6F777F", -"0 c #747373", -"q c #787675", -"w c #7B7B7B", -"e c #57768F", -"r c #5A7387", -"t c #577690", -"y c #687E8F", -"u c #717B85", -"i c #787E85", -"p c #638097", -"a c #68879E", -"s c #738C9F", -"d c #7E8992", -"f c #7E99AD", -"g c #7498B1", -"h c #7D9AB2", -"j c #7FA0B5", -"k c #719EC1", -"l c #7AA3C4", -"z c #7CA7C9", -"x c #7BA9CD", -"c c #807F7E", -"v c #838384", -"b c #81868C", -"n c #878887", -"m c #888887", -"M c #8D8C8C", -"N c #8F908F", -"B c #8B9096", -"V c #8E9398", -"C c #949493", -"Z c #9D9D9D", -"A c #8192A0", -"S c #8194AA", -"D c #849EB4", -"F c #939CA4", -"G c #9FA09F", -"H c #87A0AE", -"J c #83A3BE", -"K c #94A0AB", -"L c #9DA2A4", -"P c #90A7BB", -"I c #9BADBB", -"U c #A3A3A3", -"Y c #A8A8A7", -"T c #ABABAB", -"R c #A2AEB9", -"E c #ABADB0", -"W c #AFB2B4", -"Q c #ACB4BC", -"! c #B0B0AF", -"~ c #B3B3B3", -"^ c #B3B7BB", -"/ c #B3BABF", -"( c #B8B7B7", -") c #BCBCBC", -"_ c #8DA8C0", -"` c #8AB0CC", -"' c #8EB9D7", -"] c #91AEC4", -"[ c #99AFC1", -"{ c #94B3CC", -"} c #9BB3C3", -"| c #91BFDF", -" . c #9ABDD3", -".. c #A7B7C7", -"X. c #A5BCCF", -"o. c #ADB8C4", -"O. c #AABFCC", -"+. c #B9BEC4", -"@. c #99C2DB", -"#. c #ADC0C9", -"$. c #A2C3D8", -"%. c #B3CDDA", -"&. c #BBCFDC", -"*. c #BAD2DF", -"=. c #A1C8E0", -"-. c #A9CEE6", -";. c #A3DAFE", -":. c #ACD8F2", -">. c #ABDEFF", -",. c #B2D3E7", -"<. c #B1D6EB", -"1. c #B7DBEF", -"2. c #BDD5E5", -"3. c #BCDAEC", -"4. c #B9DFF4", -"5. c #B4E3FF", -"6. c #BBE5FE", -"7. c #C0BFC0", -"8. c #C4C4C4", -"9. c #C8C8C7", -"0. c #CBCBCB", -"q. c #CDD1D5", -"w. c #D4D4D4", -"e. c #D8D7D6", -"r. c #DCDBDB", -"t. c #C4D9E6", -"y. c #C7DFEE", -"u. c #DEDEE1", -"i. c #C0E6FC", -"p. c #C3E8FD", -"a. c #CAEBFD", -"s. c #D4E3ED", -"d. c #D4E4F0", -"f. c #D7ECF7", -"g. c #D2EEFE", -"h. c #DDE9F0", -"j. c #D6F2FE", -"k. c #DFF1FC", -"l. c #E0DFDF", -"z. c #E4E4E4", -"x. c #E8E7E6", -"c. c #ECECEC", -"v. c #E3ECF2", -"b. c #E8EFF2", -"n. c #E4F4FE", -"m. c #ECF7FD", -"M. c #EDF8FE", -"N. c #F0EFEE", -"B. c #F1F0EF", -"V. c #F1F1F0", -"C. c #F1F7FC", -"Z. c #F4FAFE", -"A. c #FCFCFE", -"S. c None", -/* pixels */ -"S.S.S.S.S.S.X . . S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.", -"S.S.S.S.S.& ; & + . . S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.", -"S.S.S.S.S.- Z w.! w ; % o X . S.S.S.S.S.S.S.S.S.S.S.S.S.S.", -"S.S.S.S.S.+ ; Y l.c.z.w.~ M - # O . . . S.S.S.S.S.S.S.S.S.S.S.", -"S.S.S.S.S.. X + - 5 w ! 9.u.x.e.! v > % O X . S.S.S.S.S.S.", -"S.S.S.S.S.S. . X $ = > 4 0 m U 8.r.r.0.! M - $ + . . S.S.S.", -"S.S.S.S.S.S.S. X O % = = & = - 4 w Y ) w.r.w.! w ; % O . . ", -"S.S.S.S.S.S.S.S. . X * ; & & & & & & - 5 w Z ) w.q.) U 0 % O ", -"S.S.S.S.S.S.S. . o ; M q 0 q 5 - = * & % & * = - 0 m Z Y ) 4 ", -"S.S.S.S.S.S.S. . 5 ~ i y H p u 9 8 5 ; ; = & & % $ $ % = 4 % ", -"S.S.S.S.S.S.S. . - ) b y &.v.v.s.$.f s r 2 1 5 4 - & & $ $ + o ", -"S.S.S.S.S.S. . - ) V a t.C.A.A.A.Z.Z.n.2.X.g e < , > ; - = $ O ", -"S.S.S.S.S.. X ; 9.F f y.Z.A.A.A.Z.Z.A.Z.Z.Z.M.h.%.j e , ; = % + ", -"S.S.S.S.. o 5 0.T R b.A.A.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.c.O.3 ; & & + ", -"S.S.S.X @ w e.) I b.A.A.A.A.Z.Z.Z.Z.Z.Z.M.Z.Z.M.M.Z.O.7 - % % + ", -"S.S.. # w r.8.D h.A.A.A.A.A.A.A.Z.Z.Z.Z.M.M.M.M.m.m.D q = * + O ", -"S.. O 6 r.9.D -.g.k.Z.A.A.A.A.A.A.A.A.A.Z.Z.M.n.Z.3.b w = = O + ", -". O ; u.r.H @.6.;.>.6.a.n.Z.A.A.A.A.A.A.A.A.Z.Z.M.P v 6 - $ O + ", -"O ; e.V.o.g :.i.i.5.>.>.5.6.g.n.Z.A.A.A.A.A.A.A.s.s n ; - @ + O ", -"O ~ A.c.w.{ l x | 6.a.a.6.6.5.6.p.g.n.Z.A.A.A.Z.X.B c ; = O O X ", -"X T c.c.B.N.l.q...J l @.,.p.j.a.i.6.6.i.f.n.Z.d.f Z 6 ; % O O X ", -". Z w.q.e.l.c.N.N.x.q.o.P [ { ,.f.g.a.p.6.i.k.` F C ; 4 + O O ", -"X C 0.8.8.9.9.q.r.x.N.N.x.e.#.o.I .*.1.g.j.1.h Y w 4 = O + X ", -"X ; U ~ ) 7.) ) 8.8.9.w.l.x.N.x.r.0.Q I I ' z K U 5 4 % O O . ", -" X O $ 6 v Y ( ~ ( ( ) ) 8.0.r.z.x.l.w.8.( ~ ! M 4 4 + + O ", -"S. . . X o & - m U T ! ! T ! ( ( ) 9.q.w.e.w.~ 0 5 - + + X S.", -"S.S. . . . O + - w Z Y Y T Y T T ! ~ ) 8.! 5 0 $ O O . S.", -"S.S.S.S. . X X $ * 6 C Z Y U U U Y Y G 6 6 + O o . S.S.", -"S.S.S.S.S.S.S.S. . . o + * 6 v U U Z F N q = O O . S.S.", -"S.S.S.S.S.S.S.S.S.S. . X X + & 4 M Z C w % O O . S.S.", -"S.S.S.S.S.S.S.S.S.S.S.S.S.S. . . . X O $ - - + O o S.S.S.", -"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S. . . . . X o O . S.S.S." -}; -- cgit v1.2.3