Commit a56bf82d authored by Didier Raboud's avatar Didier Raboud

Imported Upstream version 3.11.10

parent a660bfa2

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

This diff is collapsed.
......@@ -190,6 +190,7 @@ class Logger(object):
if newline:
out.write('\n')
out.flush()
finally:
self._lock.release()
......@@ -530,4 +531,4 @@ class Logger(object):
def pprint(self, data):
self.info(pprint.pformat(data))
\ No newline at end of file
self.info(pprint.pformat(data))
......@@ -1236,6 +1236,10 @@ def whatis(data):
if ord(c) == 0:
return 'data'
# its ASCII, now do C/CPP tests
if data.find('#include', 0, 256) > -1 or data.find('/***', 0, 256) > -1:
return 'text/cpp'
# its ASCII, now do text tests
if data.find('!/usr/bin/env python', 0, 256) > -1 or data.find('def ', 0, 8192) > -1:
return 'application/x-python'
......
......@@ -303,12 +303,15 @@ def detectNetworkDevices(ttl=4, timeout=10):
key, value = result.split('=')
txt[key] = value
except ValueError:
pas
pass
off += l
log.debug("TXT: %s" % repr(txt))
y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % txt['ty']
try:
y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % txt['ty']
except KeyError:
log.debug("NO ty Key in txt: %s" % repr(txt))
if 'note' in txt:
y['note'] = txt['note']
......
......@@ -102,6 +102,9 @@ TECH_CLASSES = [
"Python10",
"Mimas",
"StingrayOJ",
"Copperhead",
"Ampere",
"Python11",
]
TECH_CLASSES.sort()
......@@ -155,6 +158,8 @@ TECH_CLASS_PDLS = {
"Python10" : 'pcl3',
"Mimas" : 'pcl3',
"StingrayOJ" : 'pcl3',
"Copperhead" : 'pcl3',
"Ampere" : 'pcl3'
}
......@@ -209,6 +214,7 @@ TECH_SUBCLASSES = [
"Trim",
"4800x1200dpi",
"Advanced",
"AutoDuplex"
]
TECH_SUBCLASSES.sort()
......
......@@ -731,7 +731,10 @@ try:
else:
found = False
for line in f:
if 'hpaio' in line:
lineNoSpace = re.sub(r'\s', '', line)
hpaiomatched=re.match('hpaio',lineNoSpace)
# if 'hpaio' in line:
if hpaiomatched:
found = True
if found:
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.11.7.
# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.11.10.
#
# Report bugs to <3.11.7>.
# Report bugs to <3.11.10>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
......@@ -750,9 +750,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='HP Linux Imaging and Printing'
PACKAGE_TARNAME='hplip'
PACKAGE_VERSION='3.11.7'
PACKAGE_STRING='HP Linux Imaging and Printing 3.11.7'
PACKAGE_BUGREPORT='3.11.7'
PACKAGE_VERSION='3.11.10'
PACKAGE_STRING='HP Linux Imaging and Printing 3.11.10'
PACKAGE_BUGREPORT='3.11.10'
# Factoring default headers for most tests.
ac_includes_default="\
......@@ -1636,7 +1636,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures HP Linux Imaging and Printing 3.11.7 to adapt to many kinds of systems.
\`configure' configures HP Linux Imaging and Printing 3.11.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1706,7 +1706,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.11.7:";;
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.11.10:";;
esac
cat <<\_ACEOF
......@@ -1795,7 +1795,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <3.11.7>.
Report bugs to <3.11.10>.
_ACEOF
ac_status=$?
fi
......@@ -1858,7 +1858,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
HP Linux Imaging and Printing configure 3.11.7
HP Linux Imaging and Printing configure 3.11.10
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1872,7 +1872,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by HP Linux Imaging and Printing $as_me 3.11.7, which was
It was created by HP Linux Imaging and Printing $as_me 3.11.10, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
......@@ -2722,7 +2722,7 @@ fi
# Define the identity of the package.
PACKAGE='hplip'
VERSION='3.11.7'
VERSION='3.11.10'
cat >>confdefs.h <<_ACEOF
......@@ -6062,9 +6062,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------- ##
## Report this to 3.11.7 ##
## --------------------- ##
## ---------------------- ##
## Report this to 3.11.10 ##
## ---------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -20680,9 +20680,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------- ##
## Report this to 3.11.7 ##
## --------------------- ##
## ---------------------- ##
## Report this to 3.11.10 ##
## ---------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -20835,9 +20835,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------- ##
## Report this to 3.11.7 ##
## --------------------- ##
## ---------------------- ##
## Report this to 3.11.10 ##
## ---------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -22565,9 +22565,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------- ##
## Report this to 3.11.7 ##
## --------------------- ##
## ---------------------- ##
## Report this to 3.11.10 ##
## ---------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -22721,9 +22721,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------- ##
## Report this to 3.11.7 ##
## --------------------- ##
## ---------------------- ##
## Report this to 3.11.10 ##
## ---------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -22880,9 +22880,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------- ##
## Report this to 3.11.7 ##
## --------------------- ##
## ---------------------- ##
## Report this to 3.11.10 ##
## ---------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -23111,9 +23111,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------- ##
## Report this to 3.11.7 ##
## --------------------- ##
## ---------------------- ##
## Report this to 3.11.10 ##
## ---------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -23339,9 +23339,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------- ##
## Report this to 3.11.7 ##