The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 06d44513521f9db4417cd317e8266d8e1069aa2e
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Apr 17 18:41:46 2012 +0200
fix quicklist patch (cp over file generated from translations)
diff --git a/patches/ubuntu-quicklists.diff b/patches/ubuntu-quicklists.diff
index c0b9990..a0fba1d 100644
--- a/patches/ubuntu-quicklists.diff
+++ b/patches/ubuntu-quicklists.diff
@@ -18,10 +18,10 @@ Subject: [PATCH 6/9] lp#720716: more translations in
desktop files
11 files changed, 555 insertions(+), 4 deletions(-)
create mode 100644 sysui/desktop/share/launcher_unityquicklist.ulf
-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
+Index: libreoffice-3.5.2/sysui/desktop/menus/base.desktop
+===================================================================
+--- libreoffice-3.5.2.orig/sysui/desktop/menus/base.desktop 2012-04-17
18:16:40.000000000 +0200
++++ libreoffice-3.5.2/sysui/desktop/menus/base.desktop 2012-04-17
18:27:52.271847122 +0200
@@ -10,3 +10,8 @@
GenericName=Database Development
Comment=Manage databases, create queries and reports to track and manage your
information by using Base.
@@ -31,10 +31,10 @@ index 40f7e79..9809e4e 100755
+UnityQuicklist=New Database
+Exec=libreoffice --base %U
+TargetEnvironment=Unity
-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
+Index: libreoffice-3.5.2/sysui/desktop/menus/calc.desktop
+===================================================================
+--- libreoffice-3.5.2.orig/sysui/desktop/menus/calc.desktop 2012-04-17
18:27:52.111847119 +0200
++++ libreoffice-3.5.2/sysui/desktop/menus/calc.desktop 2012-04-17
18:27:52.271847122 +0200
@@ -10,3 +10,8 @@
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in
spreadsheets by using Calc.
@@ -44,10 +44,10 @@ index 80cc09d..0af1c530 100755
+UnityQuicklist=New Spreadsheet
+Exec=libreoffice --calc %U
+TargetEnvironment=Unity
-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
+Index: libreoffice-3.5.2/sysui/desktop/menus/draw.desktop
+===================================================================
+--- libreoffice-3.5.2.orig/sysui/desktop/menus/draw.desktop 2012-04-17
18:27:52.111847119 +0200
++++ libreoffice-3.5.2/sysui/desktop/menus/draw.desktop 2012-04-17
18:27:52.275847121 +0200
@@ -10,3 +10,8 @@
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
@@ -57,10 +57,10 @@ index 57f7ade..ab4d092 100755
+UnityQuicklist=New Drawing
+Exec=libreoffice --draw %U
+TargetEnvironment=Unity
-diff --git a/sysui/desktop/menus/impress.desktop
b/sysui/desktop/menus/impress.desktop
-index 025524e..52f11c3 100755
---- a/sysui/desktop/menus/impress.desktop
-+++ b/sysui/desktop/menus/impress.desktop
+Index: libreoffice-3.5.2/sysui/desktop/menus/impress.desktop
+===================================================================
+--- libreoffice-3.5.2.orig/sysui/desktop/menus/impress.desktop 2012-04-17
18:27:52.111847119 +0200
++++ libreoffice-3.5.2/sysui/desktop/menus/impress.desktop 2012-04-17
18:27:52.275847121 +0200
@@ -10,3 +10,8 @@
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages
by using Impress.
@@ -70,10 +70,10 @@ index 025524e..52f11c3 100755
+UnityQuicklist=New Presentation
+Exec=libreoffice --impress %U
+TargetEnvironment=Unity
-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
+Index: libreoffice-3.5.2/sysui/desktop/menus/math.desktop
+===================================================================
+--- libreoffice-3.5.2.orig/sysui/desktop/menus/math.desktop 2012-04-17
18:27:52.115847119 +0200
++++ libreoffice-3.5.2/sysui/desktop/menus/math.desktop 2012-04-17
18:27:52.275847121 +0200
@@ -11,3 +11,8 @@
GenericName=Formula Editor
Comment=Create and edit scientific formulas and equations by using Math.
@@ -83,10 +83,10 @@ index 55fcc29..c605994 100755
+UnityQuicklist=New Formula
+Exec=libreoffice --math %U
+TargetEnvironment=Unity
-diff --git a/sysui/desktop/menus/writer.desktop
b/sysui/desktop/menus/writer.desktop
-index 2222019..aae85b9 100755
---- a/sysui/desktop/menus/writer.desktop
-+++ b/sysui/desktop/menus/writer.desktop
+Index: libreoffice-3.5.2/sysui/desktop/menus/writer.desktop
+===================================================================
+--- libreoffice-3.5.2.orig/sysui/desktop/menus/writer.desktop 2012-04-17
18:27:52.115847119 +0200
++++ libreoffice-3.5.2/sysui/desktop/menus/writer.desktop 2012-04-17
18:27:52.275847121 +0200
@@ -10,3 +10,8 @@
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and
Web pages by using Writer.
@@ -96,11 +96,10 @@ index 2222019..aae85b9 100755
+UnityQuicklist=New Document
+Exec=libreoffice --writer %U
+TargetEnvironment=Unity
-diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf
b/sysui/desktop/share/launcher_unityquicklist.ulf
-new file mode 100644
-index 0000000..62f07d0
---- /dev/null
-+++ b/sysui/desktop/share/launcher_unityquicklist.ulf
+Index: libreoffice-3.5.2/sysui/desktop/share/launcher_unityquicklist.ulf
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libreoffice-3.5.2/sysui/desktop/share/launcher_unityquicklist.ulf
2012-04-17 18:27:52.275847121 +0200
@@ -0,0 +1,168 @@
+[writer]
+en-US = "New Document"
@@ -270,10 +269,10 @@ index 0000000..62f07d0
+
+[javafilter]
+en-US = ""
-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
+Index: libreoffice-3.5.2/sysui/desktop/share/makefile.mk
+===================================================================
+--- libreoffice-3.5.2.orig/sysui/desktop/share/makefile.mk 2012-04-17
18:27:52.115847119 +0200
++++ libreoffice-3.5.2/sysui/desktop/share/makefile.mk 2012-04-17
18:29:43.611848643 +0200
@@ -50,6 +50,7 @@
documents.ulf \
launcher_comment.ulf \
@@ -282,7 +281,7 @@ index 68cba59..19575ed 100755
launcher_name.ulf
LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin
startcenter
-@@ -146,7 +147,7 @@
+@@ -146,15 +147,18 @@
# merge-in the translations.
#
@@ -291,7 +290,10 @@ index 68cba59..19575ed 100755
$(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
@echo Creating desktop entries for $(@:f) ..
-@@ -155,6 +156,7 @@
+ @echo ---------------------------------
++ # overwrite the ulf generated from translations (which is empty)
++ @cp ./launcher_unityquicklist.ulf $(ULFDIR)
+ @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u
$(UNIXWRAPPERNAME) --iconprefix '$${{UNIXBASISROOTNAME}}-' $<
$(@:db).$(INPATH).$(@:f)
@$(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
@@ -299,10 +301,10 @@ index 68cba59..19575ed 100755
.IF "$(WITH_LIBSN)"=="YES"
@noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >>
$(@:db).$(INPATH).$(@:f)/$i.desktop))x
.ENDIF
-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
+Index: libreoffice-3.5.2/sysui/desktop/share/translate.pl
+===================================================================
+--- libreoffice-3.5.2.orig/sysui/desktop/share/translate.pl 2012-04-17
18:16:40.000000000 +0200
++++ libreoffice-3.5.2/sysui/desktop/share/translate.pl 2012-04-17
18:27:52.275847121 +0200
@@ -64,6 +64,12 @@
}
}
@@ -346,6 +348,3 @@ index cdc636b..85cc9311 100755
}
}
}
---
-1.7.5.4
-
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1skptc-0002xu...@vasks.debian.org
