[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 76b0b21953dee320d4eb4da29f617b5147d73267
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 630b01425b2cb1e56ca93c506ac765da30536588
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Apr 18 16:49:31 2011 +0200
adding unityquicklist.ulf in lp720716.diff
diff --git a/patches/lp720716.diff b/patches/lp720716.diff
index 6f43f17..4374b57 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,705 @@
+@@ -0,0 +1,722 @@
+diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
+index 3cb84f8..a2693a5 100644
+--- sysui/desktop/menus/base.desktop
@@ -645,10 +645,27 @@ Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/lp720716.diff
++[javafilter]
++en-US = ""
+diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
-+index 898d7b0..5a906c1 100644
++index 898d7b0..7c35386 100644
+--- sysui/desktop/share/makefile.mk
++++ sysui/desktop/share/makefile.mk
-+@@ -154,6 +154,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
++@@ -50,6 +50,7 @@ ULFFILES= \
++ 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
++ # merge-in the translations.
++ #
++
++-$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl $(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf $(ULFDIR)/launcher_genericname.ulf
+++$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl $(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf $(ULFDIR)/launcher_genericname.ulf $(ULFDIR)/launcher_unityquicklist.ulf
++ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
++ @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
++ @echo Creating desktop entries for $(@:f) ..
++@@ -154,6 +155,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -p '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
--
LibreOffice packaging repository
Reply to: