Commit a660bfa2 authored by Didier Raboud's avatar Didier Raboud

Imported Upstream version 3.11.7

parent 8d35aca8

Too many changes to show.

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

......@@ -761,6 +761,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz \
prnt/ps/hp-laserjet_5200l-ps.ppd.gz \
prnt/ps/hp-laserjet_3052-ps.ppd.gz \
prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz \
prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz \
prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \
......@@ -1372,6 +1373,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz \
......@@ -1386,6 +1388,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz \
ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz \
......@@ -1402,6 +1405,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz \
ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz \
......@@ -1513,7 +1517,6 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_cp1026nw-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz \
......@@ -1616,6 +1619,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz \
ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz \
ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz \
ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz \
ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz \
ppd/hpcups/hp-deskjet_3320.ppd.gz \
ppd/hpcups/hp-deskjet_3325.ppd.gz \
......@@ -1877,7 +1881,6 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpcups/hp-laserjet_cp1023.ppd.gz \
ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
ppd/hpcups/hp-laserjet_cp1026nw.ppd.gz \
ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz \
ppd/hpcups/hp-laserjet_cp1028nw.ppd.gz \
ppd/hpcups/hp-laserjet_m1005.ppd.gz \
......@@ -1946,7 +1949,9 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.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_p_1102w.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
......@@ -2975,6 +2980,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz \
......@@ -2989,6 +2995,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz \
ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz \
......@@ -3005,6 +3012,7 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz \
ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz \
ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz \
......@@ -3116,7 +3124,6 @@ foomatic_ppd_printers = \
ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz \
ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz \
ppd/hpijs/hp-laserjet_cp1026nw-hpijs.ppd.gz \
ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz \
ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz \
ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz \
......@@ -3222,6 +3229,7 @@ foomatic_ps_printers = \
prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz \
prnt/ps/hp-laserjet_5200l-ps.ppd.gz \
prnt/ps/hp-laserjet_3052-ps.ppd.gz \
prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz \
prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz \
prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \
......@@ -3422,6 +3430,7 @@ cups_ppd_printers = \
ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz \
ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz \
ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz \
ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz \
ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz \
ppd/hpcups/hp-deskjet_3320.ppd.gz \
ppd/hpcups/hp-deskjet_3325.ppd.gz \
......@@ -3684,7 +3693,6 @@ cups_ppd_printers = \
ppd/hpcups/hp-laserjet_cp1023.ppd.gz \
ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
ppd/hpcups/hp-laserjet_cp1026nw.ppd.gz \
ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz \
ppd/hpcups/hp-laserjet_cp1028nw.ppd.gz \
ppd/hpcups/hp-laserjet_m1005.ppd.gz \
......@@ -3753,7 +3761,9 @@ cups_ppd_printers = \
ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz \
ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.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_p_1102w.ppd.gz \
ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
......
......@@ -367,7 +367,7 @@ def readXmlDataFromURI(dev,URI,xmlRootNode,xmlChildNode,timeout=5):
dev.writeLEDM(data)
response = cStringIO.StringIO()
try:
while dev.readLEDM(1000, response, timeout):
while dev.readLEDM(1024, response, timeout):
pass
except Error:
dev.closeLEDM()
......
......@@ -692,6 +692,7 @@ SCAN_TYPE_MARVEL2 = 8
SCAN_STYLE_NONE = 0
SCAN_STYLE_FLATBED = 1
SCAN_STYLE_SCROLLFED = 2
SCAN_STYLE_BOTH = 3
# scan-src
SCAN_SRC_NA = 0
......
......@@ -155,6 +155,7 @@ TECH_CLASS_PDLS = {
"Python10" : 'pcl3',
"Mimas" : 'pcl3',
"StingrayOJ" : 'pcl3',
}
PDL_TYPE_PCL = 0 # less preferred
......
......@@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Author: Stan Dolson
# Author: Stan Dolson , Goutam Kodu
#
# Std Lib
......@@ -462,9 +462,9 @@ def run_plugin_command(required=True, plugin_reason=PLUGIN_REASON_NONE):
if need_sudo:
su_sudo = utils.su_sudo()
if su_sudo is "su":
name,version = utils.os_release()
log.debug("name = %s version = %s" %(name,version))
if ( name == 'Fedora' and version >= '14'):
name,version,is_su = utils.os_release()
log.debug("name = %s version = %s is_su = %s" %(name,version,is_su))
if ( name == 'Fedora' and version >= '14' and is_su == True):
#using su opening GUI apps fail in Fedora 14.
#To run GUI apps as root, you need a root login shell (su -) in Fedora 14
su_sudo = 'su - -c "%s"'
......
......@@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Author: Don Welch, Naga Samrat Chowdary Narla
# Author: Don Welch, Naga Samrat Chowdary Narla, Goutam Kodu
#
# Thanks to Henrique M. Holschuh <hmh@debian.org> for various security patches
#
......@@ -1630,10 +1630,12 @@ def su_sudo():
return su_sudo_str
# This function returns the distro name and distro version.
#This is provided to check on Fedora 14 in pkit.py file for Plugin-installation.
#This is provided to check on Fedora 14 in pkit.py file for Plugin-installation.
#is_su variable is used to provide a check on Fedora 8
def os_release():
os_name = None;
os_version = None;
is_su = None;
if which('lsb_release'):
name = os.popen('lsb_release -i | cut -f 2')
os_name = name.read().strip()
......@@ -1641,15 +1643,24 @@ def os_release():
version = os.popen('lsb_release -r | cut -f 2')
os_version=version.read().strip()
version.close()
is_su = True
else:
name = os.popen('cat /etc/issue | cut -c 1-7 | head -n 1')
name = os.popen('cat /etc/issue | cut -c 1-6 | head -n 1')
os_name = name.read().strip()
name.close()
version=os.popen('cat /etc/issue | cut -c 16-17 | head -n 1')
version1=os.popen('cat /etc/issue | cut -c 16 | head -n 1')
version2=version1.read().strip()
version1.close()
if (version2 == '1'):
version=os.popen('cat /etc/issue | cut -c 16-17 | head -n 1')
is_su = True
else:
version=os.popen('cat /etc/issue | cut -c 16 | head -n 1')
is_su = False
os_version=version.read().strip()
version.close()
return os_name,os_version
return os_name,os_version,is_su
#
......
#! /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.5.
# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.11.7.
#
# Report bugs to <3.11.5>.
# Report bugs to <3.11.7>.
#
# 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.5'
PACKAGE_STRING='HP Linux Imaging and Printing 3.11.5'
PACKAGE_BUGREPORT='3.11.5'
PACKAGE_VERSION='3.11.7'
PACKAGE_STRING='HP Linux Imaging and Printing 3.11.7'
PACKAGE_BUGREPORT='3.11.7'
# 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.5 to adapt to many kinds of systems.
\`configure' configures HP Linux Imaging and Printing 3.11.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1706,7 +1706,7 @@ fi