Commit 094cec9e authored by Didier Raboud's avatar Didier Raboud

New upstream version 3.18.3

parent 2a9b347c

Too many changes to show.

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

......@@ -88,7 +88,7 @@ unsigned char CheckModelNameExsist(string model_name, MODEL_DICT_MAP &model_dict
{
if(it->first == model_name)
{
cout << "Family PPD Name : "<< it->second<<endl;
cout << "Class PPD Name : "<< it->second<<endl;
return 1;
}
}
......@@ -111,7 +111,7 @@ int main (int argc, char **argv)
argument.assign(argument, 4, argument.length());
if((CheckModelNameExsist(argument, model_dict)) != 1)
{
cout<< "ERROR : findppd Invalid Model Name Passed"<<endl;
cout<< "ERROR : hp-locatedriver Invalid Model Name Passed"<<endl;
return -1;
}
model_dict.clear();
......@@ -119,10 +119,10 @@ int main (int argc, char **argv)
}
if((argument.find("-h")) != std::string::npos || (argument.find("--help")) != std::string::npos)
{
cout <<"./findppd [--m=model_name]"<< endl;
cout <<"hp-locatedriver [--m=model_name]"<< endl;
cout <<" --m=<model name> : model name for the device"<< endl;
cout <<"EXAMPLE :"<< endl;
cout <<" ./findppd --m=<model name> : Find family ppd of the model name passed"<< endl;
cout <<" hp-locatedriver --m=<model name> : Find class ppd of the model name passed"<< endl;
model_dict.clear();
return 1;
}
......
......@@ -13,7 +13,7 @@ docdir = $(hpdocdir)
htmldir = $(hphtmldir)
doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG
EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright
UNAME = $(shell uname -p)
UNAME = $(shell uname -m)
dist_noinst_SCRIPTS =
dist_noinst_DATA =
......@@ -691,6 +691,12 @@ if !HPLIP_CLASS_DRIVER
if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/x86_64-linux-gnu/sane" \) ]; then \
ln -sf $(libdir)/sane/libsane-hpaio.so $(libdir)/x86_64-linux-gnu/sane/ ; \
ln -sf $(libdir)/sane/libsane-hpaio.so.1 $(libdir)/x86_64-linux-gnu/sane/ ; \
fi; \
if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/i386-linux-gnu" \) ]; then \
ln -sf $(libdir)/libhpmud.so.0.0.6 $(libdir)/i386-linux-gnu/libhpmud.so ; \
ln -sf $(libdir)/libhpmud.so.0.0.6 $(libdir)/i386-linux-gnu/libhpmud.so.0 ; \
ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(libdir)/i386-linux-gnu/sane/libsane-hpaio.so.1 ; \
ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(libdir)/i386-linux-gnu/sane/libsane-hpaio.so ; \
fi \
fi
endif #HPLIP_CLASS_DRIVER
......@@ -744,6 +750,11 @@ endif
#tarfile(ignoring scan and fax files)
dist-hook:
if !HPLIP_CLASS_DRIVER
rm -rf $(distdir)/hpps
rm -rf $(distdir)/hpcups
rm -rf $(distdir)/dat2drv
endif
if HPLIP_CLASS_DRIVER
rm -rf $(distdir)/faxsetup.py
rm -rf $(distdir)/sendfax.py
......
This diff is collapsed.
This diff is collapsed.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.17.11.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.18.3.
#
# Report bugs to <3.17.11>.
# Report bugs to <3.18.3>.
#
#
# 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.17.11 about your
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.18.3 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.17.11'
PACKAGE_STRING='HP Linux Imaging and Printing 3.17.11'
PACKAGE_BUGREPORT='3.17.11'
PACKAGE_VERSION='3.18.3'
PACKAGE_STRING='HP Linux Imaging and Printing 3.18.3'
PACKAGE_BUGREPORT='3.18.3'
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.17.11 to adapt to many kinds of systems.
\`configure' configures HP Linux Imaging and Printing 3.18.3 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.17.11:";;
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.18.3:";;
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.17.11>.
Report bugs to <3.18.3>.
_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.17.11
HP Linux Imaging and Printing configure 3.18.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2188,9 +2188,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.17.11 ##
## ---------------------- ##"
( $as_echo "## --------------------- ##
## Report this to 3.18.3 ##
## --------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
......@@ -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.17.11, which was
It was created by HP Linux Imaging and Printing $as_me 3.18.3, 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.17.11'
VERSION='3.18.3'
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.17.11, which was
This file was extended by HP Linux Imaging and Printing $as_me 3.18.3, 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.17.11>."
Report bugs to <3.18.3>."
_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.17.11
HP Linux Imaging and Printing config.status 3.18.3
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.17.11], [3.17.11], [hplip])
AC_INIT([HP Linux Imaging and Printing], [3.18.3], [3.18.3], [hplip])
#AM_INIT_AUTOMAKE([1.9 foreign])
AM_INIT_AUTOMAKE
AC_DISABLE_STATIC
......
File deleted
This diff is collapsed.
......@@ -817,6 +817,7 @@ foomatic_ps_printers = \
prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz \
prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz \
prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz \
prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz \
prnt/ps/hp-officejet_pro_8730-ps.ppd.gz \
prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz \
prnt/ps/hp-designjet_t920-postscript.ppd.gz \
......@@ -834,6 +835,7 @@ foomatic_ps_printers = \
prnt/ps/hp-laserjet_5100_series-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz \
prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz \
prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz \
prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz \
prnt/ps/hp-laserjet_1220-ps.ppd.gz \
prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz \
......@@ -848,11 +850,13 @@ foomatic_ps_printers = \
prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz \
prnt/ps/hp-laserjet_1320nw-ps.ppd.gz \
prnt/ps/hp-laserjet_2300_series-ps.ppd.gz \
prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz \
prnt/ps/hp-business_inkjet_3000-ps.ppd.gz \
prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz \
prnt/ps/hp-laserjet_6p-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz \
prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz \
prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz \
......@@ -884,6 +888,7 @@ foomatic_ps_printers = \
prnt/ps/hp-color_laserjet_2840-ps.ppd.gz \
prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \
prnt/ps/hp-business_inkjet_2250-ps.ppd.gz \
prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz \
prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz \
prnt/ps/hp-color_laserjet_4650-ps.ppd.gz \
prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz \
......@@ -931,9 +936,11 @@ foomatic_ps_printers = \
prnt/ps/hp-color_laserjet_4700-ps.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-color_laserjet_cp1518ni-ps.ppd.gz \
prnt/ps/hp-laserjet_4200-ps.ppd.gz \
prnt/ps/hp-laserjet_5p-ps.ppd.gz \
prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz \