Commit 78face2d authored by Didier Raboud's avatar Didier Raboud

Imported Upstream version 3.12.2

parent a1755d38

Too many changes to show.

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

......@@ -805,6 +805,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \
prnt/ps/hp-laserjet_9050-ps.ppd.gz \
prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \
prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz \
prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz \
prnt/ps/hp-designjet_t7100ps-ps.ppd.gz \
prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz \
......@@ -864,6 +865,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
prnt/ps/hp-laserjet_4000_series-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz \
prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz \
prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz \
ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz \
......@@ -939,6 +941,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz \
......@@ -1251,6 +1254,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz \
......@@ -1434,6 +1438,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_professional_p1102s-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz \
......@@ -1455,6 +1460,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz \
......@@ -1602,6 +1608,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz \
ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz \
......@@ -1970,8 +1977,11 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1102s.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz \
ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \
......@@ -2563,6 +2573,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_professional_p1106-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz \
......@@ -2875,6 +2886,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-color_laserjet_cp1217-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz \
......@@ -3058,6 +3070,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_professional_p1102s-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz \
......@@ -3079,6 +3092,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_professional_p1108-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz \
......@@ -3301,6 +3315,7 @@ foomatic_ps_printers = \
prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \
prnt/ps/hp-laserjet_9050-ps.ppd.gz \
prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \
prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz \
prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz \
prnt/ps/hp-designjet_t7100ps-ps.ppd.gz \
prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz \
......@@ -3360,6 +3375,7 @@ foomatic_ps_printers = \
prnt/ps/hp-laserjet_4000_series-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz \
prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz \
prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz
foomatic_drv = prnt/drv/hpijs.drv
......@@ -3433,6 +3449,7 @@ cups_ppd_printers = \
ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz \
ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz \
ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz \
......@@ -3802,8 +3819,11 @@ cups_ppd_printers = \
ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1102s.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz \
ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \
......
......@@ -2499,6 +2499,31 @@ class Device(object):
if data:
data = status.clean(data)
return data
#-------------------------For LEDM SOAP PROTOCOL(FAX) Devices----------------------------------------------------------------------#
def FetchEWS_LEDMUrl(self, url, footer=""):
data_fp = cStringIO.StringIO()
if footer:
data = self.getEWSUrl_LEDM(url, data_fp, footer)
else:
data = self.getEWSUrl_LEDM(url, data_fp)
if data:
data = data.split('\r\n\r\n', 1)[1]
if data:
data = status.clean(data)
return data
def readAttributeFromXml_EWS(self, uri, attribute):
stream = cStringIO.StringIO()
data = self.FetchEWS_LEDMUrl(uri)
if not data:
log.error("Unable To read the XML data from device")
return ""
xmlDict = utils.XMLToDictParser().parseXML(data)
return str(xmlDict[attribute])
#---------------------------------------------------------------------------------------------------#
def readAttributeFromXml(self,uri,attribute):
stream = cStringIO.StringIO()
......
......@@ -217,8 +217,8 @@ if not log.set_level (log_level):
LOG_FILE = os.path.normpath(LOG_FILE)
log.info(log.bold("Saving output in log file: %s" % LOG_FILE))
#if os.path.exists(LOG_FILE):
# os.remove(LOG_FILE)
if os.path.exists(LOG_FILE):
os.remove(LOG_FILE)
log.set_logfile(LOG_FILE)
log.set_where(log.LOG_TO_CONSOLE_AND_FILE)
......
#! /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.12.
# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.12.2.
#
# Report bugs to <3.11.12>.
# Report bugs to <3.12.2>.
#
# 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.12'
PACKAGE_STRING='HP Linux Imaging and Printing 3.11.12'
PACKAGE_BUGREPORT='3.11.12'
PACKAGE_VERSION='3.12.2'
PACKAGE_STRING='HP Linux Imaging and Printing 3.12.2'
PACKAGE_BUGREPORT='3.12.2'
# 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.12 to adapt to many kinds of systems.
\`configure' configures HP Linux Imaging and Printing 3.12.2 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.12:";;
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.12.2:";;
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.12>.
Report bugs to <3.12.2>.
_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.12
HP Linux Imaging and Printing configure 3.12.2
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.12, which was
It was created by HP Linux Imaging and Printing $as_me 3.12.2, 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.12'
VERSION='3.12.2'
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.12 ##
## ---------------------- ##
## --------------------- ##
## Report this to 3.12.2 ##
## --------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -20680,9 +20680,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result