Codebase list foomatic-db-engine / 2b5144f
foomatic-db-engine 4.0.8-0ubuntu1 Till Kamppeter 12 years ago
8 changed file(s) with 100 addition(s) and 29 deletion(s). Raw diff Collapse all Expand all
+30
-0
ChangeLog less more
0 2011-07-25 Till Kamppeter <till.kamppeter@gmail.com>
1
2 * Tagged branch for release 4.0.8.
3
4 * README, USAGE, configure.ac: Updated for release 4.0.8.
5
6 2011-06-30 Till Kamppeter <till.kamppeter@gmail.com>
7
8 * lib/Foomatic/PPD.pm: Improved printer entry searh algorithm
9 (find_printer() method) in two points:
10 1. Score match of only make and model in printer ID of the entry
11 higher than match of make and model fields of the entry but
12 lower than match of full printer ID. This raises the relevance
13 of printer ID matches if the search term contains only a partial
14 device ID consisting of only the make and model fields.
15 2. Score a printer entry with an actual printer XML file 1 point
16 higher than an implicit printer entry only coming from a
17 printer name in a driver's printer list. This raises the
18 relevance of actual printer XML entries.
19
20 2011-03-04 Till Kamppeter <till.kamppeter@gmail.com>
21
22 * lib/Foomatic/PPD.pm: Handle non-UTF-8 encodings in imported PPD
23 files. Thanks to Richard Hughes (hughsient at gmail dot com) for
24 supplying me this patch from Red Hat.
25
26 * configure.ac: Added libdir support for the ./configure
27 script. Thanks to Richard Hughes (hughsient at gmail dot com) for
28 supplying me this patch from Red Hat.
29
030 2011-02-18 Till Kamppeter <till.kamppeter@gmail.com>
131
232 * Tagged branch for release 4.0.7.
+1
-1
README less more
00
1 Foomatic 4.0.7
1 Foomatic 4.0.8
22 ==============
33
44
+1
-1
USAGE less more
00
1 Foomatic 4.0.7
1 Foomatic 4.0.8
22 ==============
33
44 foomatic-db-engine
+14
-14
configure less more
00 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.61 for foomatic-db-engine 4.0.7.
2 # Generated by GNU Autoconf 2.61 for foomatic-db-engine 4.0.8.
33 #
44 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
55 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
571571 # Identity of this package.
572572 PACKAGE_NAME='foomatic-db-engine'
573573 PACKAGE_TARNAME='foomatic-db-engine'
574 PACKAGE_VERSION='4.0.7'
575 PACKAGE_STRING='foomatic-db-engine 4.0.7'
574 PACKAGE_VERSION='4.0.8'
575 PACKAGE_STRING='foomatic-db-engine 4.0.8'
576576 PACKAGE_BUGREPORT=''
577577
578578 ac_unique_file="foomatic-perl-data.c"
12141214 # Omit some internal or obsolete options to make the list less imposing.
12151215 # This message is too long to be a string in the A/UX 3.1 sh.
12161216 cat <<_ACEOF
1217 \`configure' configures foomatic-db-engine 4.0.7 to adapt to many kinds of systems.
1217 \`configure' configures foomatic-db-engine 4.0.8 to adapt to many kinds of systems.
12181218
12191219 Usage: $0 [OPTION]... [VAR=VALUE]...
12201220
12751275
12761276 if test -n "$ac_init_help"; then
12771277 case $ac_init_help in
1278 short | recursive ) echo "Configuration of foomatic-db-engine 4.0.7:";;
1278 short | recursive ) echo "Configuration of foomatic-db-engine 4.0.8:";;
12791279 esac
12801280 cat <<\_ACEOF
12811281
13601360 test -n "$ac_init_help" && exit $ac_status
13611361 if $ac_init_version; then
13621362 cat <<\_ACEOF
1363 foomatic-db-engine configure 4.0.7
1363 foomatic-db-engine configure 4.0.8
13641364 generated by GNU Autoconf 2.61
13651365
13661366 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
13741374 This file contains any messages produced by compilers while
13751375 running configure, to aid debugging if configure makes a mistake.
13761376
1377 It was created by foomatic-db-engine $as_me 4.0.7, which was
1377 It was created by foomatic-db-engine $as_me 4.0.8, which was
13781378 generated by GNU Autoconf 2.61. Invocation command line was
13791379
13801380 $ $0 $@
40424042 SYSCONFSEARCHPATH=/etc:/usr/etc:/usr/local/etc:/var/etc
40434043 SBINSEARCHPATH=/usr/sbin:/sbin:/usr/local/sbin:/etc/sbin
40444044 BINSEARCHPATH=/usr/bin:/bin:/usr/local/bin
4045 DATASEARCHPATH=/usr/share:/usr/local/share:/usr/lib:/usr/local/lib:/opt
4046 LIBSEARCHPATH=/usr/lib:/lib:/usr/local/lib:/usr/local/libexec:/opt
4045 DATASEARCHPATH=/usr/share:/usr/local/share:$libdir:/usr/local/lib:/opt
4046 LIBSEARCHPATH=$libdir:/lib:/usr/local/lib:/usr/local/libexec:/opt
40474047 PTALPIPESSEARCHPATH=/var/run:/var:/var/ptal:/usr/var/run:/usr/var:/usr/var/ptal:/usr/local/var/run:/usr/local/var:/usr/local/var/ptal:/dev:/dev/ptal
40484048 MTINKPIPESSEARCHPATH=/var:/var/run:/usr/var/:/usr/var/run:/usr/local/var:/usr/local/var/run:/dev
40494049
60356035
60366036 test -n "$PDQ_CONF" && break
60376037 done
6038 test -n "$PDQ_CONF" || PDQ_CONF="/usr/lib/pdq"
6038 test -n "$PDQ_CONF" || PDQ_CONF="$libdir/pdq"
60396039
60406040 for ac_prog in pdq/printrc
60416041 do
61756175
61766176 test -n "$PPR_PPRD" && break
61776177 done
6178 test -n "$PPR_PPRD" || PPR_PPRD="/usr/lib/ppr/bin/pprd"
6178 test -n "$PPR_PPRD" || PPR_PPRD="$libdir/ppr/bin/pprd"
61796179
61806180 for ac_dir in ppr/interfaces
61816181 do
62186218
62196219 test -n "$PPR_INTERFACES" && break
62206220 done
6221 test -n "$PPR_INTERFACES" || PPR_INTERFACES="/usr/lib/ppr/interfaces"
6221 test -n "$PPR_INTERFACES" || PPR_INTERFACES="$libdir/ppr/interfaces"
62226222
62236223 for ac_dir in ppr/PPDFiles
62246224 do
74237423 # report actual input values of CONFIG_FILES etc. instead of their
74247424 # values after options handling.
74257425 ac_log="
7426 This file was extended by foomatic-db-engine $as_me 4.0.7, which was
7426 This file was extended by foomatic-db-engine $as_me 4.0.8, which was
74277427 generated by GNU Autoconf 2.61. Invocation command line was
74287428
74297429 CONFIG_FILES = $CONFIG_FILES
74667466 _ACEOF
74677467 cat >>$CONFIG_STATUS <<_ACEOF
74687468 ac_cs_version="\\
7469 foomatic-db-engine config.status 4.0.7
7469 foomatic-db-engine config.status 4.0.8
74707470 configured by $0, generated by GNU Autoconf 2.61,
74717471 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
74727472
+6
-6
configure.ac less more
00 dnl Process this file with autoconf to produce a configure script.
11 AC_PREREQ([2.52])
2 AC_INIT([foomatic-db-engine], 4.0.7)
2 AC_INIT([foomatic-db-engine], 4.0.8)
33 AC_CONFIG_SRCDIR(foomatic-perl-data.c)
44
55 # If the user didn't specify the $sysconfdir on the command line, let it
6868 SYSCONFSEARCHPATH=/etc:/usr/etc:/usr/local/etc:/var/etc
6969 SBINSEARCHPATH=/usr/sbin:/sbin:/usr/local/sbin:/etc/sbin
7070 BINSEARCHPATH=/usr/bin:/bin:/usr/local/bin
71 DATASEARCHPATH=/usr/share:/usr/local/share:/usr/lib:/usr/local/lib:/opt
72 LIBSEARCHPATH=/usr/lib:/lib:/usr/local/lib:/usr/local/libexec:/opt
71 DATASEARCHPATH=/usr/share:/usr/local/share:$libdir:/usr/local/lib:/opt
72 LIBSEARCHPATH=$libdir:/lib:/usr/local/lib:/usr/local/libexec:/opt
7373 PTALPIPESSEARCHPATH=/var/run:/var:/var/ptal:/usr/var/run:/usr/var:/usr/var/ptal:/usr/local/var/run:/usr/local/var:/usr/local/var/ptal:/dev:/dev/ptal
7474 MTINKPIPESSEARCHPATH=/var:/var/run:/usr/var/:/usr/var/run:/usr/local/var:/usr/local/var/run:/dev
7575
256256 AC_PATH_PROGS(CUPS_LPINFO,lpinfo,/usr/sbin/lpinfo,$SBINSEARCHPATH)
257257
258258 # Paths for PDQ
259 FM_PATH_DIRS(PDQ_CONF,pdq,/usr/lib/pdq,$SYS_LIB_PATH)
259 FM_PATH_DIRS(PDQ_CONF,pdq,$libdir/pdq,$SYS_LIB_PATH)
260260 AC_PATH_PROGS(PDQ_PRINTRC,pdq/printrc,$PDQ_CONF/printrc,$SYS_LIB_PATH)
261261 dnl PDQ_FOOMATIC=$PDQ_CONF/drivers/foomatic
262262 AC_PATH_PROGS(PDQ_PRINT,pdq lpr-pdq,/usr/bin/pdq,$BINSEARCHPATH)
263263 dnl PDQ_JOBDIR=~/.printjobs
264264
265265 # Paths for PPR
266 AC_PATH_PROGS(PPR_PPRD,ppr/bin/pprd,/usr/lib/ppr/bin/pprd,$LIBSEARCHPATH)
267 FM_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
266 AC_PATH_PROGS(PPR_PPRD,ppr/bin/pprd,$libdir/ppr/bin/pprd,$LIBSEARCHPATH)
267 FM_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,$libdir/ppr/interfaces,$LIBSEARCHPATH)
268268 FM_PATH_DIRS(PPR_PPDFILES,ppr/PPDFiles,/usr/share/ppr/PPDFiles,$DATASEARCHPATH)
269269 FM_PATH_DIRS(PPR_ETC,ppr,/etc/ppr,$SYSCONFSEARCHPATH)
270270 AC_PATH_PROGS(PPR_PPR,ppr lpr-ppr,/usr/bin/ppr,$BINSEARCHPATH)
+12
-0
debian/changelog less more
0 foomatic-db-engine (4.0.8-0ubuntu1) oneiric; urgency=low
1
2 * New upstream release
3 - Improved printer entry searh algorithm letting the value of matching
4 only manufacturer and model in the device ID bein higher than matching
5 the make and model fields of the Foomatic entry but lower than a full
6 device ID match and also scoring a printer with actual Foomatic entry
7 higher than a printer only known by a driver entry.
8 - Handle non-UTF-8 encodings in imported PPD files.
9
10 -- Till Kamppeter <till.kamppeter@gmail.com> Mon, 25 Jul 2010 12:45:40 +0200
11
012 foomatic-db-engine (4.0.7-2) unstable; urgency=low
113
214 * Drop the dummy foomatic-filters-ppds package, which was only useful
+25
-2
lib/Foomatic/DB.pm less more
564564 # "Real" manufacturer, check manufacturer, model, and/or
565565 # description
566566 my $matched = 1;
567 my $mfgmdlmatched = 1;
567568 my ($mfg, $mdl, $des, $sku);
568569 my $ieee1284 = deviceIDfromDBEntry($p);
569570 if ($ieee1284 =~ /(MFG|MANUFACTURER):\s*([^:;]+);?/i) {
584585 if ($mfg) {
585586 if ($mfg ne $automake) {
586587 $matched = 0;
588 $mfgmdlmatched = 0;
587589 }
588590 }
589591 if ($mdl) {
590592 if ($mdl ne $automodel) {
591593 $matched = 0;
594 $mfgmdlmatched = 0;
592595 }
593596 }
594597 if ($des) {
604607 if ($matched &&
605608 ($des || ($mfg && ($mdl || ($sku && $autosku))))) {
606609 # Full match to known auto-detection data
607 $matchlength = 1000;
610 $matchlength = 1200;
611 if (!$p->{noxmlentry}) {
612 $matchlength += 1;
613 }
608614 $bestmatchlength = $matchlength if
609615 $bestmatchlength < $matchlength;
610616 $results{$p->{id}} = $matchlength if
611617 (!defined($results{$p->{id}}) ||
612 ($results{$p->{id}} < $matchlength));
618 ($results{$p->{id}} < $matchlength));
619 next;
620 }
621 if ($mfgmdlmatched &&
622 ($mfg && $mdl)) {
623 # Match to known auto-detection make/model data
624 $matchlength = 1000;
625 if (!$p->{noxmlentry}) {
626 $matchlength += 1;
627 }
628 $bestmatchlength = $matchlength if
629 $bestmatchlength < $matchlength;
630 $results{$p->{id}} = $matchlength if
631 (!defined($results{$p->{id}}) ||
632 ($results{$p->{id}} < $matchlength));
613633 next;
614634 }
615635 }
638658 # models
639659 if (normalize($task->[1]) eq normalize($task->[0])) {
640660 $matchlength = 100;
661 if (!$p->{noxmlentry}) {
662 $bestmatchlength += 1;
663 }
641664 $bestmatchlength = $matchlength + $task->[2] if
642665 $bestmatchlength < $matchlength + $task->[2];
643666 $results{$p->{id}} = $matchlength + $task->[2] if
+11
-5
lib/Foomatic/PPD.pm less more
299299 sub xml_esc {
300300 my ($in) = (@_);
301301
302 $in =~ s!&!&amp;!g;
303 $in =~ s!<!&lt;!g;
304 $in =~ s!>!&gt;!g;
305
306 return $in;
302 @chars = split(//,$in);
303 $ascii = "";
304 foreach (@chars) {
305 if (ord ($_) > 127) { $_="?"; }
306 $ascii .= $_;
307 }
308 $ascii =~ s!&!&amp;!g;
309 $ascii =~ s!<!&lt;!g;
310 $ascii =~ s!>!&gt;!g;
311
312 return $ascii;
307313 }
308314
309315 sub pdq_filter {