summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-05-12 06:05:20 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-05-12 06:05:20 +0000
commit6fc5687012cc534798cc97a3fd9193d768b86a90 (patch)
treebae4eb7a8a3ea5e37531bcc1d9e1f2b6b03132f4
parent6055e07481f408fae2bcb60b5245e2393bc3c722 (diff)
downloaddrakx-6fc5687012cc534798cc97a3fd9193d768b86a90.tar
drakx-6fc5687012cc534798cc97a3fd9193d768b86a90.tar.gz
drakx-6fc5687012cc534798cc97a3fd9193d768b86a90.tar.bz2
drakx-6fc5687012cc534798cc97a3fd9193d768b86a90.tar.xz
drakx-6fc5687012cc534798cc97a3fd9193d768b86a90.zip
- Let Gutenprint GIMP plug-in be installed by printerdrake when GIMP is installed.
-rw-r--r--perl-install/printer/data.pm6
-rw-r--r--perl-install/printer/printerdrake.pm4
2 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
index c07620761..0f5cad96c 100644
--- a/perl-install/printer/data.pm
+++ b/perl-install/printer/data.pm
@@ -7,7 +7,7 @@ use vars qw(@ISA @EXPORT);
@ISA = qw(Exporter);
@EXPORT = qw(%spoolers %spooler_inv %shortspooler_inv
$kernelversion $usbprintermodule
- $commonpackages $localqueuepackages);
+ $commonpackages $gimpprintingpackages $localqueuepackages);
# Kernel-specific data
@@ -21,6 +21,10 @@ our $usbprintermodule = ($kernelversion eq '2.6' ? "usblp" : "printer");
our $commonpackages = [ [ 'foomatic-db-engine' ],
[ '/usr/bin/foomatic-configure' ] ];
+# Packages which are needed to print with the GIMP
+our $gimpprintingpackages = [ [ 'gutenprint-gimp2' ],
+ [ '/usr/lib/gimp/2.0/plug-ins/print' ] ];
+
# Packages which are needed to create and manage local print queues
our $localqueuepackages = [ [ 'foomatic-filters', 'foomatic-db',
'foomatic-db-hpijs', 'foomatic-db-engine',
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 7418119cd..2d3eba81b 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -4321,6 +4321,10 @@ sub install_spooler {
push (@{$packages->[1]}, @{$commonpackages->[1]});
push (@{$packages->[1]}, @{$localqueuepackages->[1]}) if
$spoolers{$spooler}{local_queues};
+ if (files_exist("/usr/bin/gimp") || files_exist("/usr/bin/gimp-2.2")) {
+ push (@{$packages->[0]}, @{$gimpprintingpackages->[0]});
+ push (@{$packages->[1]}, @{$gimpprintingpackages->[1]});
+ }
if (@{$packages->[0]} && !files_exist(@{$packages->[1]})) {
undef $w;
$w = $o_in && $o_in->wait_message(N("Printerdrake"), N("Installing %s..."), $spoolers{$spooler}{short_name});