[Libreoffice-commits] .: 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/novell-subscription.diff            |    6 +++---
 patches/dev300/solenv-installer-cleaner-paths.diff |   10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 245fccccf6f9f1dc2ef1201e9eca15e755153572
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Nov 10 10:32:29 2010 +0200

    Make solenv-installer-cleaner-paths.diff apply again

diff --git a/patches/dev300/solenv-installer-cleaner-paths.diff b/patches/dev300/solenv-installer-cleaner-paths.diff
index 0cf59d5..c929357 100644
--- a/patches/dev300/solenv-installer-cleaner-paths.diff
+++ b/patches/dev300/solenv-installer-cleaner-paths.diff
@@ -6,11 +6,10 @@ diff --git solenv/bin/modules/installer/worker.pm solenv/bin/modules/installer/w
 index 2c26290..f2531b1 100644
 --- solenv/bin/modules/installer/worker.pm
 +++ solenv/bin/modules/installer/worker.pm
-@@ -773,9 +773,16 @@ sub install_simple ($$$$$$)
+@@ -773,8 +773,16 @@ sub install_simple ($$$$$$)
      
          if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
          {
--            # printf "mkdir $destdir$onedir->{'HostName'}\n";
 -            mkdir $destdir . $onedir->{'HostName'};
 -            push @lines, "%dir " . $onedir->{'HostName'} . "\n";
 +            my $hostname = $onedir->{'HostName'};
@@ -35,8 +34,5 @@ index 2c26290..f2531b1 100644
 +        $destination =~ s/\.\///g;
 +
          push @lines, "$destination\n";
-         # printf "cp $sourcepath $destdir$destination\n";
-         copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
--- 
-1.7.0.1
-
+         if(-d  "$destdir$destination"){
+             rmtree("$destdir$destination");
commit bd8473c7fed903b99d6b523e8013f7c267bba939
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Nov 8 13:28:10 2010 +0200

    Make novell-subscription.diff apply again

diff --git a/patches/dev300/novell-subscription.diff b/patches/dev300/novell-subscription.diff
index fea4843..aa32292 100644
--- a/patches/dev300/novell-subscription.diff
+++ b/patches/dev300/novell-subscription.diff
@@ -19,9 +19,9 @@ index 175867d..2eb3879 100644
 +                    <value xml:lang="en-US">~Upgrade to Full Version</value>
 +                </prop>
 +            </node>
-             <node oor:name=".uno:StatusBarVisible" oor:op="replace">
+             <node oor:name=".uno:Credits" oor:op="replace">
                  <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">Status ~Bar</value>
+                     <value xml:lang="en-US">%PRODUCTNAME Credits...</value>
 @@ -5219,6 +5224,14 @@
        </node>
      </node>
@@ -42,7 +42,7 @@ index 9000359..69e8e4b 100644
 --- sfx2/inc/sfx2/sfxsids.hrc
 +++ sfx2/inc/sfx2/sfxsids.hrc
 @@ -127,6 +127,11 @@
- #define SID_SHOW_LICENSE					(SID_SFX_START + 1683)
+ #define SID_SHOW_CREDITS					(SID_SFX_START + 1684)
  #define SID_HELP_TUTORIALS					(SID_SFX_START + 1695)
  
 +// default id for subscription