From b3e1c82bcd3844ce352e7dafd939b0230e7ae17b Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Tue, 11 Mar 2003 02:16:28 +0000 Subject: =?UTF-8?q?Many=20bug=20fixes:=20-=20Wait=20messages=20bloxked=20t?= =?UTF-8?q?he=20OK=20buttons=20of=20the=20dialogs=20telling=20how=20to=20?= =?UTF-8?q?=20=20scan=20and=20how=20to=20read=20photo=20cards=20on=20HP?= =?UTF-8?q?=C2=B4s=20MF=20devices.=20-=20Do=20not=20configure=20OpenOffice?= =?UTF-8?q?.org=20any=20more,=20only=20Star=20Office.=20=20=20OpenOffice.o?= =?UTF-8?q?rg=20is=20patched=20to=20have=20native=20CUPS=20support=20now.?= =?UTF-8?q?=20-=20If=20the=20Port=20for=20a=20BrowsePoll=20address=20is=20?= =?UTF-8?q?left=20blank,=20631=20is=20taken=20as=20=20=20default=20now.=20?= =?UTF-8?q?-=20Text=20for=20firmware=20upload=20for=20HP=20LaserJet=201000?= =?UTF-8?q?=20now=20also=20available=20in=20=20=20the=20'Learn=20how=20to?= =?UTF-8?q?=20use=20printer'=20dialog.=20-=20Updated=20check=20of=20model?= =?UTF-8?q?=20name=20for=20HP=C2=B4s=20MF=20devices=20to=20newest=20models?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- perl-install/printer/office.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'perl-install/printer/office.pm') 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, -- cgit v1.2.1