[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0-2-57-gd596b0c
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 3a35677b0a27604b21b99434c6143c711aef5574
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 1 13:55:46 2012 +0100
refresh ubuntu patch queue
diff --git a/patches/fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff b/patches/fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
index ea02d28..eb67532 100644
--- a/patches/fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
+++ b/patches/fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
@@ -12,7 +12,7 @@ diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/sour
index b87b83f..8b243ae 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
-@@ -239,7 +239,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
+@@ -241,7 +241,7 @@
//create stream for the document
Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
diff --git a/patches/pkgconfig-mozilla-plugin.diff b/patches/pkgconfig-mozilla-plugin.diff
index 4e7e6f0..455ce46 100644
--- a/patches/pkgconfig-mozilla-plugin.diff
+++ b/patches/pkgconfig-mozilla-plugin.diff
@@ -2,7 +2,7 @@ Index: libreoffice-3.5.0/configure.in
===================================================================
--- libreoffice-3.5.0/configure.in 2011-12-15 18:38:18.961310083 +0100
+++ libreoffice-3.5.0/configure.in 2011-12-15 18:39:06.181310723 +0100
-@@ -6101,6 +6101,9 @@
+@@ -6105,6 +6105,9 @@
if test "x$LOCATED" != "xyes"; then
PKG_CHECK_MODULES(MOZILLA_HEADERS, libxul, [LOCATED=yes], [LOCATED=no])
fi
diff --git a/patches/ubuntu-quicklists.diff b/patches/ubuntu-quicklists.diff
index f050a43..c0b9990 100644
--- a/patches/ubuntu-quicklists.diff
+++ b/patches/ubuntu-quicklists.diff
@@ -22,7 +22,7 @@ diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 40f7e79..9809e4e 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
-@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Base
+@@ -10,3 +10,8 @@
GenericName=Database Development
Comment=Manage databases, create queries and reports to track and manage your information by using Base.
InitialPreference=5
@@ -35,7 +35,7 @@ diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 80cc09d..0af1c530 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
-@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Calc
+@@ -10,3 +10,8 @@
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc.
InitialPreference=5
@@ -48,7 +48,7 @@ diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 57f7ade..ab4d092 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
-@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Draw
+@@ -10,3 +10,8 @@
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
InitialPreference=5
@@ -61,7 +61,7 @@ diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.d
index 025524e..52f11c3 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
-@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Impress
+@@ -10,3 +10,8 @@
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
InitialPreference=5
@@ -74,7 +74,7 @@ diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 55fcc29..c605994 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
-@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Math
+@@ -11,3 +11,8 @@
GenericName=Formula Editor
Comment=Create and edit scientific formulas and equations by using Math.
InitialPreference=5
@@ -87,7 +87,7 @@ diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.des
index 2222019..aae85b9 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
-@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Writer
+@@ -10,3 +10,8 @@
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
InitialPreference=5
@@ -274,15 +274,15 @@ diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 68cba59..19575ed 100755
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
-@@ -50,6 +50,7 @@ ULFFILES= \
+@@ -50,6 +50,7 @@
documents.ulf \
launcher_comment.ulf \
launcher_genericname.ulf \
+ launcher_unityquicklist.ulf \
launcher_name.ulf
- LAUNCHERLIST = writer calc draw impress math base printeradmin qstart startcenter javafilter
-@@ -145,7 +146,7 @@ ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES) $(COMMONMISC)$/{$(PRODUCTLIST)}$/build
+ LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter
+@@ -146,7 +147,7 @@
# merge-in the translations.
#
@@ -291,7 +291,7 @@ index 68cba59..19575ed 100755
$(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
@echo Creating desktop entries for $(@:f) ..
-@@ -154,6 +155,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
+@@ -155,6 +156,7 @@
@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
@@ -303,7 +303,7 @@ diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index cdc636b..85cc9311 100755
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
-@@ -69,6 +69,12 @@ while ($_ = $ARGV[0], /^-/) {
+@@ -64,6 +64,12 @@
}
}
@@ -316,7 +316,7 @@ index cdc636b..85cc9311 100755
# open input file
unless (open(SOURCE, $ARGV[0])) {
print STDERR "Can't open $ARGV[0] file: $!\n";
-@@ -111,9 +117,12 @@ while (<SOURCE>) {
+@@ -106,9 +112,12 @@
# Pass the head of the template to the output file
KEY: while (<TEMPLATE>) {
@@ -330,7 +330,7 @@ index cdc636b..85cc9311 100755
} else {
# split locale = "value" into 2 strings
-@@ -131,10 +140,13 @@ KEY: while (<TEMPLATE>) {
+@@ -125,10 +134,13 @@
$value=~s/%PRODUCTNAME/$productname/g;
$locale=~s/-/_/;
--
LibreOffice packaging repository
Reply to: