Commit c9646a88 authored by Didier Raboud's avatar Didier Raboud

New upstream version 3.18.5

parent 37d589d7

Too many changes to show.

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

......@@ -764,6 +764,7 @@ am__dist_postscript_DATA_DIST = data/ps/testpage.ps.gz \
am__dist_ppd_DATA_DIST = prnt/ps/hp-postscript-laserjet.ppd.gz \
prnt/ps/hp-laserjet_4v-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz \
prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz \
prnt/ps/hp-laserjet_4_plus-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz \
prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz \
......@@ -854,6 +855,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-postscript-laserjet.ppd.gz \
prnt/ps/hp-pagewide_352_printer-ps.ppd.gz \
prnt/ps/hp-laserjet_4240-ps.ppd.gz \
prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \
prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz \
prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2840-ps.ppd.gz \
prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \
......@@ -864,6 +866,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-postscript-laserjet.ppd.gz \
prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz \
prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz \
prnt/ps/hp-laserjet_2430-ps.ppd.gz \
prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz \
prnt/ps/hp-designjet_t1500-postscript.ppd.gz \
prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz \
prnt/ps/hp-color_laserjet_4500-ps.ppd.gz \
......@@ -907,6 +910,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-postscript-laserjet.ppd.gz \
prnt/ps/hp-laserjet_4si-ps.ppd.gz \
prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz \
prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz \
prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz \
prnt/ps/hp-laserjet_4200-ps.ppd.gz \
prnt/ps/hp-laserjet_5p-ps.ppd.gz \
......@@ -928,6 +932,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-postscript-laserjet.ppd.gz \
prnt/ps/hp-color_laserjet_8550-ps.ppd.gz \
prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz \
prnt/ps/hp-laserjet_4ml-ps.ppd.gz \
prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz \
prnt/ps/hp-laserjet_8000-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2800-ps.ppd.gz \
prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz \
......@@ -958,6 +963,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-postscript-laserjet.ppd.gz \
prnt/ps/hp-laserjet_m506-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \
prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz \
prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz \
prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz \
prnt/ps/hp-laserjet_4000_series-ps.ppd.gz \
prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz \
......@@ -1043,8 +1049,10 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-postscript-laserjet.ppd.gz \
prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz \
prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz \
prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz \
prnt/ps/hp-laserjet_2420-ps.ppd.gz \
prnt/ps/hp-laserjet_8000_series-ps.ppd.gz \
prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz \
prnt/ps/hp-mopier_320-ps.ppd.gz \
prnt/ps/hp-business_inkjet_2600-ps.ppd.gz \
prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz \
......@@ -3019,6 +3027,7 @@ foomatic_ps_printers = \
prnt/ps/hp-postscript-laserjet.ppd.gz \
prnt/ps/hp-laserjet_4v-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz \
prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz \
prnt/ps/hp-laserjet_4_plus-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz \
prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz \
......@@ -3109,6 +3118,7 @@ foomatic_ps_printers = \
prnt/ps/hp-pagewide_352_printer-ps.ppd.gz \
prnt/ps/hp-laserjet_4240-ps.ppd.gz \
prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \
prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz \
prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2840-ps.ppd.gz \
prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \
......@@ -3119,6 +3129,7 @@ foomatic_ps_printers = \
prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz \
prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz \
prnt/ps/hp-laserjet_2430-ps.ppd.gz \
prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz \
prnt/ps/hp-designjet_t1500-postscript.ppd.gz \
prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz \
prnt/ps/hp-color_laserjet_4500-ps.ppd.gz \
......@@ -3162,6 +3173,7 @@ foomatic_ps_printers = \
prnt/ps/hp-laserjet_4si-ps.ppd.gz \
prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz \
prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz \
prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz \
prnt/ps/hp-laserjet_4200-ps.ppd.gz \
prnt/ps/hp-laserjet_5p-ps.ppd.gz \
......@@ -3183,6 +3195,7 @@ foomatic_ps_printers = \
prnt/ps/hp-color_laserjet_8550-ps.ppd.gz \
prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz \
prnt/ps/hp-laserjet_4ml-ps.ppd.gz \
prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz \
prnt/ps/hp-laserjet_8000-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2800-ps.ppd.gz \
prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz \
......@@ -3213,6 +3226,7 @@ foomatic_ps_printers = \
prnt/ps/hp-laserjet_m506-ps.ppd.gz \
prnt/ps/hp-color_laserjet_2830-ps.ppd.gz \
prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz \
prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz \
prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz \
prnt/ps/hp-laserjet_4000_series-ps.ppd.gz \
prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz \
......@@ -3298,8 +3312,10 @@ foomatic_ps_printers = \
prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz \
prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz \
prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz \
prnt/ps/hp-laserjet_2420-ps.ppd.gz \
prnt/ps/hp-laserjet_8000_series-ps.ppd.gz \
prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz \
prnt/ps/hp-mopier_320-ps.ppd.gz \
prnt/ps/hp-business_inkjet_2600-ps.ppd.gz \
prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz \
......
......@@ -953,7 +953,10 @@ else:
def printable(s):
if s:
return s.translate(identity, unprintable)
else:
return ""
def any(S,f=lambda x:x):
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.18.4.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.18.5.
#
# Report bugs to <3.18.4>.
# Report bugs to <3.18.5>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -246,7 +246,7 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.18.4 about your
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.18.5 about your
$0: system, including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
......@@ -569,9 +569,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='HP Linux Imaging and Printing'
PACKAGE_TARNAME='hplip'
PACKAGE_VERSION='3.18.4'
PACKAGE_STRING='HP Linux Imaging and Printing 3.18.4'
PACKAGE_BUGREPORT='3.18.4'
PACKAGE_VERSION='3.18.5'
PACKAGE_STRING='HP Linux Imaging and Printing 3.18.5'
PACKAGE_BUGREPORT='3.18.5'
PACKAGE_URL=''
# Factoring default headers for most tests.
......@@ -1488,7 +1488,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.18.4 to adapt to many kinds of systems.
\`configure' configures HP Linux Imaging and Printing 3.18.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1558,7 +1558,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.18.4:";;
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.18.5:";;
esac
cat <<\_ACEOF
......@@ -1659,7 +1659,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.18.4>.
Report bugs to <3.18.5>.
_ACEOF
ac_status=$?
fi
......@@ -1722,7 +1722,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
HP Linux Imaging and Printing configure 3.18.4
HP Linux Imaging and Printing configure 3.18.5
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2189,7 +2189,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## --------------------- ##
## Report this to 3.18.4 ##
## Report this to 3.18.5 ##
## --------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -2266,7 +2266,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.18.4, which was
It was created by HP Linux Imaging and Printing $as_me 3.18.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
......@@ -3082,7 +3082,7 @@ fi
# Define the identity of the package.
PACKAGE='hplip'
VERSION='3.18.4'
VERSION='3.18.5'
cat >>confdefs.h <<_ACEOF
......@@ -18444,7 +18444,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by HP Linux Imaging and Printing $as_me 3.18.4, which was
This file was extended by HP Linux Imaging and Printing $as_me 3.18.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -18495,13 +18495,13 @@ $config_files
Configuration commands:
$config_commands
Report bugs to <3.18.4>."
Report bugs to <3.18.5>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
HP Linux Imaging and Printing config.status 3.18.4
HP Linux Imaging and Printing config.status 3.18.5
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
......
......@@ -26,7 +26,7 @@
# 104 = no libdl
#AC_PREREQ(2.59)
AC_INIT([HP Linux Imaging and Printing], [3.18.4], [3.18.4], [hplip])
AC_INIT([HP Linux Imaging and Printing], [3.18.5], [3.18.5], [hplip])
#AM_INIT_AUTOMAKE([1.9 foreign])
AM_INIT_AUTOMAKE
AC_DISABLE_STATIC
......
This diff is collapsed.
......@@ -143,8 +143,8 @@ class PMLFaxDevice(FaxDevice):
def getPhoneNum(self):
if PY3:
data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1].encode('utf-8'))
return data.decode('utf-8')
data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1])
return data
else:
return utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1])
phone_num = property(getPhoneNum, setPhoneNum, doc="OID_FAX_LOCAL_PHONE_NUM")
......@@ -155,8 +155,8 @@ class PMLFaxDevice(FaxDevice):
def getStationName(self):
if PY3:
data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1].encode('utf-8'))
return data.decode('utf-8')
data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1])