From 77a7cc444332d6fbc621ff4168e126a095cef1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Voltz?= Date: Fri, 2 Aug 2013 22:25:10 +0200 Subject: [PATCH] changelog entry for hwdb patch, minor cleanups, copyright notice --- ChangeLog | 5 +++++ testsuite/tools/data/udev+hwdb.ref | 2 +- tools/sane-desc.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c56d3c1de..826aa8480 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-02 Stéphane Voltz + * configure configure.in testsuite/Makefile.* testsuite/tools/*: add + a testsuite for sane-desc, then merge hwdb support for sane-desc by + Tom Gundersen . + 2013-07-31 m. allan noah * backend/canon_dr*: backend version 41 - initial P-208 and P-215 support diff --git a/testsuite/tools/data/udev+hwdb.ref b/testsuite/tools/data/udev+hwdb.ref index a7157db91..7e25b8004 100644 --- a/testsuite/tools/data/udev+hwdb.ref +++ b/testsuite/tools/data/udev+hwdb.ref @@ -4,7 +4,7 @@ # udev rules file for supported USB and SCSI devices # # For the list of supported USB devices see /usr/lib/udev/hwdb.d/20-sane.hwdb -# +# # The SCSI device support is very basic and includes only # scanners that mark themselves as type "scanner" or # SCSI-scanners from HP and other vendors that are entitled "processor" diff --git a/tools/sane-desc.c b/tools/sane-desc.c index 98cf1940c..3cc440746 100644 --- a/tools/sane-desc.c +++ b/tools/sane-desc.c @@ -5,6 +5,7 @@ Copyright (C) 2004 Jose Gato (XML output) Copyright (C) 2006 Mattias Ellert (plist output) Copyright (C) 2009 Dr. Ing. Dieter Jurzitza + Copyright (C) 2013 Tom Gundersen (hwdb output) This file is part of the SANE package. @@ -3662,7 +3663,7 @@ print_udevhwdb_header (void) "# udev rules file for supported USB and SCSI devices\n" "#\n" "# For the list of supported USB devices see /usr/lib/udev/hwdb.d/20-sane.hwdb\n" - "# \n" + "#\n" "# The SCSI device support is very basic and includes only\n" "# scanners that mark themselves as type \"scanner\" or\n" "# SCSI-scanners from HP and other vendors that are entitled \"processor\"\n"