[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 76b0b21953dee320d4eb4da29f617b5147d73267

["Bjoern Michaelsen" <bjoern.michaelsen@canonical.com>]

The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 76b0b21953dee320d4eb4da29f617b5147d73267
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Apr 19 17:54:42 2011 +0200

    lp#765010: fix corrupted startcenter desktop file

diff --git a/changelog b/changelog
index ce841dd..effee70 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.3.2-1ubuntu4) natty; urgency=low
+
+  * fix corrupted startcenter desktop file (LP: #765010)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 19 Apr 2011 17:51:11 +0200
+
 libreoffice (1:3.3.2-1ubuntu3) natty; urgency=low
 
   * make build dep on xulrunner-dev alternatively depend on firefox-dep (LP: #740815)
diff --git a/patches/lp720716.diff b/patches/lp720716.diff
index 4374b57..74304fe 100644
--- a/patches/lp720716.diff
+++ b/patches/lp720716.diff
@@ -2,7 +2,7 @@ Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/lp720716.diff
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ libreoffice-3.3.2/libreoffice-build/patches/dev300/lp720716.diff	2011-04-15 09:54:55.434646258 +0200
-@@ -0,0 +1,722 @@
+@@ -0,0 +1,724 @@
 +diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
 +index 3cb84f8..a2693a5 100644
 +--- sysui/desktop/menus/base.desktop
@@ -700,11 +700,11 @@ Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/lp720716.diff
 ++            print OUTFILE;
 +         }
 ++        $keyline=~s/^$key/$outkey/;
-++        print OUTFILE $keyline
+++        print OUTFILE $keyline;
 +         
 +     } else {
 +         # split locale = "value" into 2 strings
-+@@ -125,16 +134,17 @@ KEY:    while (<TEMPLATE>) {
++@@ -125,16 +134,19 @@ KEY:    while (<TEMPLATE>) {
 +         
 +             # use just anything inside the ""
 +             $value = substr($value, index($value, "\"") + 1, rindex($value, "\"") - 1);
@@ -716,12 +716,14 @@ Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/lp720716.diff
 +         
 +             $locale=~s/-/_/;
 ++
+++            if (not $value eq '') {
 +             if ($ext eq "desktop") {
 +-                print OUTFILE "$key\[$locale\]=$value\n";
 ++                print OUTFILE "$outkey\[$locale\]=$value\n";
 +             } else {
 +-                print OUTFILE  "\t\[$locale\]$key=$value\n";
 ++                print OUTFILE  "\t\[$locale\]$outkey=$value\n";
+++            }
 +             }
 +         }
 +     }

-- 
LibreOffice packaging repository