[yast-commit] r60804 - in /trunk/scanner: src/ tools/

Author: jsmeix Date: Thu Feb 11 17:19:48 2010 New Revision: 60804 URL: http://svn.opensuse.org/viewcvs/yast?rev=60804&view=rev Log: - Implemented bnc#578203 enhancement to show in the model selection list "unmaintained driver" and added info to the help text so that the user knows in advance whether or not he could expect some help if ther are issues with an unmaintained driver. - Added "GPL v2 only" Copyright notice to all relevant source files which are all *.ycp Files, alle bash Scripts in tools/ and tools/displaytest.c but the RPM "License" entry in yast2-scanner.spec is beyond my control because in package/yast2-scanner.spec which is created by "make package-local" there is "License: GPL" but there is no string "GPL" in any of the yast2-scanner source files (in particular not in yast2-scanner.spec.in) so that the RPM License value "GPL" must come from some obscure YaST magic. Modified: trunk/scanner/src/Scanner.ycp trunk/scanner/src/dialogs.ycp trunk/scanner/src/helps.ycp trunk/scanner/src/scanner.ycp trunk/scanner/src/wizards.ycp trunk/scanner/tools/activate_scanner_backend trunk/scanner/tools/autodetect_scanners trunk/scanner/tools/create_scanner_database trunk/scanner/tools/deactivate_scanner_backend trunk/scanner/tools/determine_active_scanner_backends trunk/scanner/tools/determine_active_scanners trunk/scanner/tools/determine_network_scanner_config trunk/scanner/tools/displaytest.c trunk/scanner/tools/setup_hplip_scanner_service trunk/scanner/tools/setup_network_scanner_config trunk/scanner/tools/setup_ptal_scanner_service trunk/scanner/tools/test_and_set_scanner_access_permissions trunk/scanner/tools/test_scanner_backend Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Thu Feb 11 17:19:48 2010 @@ -1,3 +1,24 @@ + +/* + * Copyright (c) 2010 Novell, Inc. + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * 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, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com + */ + /** * File: modules/Scanner.ycp * Package: Configuration of scanner @@ -84,6 +105,7 @@ * @struct scanner_model_map * $[ "package":"The package which provides the backend: sane-backends/hplip/iscan/iscan-free (required)", * "backend":"The name of the backend (required)", + * "version":"The backend's arbitrary version string or 'unmaintained' (may be the empty string)", * "manufacturer":"The manufacturer name of the scanner (required)", * "model":"The model name of the scanner (required)", * "firmware":"Whether or not firmware upload is required (value is 'required' or the empty string)", @@ -1374,6 +1396,7 @@ string manufacturer = database_entry["manufacturer"]:"unknown manufacturer"; string model = database_entry["model"]:"unknown model"; string backend = database_entry["backend"]:"unknown"; + string version = database_entry["version"]:""; string package = database_entry["package"]:"unknown"; string status = database_entry["status"]:"unknown"; string interface = database_entry["interface"]:""; @@ -1457,16 +1480,26 @@ // Enclose the backend name and the package name in single quotes to seperate them // from the rest of the model_string because they are untranslatable English words. if( "good" == status ) - { status_string = sformat( // Scanner model list status entry for "good" supported models: - // %1 will be replaced by the backend (scanner driver) name - _("Driver %1 provides good functionality."), - backend - ); + { if( "unmaintained" == version ) + { status_string = sformat( // Scanner model list status entry for "good" supported models + // but where the backend (scanner driver) is unmaintained: + // %1 will be replaced by the backend (scanner driver) name + _("Unmaintained driver %1 may provide good functionality."), + backend + ); + } + else + { status_string = sformat( // Scanner model list status entry for "good" supported models: + // %1 will be replaced by the backend (scanner driver) name + _("Driver %1 should provide good functionality."), + backend + ); + } } else { if( "unsupported" == status ) { if( "unsupported" == backend ) - { // Scanner model list status entry for unsupported models + { // Scanner model list status entry for unsupported models: status_string = _("This scanner is not supported."); } else @@ -1480,11 +1513,21 @@ } else { if( "complete" == status ) - { status_string = sformat( // Scanner model list status entry for "complete" supported models: - // %1 will be replaced by the backend (scanner driver) name - _("Driver %1 provides complete functionality."), - backend - ); + { if( "unmaintained" == version ) + { status_string = sformat( // Scanner model list status entry for "complete" supported models + // but where the backend (scanner driver) is unmaintained: + // %1 will be replaced by the backend (scanner driver) name + _("Unmaintained driver %1 may provide complete functionality."), + backend + ); + } + else + { status_string = sformat( // Scanner model list status entry for "complete" supported models: + // %1 will be replaced by the backend (scanner driver) name + _("Driver %1 should provide complete functionality."), + backend + ); + } } else { if( "untested" == status ) @@ -1496,20 +1539,40 @@ } else { if( "basic" == status ) - { status_string = sformat( // Scanner model list status entry for "basic" supported models: - // %1 will be replaced by the backend (scanner driver) name - _("Driver %1 provides basic functionality."), - backend - ); - } - else - { if( "minimal" == status ) - { status_string = sformat( // Scanner model list status entry for "minimal" supported models: + { if( "unmaintained" == version ) + { status_string = sformat( // Scanner model list status entry for "basic" supported models + // but where the backend (scanner driver) is unmaintained: + // %1 will be replaced by the backend (scanner driver) name + _("Unmaintained driver %1 may provide basic functionality."), + backend + ); + } + else + { status_string = sformat( // Scanner model list status entry for "basic" supported models: // %1 will be replaced by the backend (scanner driver) name - _("Driver %1 provides minimal functionality."), + _("Driver %1 should provide basic functionality."), backend ); } + } + else + { if( "minimal" == status ) + { if( "unmaintained" == version ) + { status_string = sformat( // Scanner model list status entry for "minimal" supported models + // but where the backend (scanner driver) is unmaintained: + // %1 will be replaced by the backend (scanner driver) name + _("Unmaintained driver %1 may provide minimal functionality."), + backend + ); + } + else + { status_string = sformat( // Scanner model list status entry for "minimal" supported models: + // %1 will be replaced by the backend (scanner driver) name + _("Driver %1 should provide minimal functionality."), + backend + ); + } + } else { status_string = sformat( // Fallback scanner model list status entry for models // which are listed but without a known support status: Modified: trunk/scanner/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/dialogs.ycp?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/src/dialogs.ycp (original) +++ trunk/scanner/src/dialogs.ycp Thu Feb 11 17:19:48 2010 @@ -1,3 +1,24 @@ + +/* + * Copyright (c) 2010 Novell, Inc. + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * 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, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com + */ + /** * File: include/scanner/dialogs.ycp * Package: Configuration of scanner Modified: trunk/scanner/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/helps.ycp?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/src/helps.ycp (original) +++ trunk/scanner/src/helps.ycp Thu Feb 11 17:19:48 2010 @@ -1,3 +1,24 @@ + +/* + * Copyright (c) 2010 Novell, Inc. + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * 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, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com + */ + /** * File: include/scanner/helps.ycp * Package: Configuration of scanner @@ -156,11 +177,16 @@ <tt>http://www.sane-project.org/</tt>. </p>") + // SelectModel dialog help 2/5: +// Do not change or translate "SANE", it is a project name. // Do not change or translate "sane-backends", it is a package name. _("<p> A model is supported if there is at least one appropriate scanner driver available. -Most scanner drivers are provided by the sane-backends package. -The support status varies from minimal to complete. +Most scanner drivers are from the SANE project and provided in the sane-backends package. +The support status for a particular model varies from minimal to complete.<br> +When a driver is shown as 'unmaintained', it does not mean that the driver does not work. +Even an unmaintained driver could work perfectly well. +But it means that there is no longer someone who knows about the driver internals +so that there is usually no help if there are issues with an unmaintained driver. </p>") + // SelectModel dialog help 3/5: _("<p> Modified: trunk/scanner/src/scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/scanner.ycp?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/src/scanner.ycp (original) +++ trunk/scanner/src/scanner.ycp Thu Feb 11 17:19:48 2010 @@ -1,3 +1,24 @@ + +/* + * Copyright (c) 2010 Novell, Inc. + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * 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, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com + */ + /** * File: clients/scanner.ycp * Package: Configuration of scanner Modified: trunk/scanner/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/wizards.ycp?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/src/wizards.ycp (original) +++ trunk/scanner/src/wizards.ycp Thu Feb 11 17:19:48 2010 @@ -1,3 +1,24 @@ + +/* + * Copyright (c) 2010 Novell, Inc. + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * 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, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com + */ + /** * File: include/scanner/wizards.ycp * Package: Configuration of scanner Modified: trunk/scanner/tools/activate_scanner_backend URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/activate_scanner_backend?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/activate_scanner_backend (original) +++ trunk/scanner/tools/activate_scanner_backend Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x Modified: trunk/scanner/tools/autodetect_scanners URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/autodetect_scanners?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/autodetect_scanners (original) +++ trunk/scanner/tools/autodetect_scanners Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x Modified: trunk/scanner/tools/create_scanner_database URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/create_scanner_database?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/create_scanner_database (original) +++ trunk/scanner/tools/create_scanner_database Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# 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, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x @@ -23,7 +41,7 @@ # Function to extract entries from a description file with SANE syntax. # Quoted quotation marks '\"' (happens in comments) are replaced by ' ': Extract() -{ cat $1 | sed -e 's/\\"/ /g' | egrep -o '^[[:space:]]*:backend[[:space:]]*"[^"]*"|^[[:space:]]*:mfg[[:space:]]*"[^"]*"|^[[:space:]]*:model[[:space:]]*"[^"]*"|^[[:space:]]*:firmware[[:space:]]*"[^"]*"|^[[:space:]]*:interface[[:space:]]*"[^"]*"|^[[:space:]]*:usbid[[:space:]]*"0x[0-9A-Fa-f]*"[[:space:]]*"0x[0-9A-Fa-f]*"|^[[:space:]]*:status[[:space:]]*:[a-z]*|^[[:space:]]*:comment[[:space:]]*"[^"]*"' +{ cat $1 | sed -e 's/\\"/ /g' | egrep -o '^[[:space:]]*:backend[[:space:]]*"[^"]*"|^[[:space:]]*:version[[:space:]]*"[^"]*"|^[[:space:]]*:mfg[[:space:]]*"[^"]*"|^[[:space:]]*:model[[:space:]]*"[^"]*"|^[[:space:]]*:firmware[[:space:]]*"[^"]*"|^[[:space:]]*:interface[[:space:]]*"[^"]*"|^[[:space:]]*:usbid[[:space:]]*"0x[0-9A-Fa-f]*"[[:space:]]*"0x[0-9A-Fa-f]*"|^[[:space:]]*:status[[:space:]]*:[a-z]*|^[[:space:]]*:comment[[:space:]]*"[^"]*"' } # Process the SANE description files: @@ -95,13 +113,14 @@ # Output header: if [ "$OUTPUT_FORMAT" = "YCP" ] then echo "[" -else echo "PACKAGE|BACKEND|MANUFACTURER|MODEL|FIRMWARE|INTERFACE|USBID|STATUS|COMMENT" +else echo "PACKAGE|BACKEND|VERSION|MANUFACTURER|MODEL|FIRMWARE|INTERFACE|USBID|STATUS|COMMENT" fi # Function to output one scanner entry: Output() { if [ -n "$PACKAGE" -a -n "$BACKEND" -a -n "$MANUFACTURER" -a -n "$MODEL" -a -n "$STATUS" ] - then [ -z "$FIRMWARE" ] && FIRMWARE='""' + then [ -z "$VERSION" ] && VERSION='""' + [ -z "$FIRMWARE" ] && FIRMWARE='""' [ -z "$INTERFACE" ] && INTERFACE='""' [ -z "$USBID" ] && USBID='""' [ -z "$COMMENT" ] && COMMENT='""' @@ -112,8 +131,8 @@ fi fi if [ "$OUTPUT_FORMAT" = "YCP" ] - then echo -e " \$[ \"package\":$PACKAGE,\n \"backend\":$BACKEND,\n \"manufacturer\":$MANUFACTURER,\n \"model\":$MODEL,\n \"firmware\":$FIRMWARE,\n \"interface\":$INTERFACE,\n \"usbid\":$USBID,\n \"status\":$STATUS,\n \"comment\":$COMMENT\n ]," - else echo "$PACKAGE|$BACKEND|$MANUFACTURER|$MODEL|$FIRMWARE|$INTERFACE|$USBID|$STATUS|$COMMENT" | tr -d '"' + then echo -e " \$[ \"package\":$PACKAGE,\n \"backend\":$BACKEND,\n \"version\":$VERSION,\n \"manufacturer\":$MANUFACTURER,\n \"model\":$MODEL,\n \"firmware\":$FIRMWARE,\n \"interface\":$INTERFACE,\n \"usbid\":$USBID,\n \"status\":$STATUS,\n \"comment\":$COMMENT\n ]," + else echo "$PACKAGE|$BACKEND|$VERSION|$MANUFACTURER|$MODEL|$FIRMWARE|$INTERFACE|$USBID|$STATUS|$COMMENT" | tr -d '"' fi fi } @@ -131,6 +150,7 @@ :package) Output PACKAGE="$VALUE" BACKEND="" + VERSION="" MANUFACTURER="" MODEL="" FIRMWARE="" @@ -140,6 +160,16 @@ COMMENT="" ;; :backend) Output BACKEND=$( echo "$VALUE" | tr '[:upper:]' '[:lower:]' ) + VERSION="" + MANUFACTURER="" + MODEL="" + FIRMWARE="" + INTERFACE="" + USBID="" + STATUS="" + COMMENT="" ;; + :version) Output + VERSION=$( echo "$VALUE" | tr '[:upper:]' '[:lower:]' ) MANUFACTURER="" MODEL="" FIRMWARE="" Modified: trunk/scanner/tools/deactivate_scanner_backend URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/deactivate_scanner_backend?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/deactivate_scanner_backend (original) +++ trunk/scanner/tools/deactivate_scanner_backend Thu Feb 11 17:19:48 2010 @@ -1,8 +1,27 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# 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, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x + export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" Modified: trunk/scanner/tools/determine_active_scanner_backends URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/determine_active_scanner_backends?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/determine_active_scanner_backends (original) +++ trunk/scanner/tools/determine_active_scanner_backends Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x Modified: trunk/scanner/tools/determine_active_scanners URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/determine_active_scanners?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/determine_active_scanners (original) +++ trunk/scanner/tools/determine_active_scanners Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x Modified: trunk/scanner/tools/determine_network_scanner_config URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/determine_network_scanner_config?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/determine_network_scanner_config (original) +++ trunk/scanner/tools/determine_network_scanner_config Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x Modified: trunk/scanner/tools/displaytest.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/displaytest.c?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/displaytest.c (original) +++ trunk/scanner/tools/displaytest.c Thu Feb 11 17:19:48 2010 @@ -1,3 +1,26 @@ + +/* + * Johannes Meixner , 2008, 2010 + * + * Copyright (c) 2010 Novell, Inc. + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * 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, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com + */ + /* * gcc -Wall -o display display.c -L/usr/X11R6/lib -lX11 */ @@ -19,3 +42,4 @@ XCloseDisplay(d); return 0; } + Modified: trunk/scanner/tools/setup_hplip_scanner_service URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/setup_hplip_scanner_service?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/setup_hplip_scanner_service (original) +++ trunk/scanner/tools/setup_hplip_scanner_service Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x Modified: trunk/scanner/tools/setup_network_scanner_config URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/setup_network_scanner_config?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/setup_network_scanner_config (original) +++ trunk/scanner/tools/setup_network_scanner_config Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x Modified: trunk/scanner/tools/setup_ptal_scanner_service URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/setup_ptal_scanner_service?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/setup_ptal_scanner_service (original) +++ trunk/scanner/tools/setup_ptal_scanner_service Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x Modified: trunk/scanner/tools/test_and_set_scanner_access_permissions URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/test_and_set_scanner_access_permissions?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/test_and_set_scanner_access_permissions (original) +++ trunk/scanner/tools/test_and_set_scanner_access_permissions Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x Modified: trunk/scanner/tools/test_scanner_backend URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/test_scanner_backend?rev=60804&r1=60803&r2=60804&view=diff ============================================================================== --- trunk/scanner/tools/test_scanner_backend (original) +++ trunk/scanner/tools/test_scanner_backend Thu Feb 11 17:19:48 2010 @@ -1,6 +1,24 @@ #! /bin/bash + +# Johannes Meixner , 2004, 2005, 2006, 2007, 2008, 2010 +# +# Copyright (c) 2010 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# 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, contact Novell, Inc. # -# Johannes Meixner , 2004, 2005, 2006, 2007, 2008 +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com #set -x -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org