summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/office.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-03-11 02:16:28 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-03-11 02:16:28 +0000
commitb3e1c82bcd3844ce352e7dafd939b0230e7ae17b (patch)
treecb37c5d8119d77cda9145f7eb0394741abab67da /perl-install/printer/office.pm
parentecd224b11093f09c130f307820c6d46eb25a74e7 (diff)
downloaddrakx-b3e1c82bcd3844ce352e7dafd939b0230e7ae17b.tar
drakx-b3e1c82bcd3844ce352e7dafd939b0230e7ae17b.tar.gz
drakx-b3e1c82bcd3844ce352e7dafd939b0230e7ae17b.tar.bz2
drakx-b3e1c82bcd3844ce352e7dafd939b0230e7ae17b.tar.xz
drakx-b3e1c82bcd3844ce352e7dafd939b0230e7ae17b.zip
Many bug fixes:
- Wait messages bloxked the OK buttons of the dialogs telling how to scan and how to read photo cards on HP´s MF devices. - Do not configure OpenOffice.org any more, only Star Office. OpenOffice.org is patched to have native CUPS support now. - If the Port for a BrowsePoll address is left blank, 631 is taken as default now. - Text for firmware upload for HP LaserJet 1000 now also available in the 'Learn how to use printer' dialog. - Updated check of model name for HP´s MF devices to newest models.
Diffstat (limited to 'perl-install/printer/office.pm')
-rw-r--r--perl-install/printer/office.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/printer/office.pm b/perl-install/printer/office.pm
index f4a01a224..fb905107d 100644
--- a/perl-install/printer/office.pm
+++ b/perl-install/printer/office.pm
@@ -11,6 +11,8 @@ use printer::cups;
# Star Office/OpenOffice.org
# ------------------------------------------------------------------
+# OpenOffice.org stuff applies only for Star Office 6.x now, as our
+# OpenOffice.org is patched for native CUPS support
our $suites = {
'OpenOffice.Org' => {
@@ -19,10 +21,10 @@ our $suites = {
'file_name' => '^(.*)/share/psprint/psprint.conf$',
'param' => ["Generic Printer", "Command="],
'perl' => "/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/",
- 'files' => ["/usr/lib/*/share/psprint/psprint.conf",
- "/usr/local/lib/*/share/psprint/psprint.conf",
- "/usr/local/*/share/psprint/psprint.conf",
- "/opt/*/share/psprint/psprint.conf"],
+ 'files' => ["/usr/lib/office6*/share/psprint/psprint.conf",
+ "/usr/local/lib/office6*/share/psprint/psprint.conf",
+ "/usr/local/office6*/share/psprint/psprint.conf",
+ "/opt/office6*/share/psprint/psprint.conf"],
},
'Star Office' => {
'make' => \&makestarofficeprinterentry,