[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. fcdba47b8fa0ff887b583ae714bdd1712986999e
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 57ab7288e7eadf788d0bf6b9b314311dd17abe08
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Apr 15 10:08:27 2011 +0200
regenerate control, refresh patch queue and fix whitespace in rules
diff --git a/changelog b/changelog
index 798f626..ce841dd 100644
--- a/changelog
+++ b/changelog
@@ -1,13 +1,13 @@
-libreoffice (1:3.3.2-1ubuntu3) UNRELEASED; urgency=low
+libreoffice (1:3.3.2-1ubuntu3) natty; urgency=low
* make build dep on xulrunner-dev alternatively depend on firefox-dep (LP: #740815)
* cherry-pick from debian:
- enable is (icelandic) l10n (LP: #751746)
* add unity quicklist support (LP: #720716)
* workaround for unity icon issue (LP: #732412)
- * regenerated control file
+ * regenerated control file and refresh patch queue
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 15 Apr 2011 09:49:16 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 15 Apr 2011 10:01:19 +0200
libreoffice (1:3.3.2-1ubuntu2) natty; urgency=low
diff --git a/patches/lp720716.diff b/patches/lp720716.diff
index 1a0ecba..b7b1a80 100644
--- a/patches/lp720716.diff
+++ b/patches/lp720716.diff
@@ -1,10 +1,12 @@
---- /dev/null 2011-04-14 11:13:43.818616003 +0200
-+++ libreoffice-3.3.2/libreoffice-build/patches/dev300/lp720716.diff 2011-04-15 09:37:28.154646094 +0200
+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 @@
+diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
+index 3cb84f8..a2693a5 100644
-+--- a/sysui/desktop/menus/base.desktop
-++++ b/sysui/desktop/menus/base.desktop
++--- sysui/desktop/menus/base.desktop
+++++ sysui/desktop/menus/base.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Base
+ GenericName=Database Development
+ Comment=Manage databases, create queries and reports to track and manage your information by using Base.
@@ -16,8 +18,8 @@
++TargetEnvironment=Unity
+diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
+index d885589..b93e8a1 100644
-+--- a/sysui/desktop/menus/calc.desktop
-++++ b/sysui/desktop/menus/calc.desktop
++--- sysui/desktop/menus/calc.desktop
+++++ sysui/desktop/menus/calc.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Calc
+ GenericName=Spreadsheet
+ Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
@@ -29,8 +31,8 @@
++TargetEnvironment=Unity
+diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
+index 21c31b8..6748f61 100644
-+--- a/sysui/desktop/menus/draw.desktop
-++++ b/sysui/desktop/menus/draw.desktop
++--- sysui/desktop/menus/draw.desktop
+++++ sysui/desktop/menus/draw.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Draw
+ GenericName=Drawing Program
+ Comment=Create and edit drawings, flow charts, and logos by using Draw.
@@ -42,8 +44,8 @@
++TargetEnvironment=Unity
+diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
+index 33a7d90..301131a 100644
-+--- a/sysui/desktop/menus/impress.desktop
-++++ b/sysui/desktop/menus/impress.desktop
++--- sysui/desktop/menus/impress.desktop
+++++ sysui/desktop/menus/impress.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Impress
+ GenericName=Presentation
+ Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
@@ -55,8 +57,8 @@
++TargetEnvironment=Unity
+diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
+index cd0717a..71468cc 100644
-+--- a/sysui/desktop/menus/math.desktop
-++++ b/sysui/desktop/menus/math.desktop
++--- sysui/desktop/menus/math.desktop
+++++ sysui/desktop/menus/math.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Math
+ GenericName=Formula Editor
+ Comment=Create and edit scientific formulas and equations by using Math.
@@ -68,8 +70,8 @@
++TargetEnvironment=Unity
+diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
+index 95fe8db..f16a132 100644
-+--- a/sysui/desktop/menus/writer.desktop
-++++ b/sysui/desktop/menus/writer.desktop
++--- sysui/desktop/menus/writer.desktop
+++++ sysui/desktop/menus/writer.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Writer
+ GenericName=Word Processor
+ Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
@@ -81,8 +83,8 @@
++TargetEnvironment=Unity
+diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf
+index e369492..7bd3179 100644
-+--- a/sysui/desktop/share/launcher_comment.ulf
-++++ b/sysui/desktop/share/launcher_comment.ulf
++--- sysui/desktop/share/launcher_comment.ulf
+++++ sysui/desktop/share/launcher_comment.ulf
+@@ -1,21 +1,190 @@
+ [writer]
+ en-US = "Create and edit text and graphics in letters, reports, documents and Web pages by using Writer."
@@ -276,8 +278,8 @@
+
+diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
+index ff8041a..ba16f53 100644
-+--- a/sysui/desktop/share/launcher_genericname.ulf
-++++ b/sysui/desktop/share/launcher_genericname.ulf
++--- sysui/desktop/share/launcher_genericname.ulf
+++++ sysui/desktop/share/launcher_genericname.ulf
+@@ -1,23 +1,190 @@
+ [writer]
+ en-US = "Word Processor"
@@ -473,7 +475,7 @@
+new file mode 100644
+index 0000000..7b4c18a
+--- /dev/null
-++++ b/sysui/desktop/share/launcher_unityquicklist.ulf
+++++ sysui/desktop/share/launcher_unityquicklist.ulf
+@@ -0,0 +1,167 @@
++[writer]
++en-US = "New Document"
@@ -644,8 +646,8 @@
++en-US = ""
+diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
+index 898d7b0..5a906c1 100644
-+--- a/sysui/desktop/share/makefile.mk
-++++ b/sysui/desktop/share/makefile.mk
++--- sysui/desktop/share/makefile.mk
+++++ sysui/desktop/share/makefile.mk
+@@ -154,6 +154,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
@@ -656,8 +658,8 @@
+ .ENDIF
+diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
+index cb209e4..fe7fecd 100644
-+--- a/sysui/desktop/share/translate.pl
-++++ b/sysui/desktop/share/translate.pl
++--- sysui/desktop/share/translate.pl
+++++ sysui/desktop/share/translate.pl
+@@ -69,6 +69,12 @@ while ($_ = $ARGV[0], /^-/) {
+ }
+ }
@@ -706,3 +708,14 @@
+ }
+ }
+ }
+Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/apply
+===================================================================
+--- libreoffice-3.3.2.orig/libreoffice-build/patches/dev300/apply 2011-04-15 09:56:38.394646274 +0200
++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply 2011-04-15 09:57:17.494646280 +0200
+@@ -2377,3 +2377,6 @@
+ [PowerPC]
+ ppc64-openjdk.diff
+ no-minimaltoc.diff
++
++[ UbuntuOnly ]
++lp720716.diff
diff --git a/rules b/rules
index 384b82c..51dbdc4 100755
--- a/rules
+++ b/rules
@@ -2964,8 +2964,8 @@ ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
-e 's/ / /' \
< $$dirname/javafilter.desktop \
> $(PKGDIR)-filter-mobiledev/usr/share/applications/libreoffice$(VER)-javafilter.desktop || exit 1
- # hack for lp#732412
- rm $(PKGDIR)-filter-mobiledev/usr/share/applications/libreoffice$(VER)-javafilter.desktop
+ # hack for lp#732412
+ rm $(PKGDIR)-filter-mobiledev/usr/share/applications/libreoffice$(VER)-javafilter.desktop
endif
endif
--
LibreOffice packaging repository
Reply to: