Commit fa97f0c2 authored by Didier Raboud's avatar Didier Raboud

Imported Upstream version 3.12.10a

parent d7cd00cb

Too many changes to show.

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

......@@ -85,6 +85,7 @@ import pexpect
BIG_ENDIAN = 0
LITTLE_ENDIAN = 1
DBUS_SERVICE='com.hplip.StatusService'
HPLIP_WEB_SITE ="http://hplipopensource.com/hplip-web/index.html"
def addgroup():
lis = []
......@@ -1923,18 +1924,50 @@ def Is_HPLIP_older_version(installed_version, available_version):
log.debug("HPLIP Installed_version=%s Available_version=%s"%(installed_version,available_version))
cnt = 0
Is_older = False
while cnt <len(installed_array) and cnt <len(available_array):
if(int(installed_array[cnt]) < int(available_array[cnt])):
pat=re.compile('''(\d{1,})([a-z]{1,})''')
try:
while cnt <len(installed_array) and cnt <len(available_array):
installed_ver_dig=0
installed_ver_alph=' '
available_ver_dig=0
available_ver_alph=' '
if pat.search(installed_array[cnt]):
installed_ver_dig = int(pat.search(installed_array[cnt]).group(1))
installed_ver_alph = pat.search(installed_array[cnt]).group(2)
else:
installed_ver_dig = int(installed_array[cnt])
if pat.search(available_array[cnt]):
available_ver_dig = int(pat.search(available_array[cnt]).group(1))
available_ver_alph = pat.search(available_array[cnt]).group(2)
else:
available_ver_dig = int(available_array[cnt])
if (installed_ver_dig < available_ver_dig):
Is_older = True
break
elif (installed_ver_dig > available_ver_dig):
log.debug("Already new verison is installed")
return False
#checking sub minor versions .. e.g "3.12.10a" vs "3.12.10".... "3.12.10a" --> latest
else:
if (installed_ver_alph.lower() < available_ver_alph.lower()):
Is_older = True
break
elif (installed_ver_alph.lower() > available_ver_alph.lower()):
log.debug("Already new verison is installed")
return False
cnt += 1
# To check version is installed. e.g. "3.12.10" vs "3.12.10.1".... "3.12.10.1"-->latest
if Is_older is False and len(installed_array) < len(available_array):
Is_older = True
break
elif(int(installed_array[cnt]) > int(available_array[cnt])):
log.debug("Already new verison is installed")
return False
cnt += 1
# To check internal version is installed.
if Is_older is False and len(installed_array) >len(available_array):
Is_older = True
except:
log.error("Failed to get the latest version. Check out %s for manually installing latest version of HPLIP."%HPLIP_WEB_SITE)
return False
return Is_older
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.12.10.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.12.10a.
#
# Report bugs to <3.12.10>.
# Report bugs to <3.12.10a>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -246,10 +246,10 @@ 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.12.10 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."
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.12.10a about
$0: your system, including any error possibly output before
$0: this message. Then install a modern shell, or manually
$0: run the script under such a shell if you do have one."
fi
exit 1
fi
......@@ -569,9 +569,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='HP Linux Imaging and Printing'
PACKAGE_TARNAME='hplip'
PACKAGE_VERSION='3.12.10'
PACKAGE_STRING='HP Linux Imaging and Printing 3.12.10'
PACKAGE_BUGREPORT='3.12.10'
PACKAGE_VERSION='3.12.10a'
PACKAGE_STRING='HP Linux Imaging and Printing 3.12.10a'
PACKAGE_BUGREPORT='3.12.10a'
PACKAGE_URL=''
# Factoring default headers for most tests.
......@@ -1465,7 +1465,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.12.10 to adapt to many kinds of systems.
\`configure' configures HP Linux Imaging and Printing 3.12.10a to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1535,7 +1535,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.12.10:";;
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.12.10a:";;
esac
cat <<\_ACEOF
......@@ -1629,7 +1629,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.12.10>.
Report bugs to <3.12.10a>.
_ACEOF
ac_status=$?
fi
......@@ -1692,7 +1692,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
HP Linux Imaging and Printing configure 3.12.10
HP Linux Imaging and Printing configure 3.12.10a
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2158,9 +2158,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $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.12.10 ##
## ---------------------- ##"
( $as_echo "## ----------------------- ##
## Report this to 3.12.10a ##
## ----------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
......@@ -2236,7 +2236,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.12.10, which was
It was created by HP Linux Imaging and Printing $as_me 3.12.10a, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
......@@ -3052,7 +3052,7 @@ fi
# Define the identity of the package.
PACKAGE='hplip'
VERSION='3.12.10'
VERSION='3.12.10a'
cat >>confdefs.h <<_ACEOF
......@@ -18237,7 +18237,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.12.10, which was
This file was extended by HP Linux Imaging and Printing $as_me 3.12.10a, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -18288,13 +18288,13 @@ $config_files
Configuration commands:
$config_commands
Report bugs to <3.12.10>."
Report bugs to <3.12.10a>."
_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.12.10
HP Linux Imaging and Printing config.status 3.12.10a
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.12.10], [3.12.10], [hplip])
AC_INIT([HP Linux Imaging and Printing], [3.12.10a], [3.12.10a], [hplip])
#AM_INIT_AUTOMAKE([1.9 foreign])
AM_INIT_AUTOMAKE
AC_DISABLE_STATIC
......
No preview for this file type
No preview for this file type