summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-05-12 03:57:57 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-05-12 03:57:57 +0000
commitc3096f6ac869c56b8285e955cd472f9e333bc691 (patch)
treeebc1189af1e05d7741c3b29119f07031b1ec3f65
parent2326d0271be94e2906b28dd3344ab3888a49c2f2 (diff)
downloaddrakx-c3096f6ac869c56b8285e955cd472f9e333bc691.tar
drakx-c3096f6ac869c56b8285e955cd472f9e333bc691.tar.gz
drakx-c3096f6ac869c56b8285e955cd472f9e333bc691.tar.bz2
drakx-c3096f6ac869c56b8285e955cd472f9e333bc691.tar.xz
drakx-c3096f6ac869c56b8285e955cd472f9e333bc691.zip
- Gimp-Print was renamed to Gutenprint, adapted printerdrake/DrakX appropriately.
-rw-r--r--perl-install/install_steps.pm4
-rw-r--r--perl-install/printer/data.pm12
-rw-r--r--perl-install/share/rpmsrate5
3 files changed, 11 insertions, 10 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 5d136fbfb..ee97442b7 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -730,8 +730,8 @@ sub configureServices {
sub configurePrinter {
my ($o) = @_;
eval {
- $o->do_pkgs->install('foomatic-filters', 'foomatic-db-engine', 'foomatic-db', 'foomatic-db-hpijs', 'gimpprint-foomatic', 'postscript-ppds', 'printer-utils', 'printer-filters', 'printer-testpages',
- if_($o->do_pkgs->is_installed('gimp'), 'gimpprint'));
+ $o->do_pkgs->install('foomatic-filters', 'foomatic-db-engine', 'foomatic-db', 'foomatic-db-hpijs', 'gutenprint-foomatic', 'postscript-ppds', 'printer-utils', 'printer-filters', 'printer-testpages',
+ if_($o->do_pkgs->is_installed('gimp'), 'gutenprint-gimp2'));
};
if ($@ =~ /rpm not found/) {
log::l("ERROR: $@");
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
index 6055d4cbf..c07620761 100644
--- a/perl-install/printer/data.pm
+++ b/perl-install/printer/data.pm
@@ -26,8 +26,8 @@ our $localqueuepackages = [ [ 'foomatic-filters', 'foomatic-db',
'foomatic-db-hpijs', 'foomatic-db-engine',
'printer-filters',
'printer-utils', 'printer-testpages',
- 'ghostscript', 'hplip-hpijs', 'gimpprint-ijs',
- 'gimpprint-foomatic', 'gimpprint-escputil',
+ 'ghostscript', 'hplip-hpijs', 'gutenprint-ijs',
+ 'gutenprint-foomatic', 'gutenprint-escputil',
'postscript-ppds', 'hplip-hpijs-ppds',
'hplip-model-data', 'nmap', 'scli' ],
[qw(/usr/bin/foomatic-rip
@@ -39,8 +39,8 @@ our $localqueuepackages = [ [ 'foomatic-filters', 'foomatic-db',
/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/share/man/man1/ijsgutenprint.1.bz2
+ /usr/share/foomatic/db/source/driver/gutenprint-ijs.5.0.xml
/usr/bin/escputil
/usr/share/cups/model/postscript.ppd.gz
/usr/share/ppd/HP/HP-2000C-hpijs.ppd.gz
@@ -119,13 +119,13 @@ our %spoolers = ('pdq' => {
'boot_spooler' => 'cups',
'service' => 'cups',
'local_queues' => 1,
- 'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gimpprint-cups',
+ 'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gutenprint-cups',
$::isInstall ? 'curl' : 'webfetch'],
[ qw(/usr/lib/cups/cgi-bin/printers.cgi
/sbin/ifconfig
/usr/bin/xpp
/usr/lib/cups/filter/rastertolxx74
- /usr/lib/cups/filter/rastertoprinter),
+ /usr/lib/cups/filter/commandtoepson),
$::isInstall ||
!(-x '/usr/bin/wget') ?
'/usr/bin/curl' :
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 999db2f63..77b253178 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -713,7 +713,8 @@ CAT_PRINTER
a2ps ppdfilt groff lesstif
libsnmp0
hplip-hpijs hplip-hpijs-ppds postscript-ppds
- gimpprint-ijs gimpprint-foomatic gimpprint-escputil
+ gutenprint-ijs gutenprint-foomatic gutenprint-escputil
+ gutenprint-gimp2
INSTALL
NOCOPY
@@ -738,7 +739,7 @@ INSTALL
kdenetwork-kppp-provider
synaptics dkms-minimal
- 5 cups cups-drivers hpoj libhpojip0 gimpprint-cups
+ 5 cups cups-drivers hpoj libhpojip0 gutenprint-cups
xojpanel libsane-hpoj1
sane-backends sane-frontends scanner-gui xsane