summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-02-06 02:14:20 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-02-06 02:14:20 +0000
commit2c6fcba931a010219485b65e5ad1d4ab8b5fa4a2 (patch)
tree6cb4631552f3f56098046f5f34d85e37253139c1 /perl-install
parentef8e48a0d4edb3e40f41c2a591170ad4295cdacb (diff)
downloaddrakx-2c6fcba931a010219485b65e5ad1d4ab8b5fa4a2.tar
drakx-2c6fcba931a010219485b65e5ad1d4ab8b5fa4a2.tar.gz
drakx-2c6fcba931a010219485b65e5ad1d4ab8b5fa4a2.tar.bz2
drakx-2c6fcba931a010219485b65e5ad1d4ab8b5fa4a2.tar.xz
drakx-2c6fcba931a010219485b65e5ad1d4ab8b5fa4a2.zip
Adapted printerdrake to new printer drivers packages.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/printer/data.pm24
-rw-r--r--perl-install/printer/printerdrake.pm5
2 files changed, 22 insertions, 7 deletions
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
index 6e1dc4041..e65be037b 100644
--- a/perl-install/printer/data.pm
+++ b/perl-install/printer/data.pm
@@ -23,12 +23,25 @@ our $commonpackages = [ [ 'foomatic-db-engine' ],
# Packages which are needed to create and manage local print queues
our $localqueuepackages = [ [ 'foomatic-filters', 'foomatic-db',
- 'printer-utils', 'printer-testpages', 'nmap',
- 'scli' ],
+ 'foomatic-db-hpijs', 'foomatic-db-engine',
+ 'printer-filters',
+ 'printer-utils', 'printer-testpages',
+ 'ghostscript', 'hpijs', 'gimpprint-ijs',
+ 'gimpprint-foomatic', 'gimpprint-escputil',
+ 'postscript-ppds', 'nmap', 'scli' ],
[qw(/usr/bin/foomatic-rip
/usr/share/foomatic/db/source/driver/ljet4.xml
- /usr/bin/escputil
+ /usr/share/foomatic/db/source/driver/hpijs.xml
+ /usr/bin/foomatic-configure
+ /usr/bin/pnm2ppa
+ /usr/bin/getusbprinterid
/usr/share/printer-testpages/testprint.ps
+ /usr/bin/gs-common
+ /usr/bin/hpijs
+ /usr/bin/ijsgimpprint
+ /usr/share/foomatic/db/source/driver/gimp-print-ijs.xml
+ /usr/bin/escputil
+ /usr/share/cups/model/postscript.ppd.gz
/usr/bin/nmap
/usr/bin/scli)] ];
@@ -105,12 +118,13 @@ our %spoolers = ('pdq' => {
'boot_spooler' => 'cups',
'service' => 'cups',
'local_queues' => 1,
- 'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers',
+ 'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gimpprint-cups',
$::isInstall ? 'curl' : 'webfetch'],
[ qw(/usr/lib/cups/cgi-bin/printers.cgi
/sbin/ifconfig
/usr/bin/xpp
- /usr/share/cups/model/postscript.ppd.gz),
+ /usr/lib/cups/filter/rastertolxx74
+ /usr/lib/cups/filter/rastertoprinter),
$::isInstall ||
!(-x '/usr/bin/wget') ?
'/usr/bin/curl' :
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 19e271e0e..b111f8e37 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -4113,12 +4113,13 @@ sub install_foomatic {
if (!$::testing &&
!files_exist(qw(/usr/bin/foomatic-configure
/usr/bin/foomatic-rip
- /usr/share/foomatic/db/source/driver/ljet4.xml))) {
+ /usr/share/foomatic/db/source/driver/ljet4.xml
+ /usr/share/foomatic/db/source/driver/hpijs.xml))) {
my $_w = $in->wait_message(N("Printerdrake"),
N("Installing Foomatic..."));
$in->do_pkgs->install('foomatic-db-engine',
'foomatic-filters',
- 'foomatic-db')
+ 'foomatic-db', 'foomatic-db-hpijs')
or do {
$in->ask_warn(N("Error"),
N("Could not install %s packages, %s cannot be started!",