1 files changed, 25 insertions, 44 deletions
diff --git a/brother-hll6200dw.patch b/brother-hll6200dw.patch
index b877e35f0f5f..488c186a138f 100644
--- a/brother-hll6200dw.patch
+++ b/brother-hll6200dw.patch
@@ -1,44 +1,25 @@
-diff --git a/opt/brother/Printers/HLL6200DW/cupswrapper/brother_lpdwrapper_HLL6200DW b/opt/brother/Printers/HLL6200DW/cupswrapper/brother_lpdwrapper_HLL6200DW
---- a/opt/brother/Printers/HLL6200DW/cupswrapper/brother_lpdwrapper_HLL6200DW
-+++ b/opt/brother/Printers/HLL6200DW/cupswrapper/brother_lpdwrapper_HLL6200DW
-@@ -50,7 +50,9 @@ if ( $basedir eq '' ){
- }
- chomp($basedir);
- 
--$basedir =~ s/$PRINTER\/cupswrapper\/.*$/$PRINTER\//g;
-+#$basedir =~ s/$PRINTER\/cupswrapper\/.*$/$PRINTER\//g;
-+my $PRINTER = "HLL6200DW";
-+my $basedir = "/usr/share/Brother/Printer/$PRINTER";
- 
- 
- %units = ( pt   => \&pt2dot, 
-@@ -82,16 +84,16 @@ $ENV{NODENAME} = `uname -n`;
- 
- my $cmdoptions=$ARGV[4];
- my $PPD = $ENV{PPD};
--my $PRINTER=$basedir;
-+#my $PRINTER=$basedir;
- my $CUPSINPUT='';
- if ( @ARGV >= 6 ){
-     $CUPSINPUT=$ARGV[7];
- }
- 
- 
--$PRINTER =~ s/^\/opt\/.*\/Printers\///g;
--$PRINTER =~ s/\/cupswrapper//g;
--$PRINTER =~ s/\///g;
-+#$PRINTER =~ s/^\/opt\/.*\/Printers\///g;
-+#$PRINTER =~ s/\/cupswrapper//g;
-+#$PRINTER =~ s/\///g;
- 
- for  (my $i = 0 ; $i < @ARGV ; $i ++){
-     logprint( 0 , "ARG$i      = $ARGV[$i]\n");
-@@ -804,7 +806,7 @@ sub exec_lpdconfig {
-     my $lpddir = $basedir;
-     my %lpr_options = %$lpr_options_ref;
- 
--    $lpddir = $basedir."/lpd/";
-+    $lpddir = $basedir."/lpd";
-     my $lpdconf = $lpddir.'/'.$LPDCONFIGEXE;
- 
-     
+75,85c75,76
+< my $basedir = Cwd::realpath ($0);
+< if ( $basedir eq '' ){
+<   $basedir = `readlink $0`;
+<   if ( $basedir eq '' ){
+<       $basedir = `realpath $0`;
+<   }
+< }
+< chomp($basedir);
+< 
+< $basedir =~ s/\/cupswrapper\/.*$//g;
+< 
+---
+> my $PRINTER = "HLL6200DW";
+> my $basedir = "/usr/share/Brother/Printer/$PRINTER";
+95,99d85
+< my $PRINTER=$basedir;
+< $PRINTER =~ s/^\/opt\/.*\/Printers\///g;
+< $PRINTER =~ s/\/cupswrapper.*$//g;
+< $PRINTER =~ s/\///g;
+< 
+820c806
+<     $lpddir = $basedir."/lpd/";
+---
+>     $lpddir = $basedir."/lpd";