[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-170-g3956dc8
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 45963792431738d7fa3a768d16696aced9dd8fe0
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Aug 25 01:23:09 2011 +0200
updated Ubuntu core patch queue
diff --git a/changelog b/changelog
index 8b85a54..37d46da 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,8 @@
libreoffice (1:3.4.2-3ubuntu1) UNRELEASED; urgency=low
* merge from debian 165efec47b35fa52a88e3b4bc8eaa410d2c323e0
- * refresh patch queue
* enable lo-menubar
+ * refresh patch queues
* regenerate control
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 19 Aug 2011 12:09:55 +0200
diff --git a/patches/ubuntufixes-core.diff b/patches/ubuntufixes-core.diff
index d80c96e..422ca27 100644
--- a/patches/ubuntufixes-core.diff
+++ b/patches/ubuntufixes-core.diff
@@ -1,14 +1,11 @@
-Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff 2011-07-26 13:30:15.400961946 +0200
-@@ -0,0 +1,1092 @@
-+./g format-patch libreoffice-3-4-0..libreoffice-3-4-0-ubuntu --stdout |sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |'
-+===== main repo =====
-+From c8b0c9ab769ca586407a49578f251e3aaa1b7ead Mon Sep 17 00:00:00 2001
+--- /dev/null 2011-08-22 10:02:39.668246905 +0200
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff 2011-08-25 01:14:13.323686027 +0200
+@@ -0,0 +1,1068 @@
++git format-patch --stdout libreoffice-3.4.2.3..distro/ubuntu/oneiric-3.4 |sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |'
++From 199bcf985154d33b534d87d1c96c48cbc74a0427 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Thu, 30 Jun 2011 10:18:47 +0200
-+Subject: [PATCH 1/4] apply system-lpsolve-rpath.diff from libreoffice-build
++Subject: [PATCH 1/7] apply system-lpsolve-rpath.diff from libreoffice-build
+
+---
+ solenv/inc/libs.mk | 6 ++++++
@@ -36,10 +33,10 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From 36e80b8f2d8a79508f1f147c8def30f3140c54a7 Mon Sep 17 00:00:00 2001
++From ec039d9de329cd423e1fbba0dcd474d3bd6157b3 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Fri, 1 Jul 2011 10:45:59 +0200
-+Subject: [PATCH 2/4] disable default as-needed on linking
++Subject: [PATCH 2/7] disable default as-needed on linking
+
+ * for not breaking pkg-config provided link switches (because of order)
+---
@@ -62,10 +59,10 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From 72a1fc0064f2fe33765f60b6772eb056b3ae71c1 Mon Sep 17 00:00:00 2001
++From d167d8f03677a8f1da44117dc0205517b3e13a9f Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Sun, 3 Jul 2011 11:37:02 +0200
-+Subject: [PATCH 3/4] adding human theme to scp2
++Subject: [PATCH 3/7] adding human theme to scp2
+
+---
+ scp2/source/ooo/file_ooo.scp | 9 +++++++++
@@ -112,10 +109,10 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From 5312d2bea6c5c8214e30321b84dc6400661144eb Mon Sep 17 00:00:00 2001
++From 2b716070ae4f3cbc7e6b6010bc9477be723031f5 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Tue, 19 Jul 2011 13:16:14 +0200
-+Subject: [PATCH 4/4] disable default as-needed on linking for gbuild too
++Subject: [PATCH 4/7] disable default as-needed on linking for gbuild too
+
+ * for not breaking pkg-config provided link switches (because of order)
+---
@@ -137,16 +134,11 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+--
+1.7.5.4
+
-+===== artwork =====
-+===== base =====
-+===== calc =====
-+===== components =====
-+===== extensions =====
-+===== extras =====
-+From 75f3ef23165c1f709999fe3d361a3f4297f12a6e Mon Sep 17 00:00:00 2001
++
++From d1515499896ea4e043abeb9abc7471d87ed1a982 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 29 Jun 2011 19:49:36 +0200
-+Subject: [PATCH] apply ubuntu-palette.diff
++Subject: [PATCH 5/7] apply ubuntu-palette.diff
+
+---
+ extras/source/palettes/standard.soc | 3 +
@@ -280,13 +272,11 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+--
+1.7.5.4
+
-+===== help =====
-+===== impress =====
-+===== libs-core =====
-+From 8f6b27d7e4e352bc03d4360fbe2a4de0118acfcb Mon Sep 17 00:00:00 2001
++
++From 148c3a6455fc4015cc6cbc62de0251fae4542512 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 29 Jun 2011 19:15:31 +0200
-+Subject: [PATCH] lp#720716: more translations in desktop files
++Subject: [PATCH 6/7] lp#720716: more translations in desktop files
+
+---
+ sysui/desktop/menus/base.desktop | 5 +
@@ -299,8 +289,8 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+ sysui/desktop/share/launcher_genericname.ulf | 168 ++++++++++++++++++++++
+ sysui/desktop/share/launcher_unityquicklist.ulf | 168 ++++++++++++++++++++++
+ sysui/desktop/share/makefile.mk | 4 +-
-+ sysui/desktop/share/translate.pl | 20 ++-
-+ 11 files changed, 556 insertions(+), 5 deletions(-)
++ sysui/desktop/share/translate.pl | 18 ++-
++ 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
@@ -317,7 +307,7 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
++Exec=libreoffice -base %U
++TargetEnvironment=Unity
+diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
-+index 80cc09d..0af1c53 100755
++index 80cc09d..0af1c530 100755
+--- sysui/desktop/menus/calc.desktop
++++ sysui/desktop/menus/calc.desktop
+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Calc
@@ -776,7 +766,7 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+ en-US = "Small Device Format Importer"
+diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf b/sysui/desktop/share/launcher_unityquicklist.ulf
+new file mode 100644
-+index 0000000..49ec877
++index 0000000..62f07d0
+--- /dev/null
++++ sysui/desktop/share/launcher_unityquicklist.ulf
+@@ -0,0 +1,168 @@
@@ -943,13 +933,13 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
++zh_CN = "新建绘图"
++zh_TW = "新增繪圖"
++
-++[startcenter]
+++[startcenter]
++en-US = ""
++
++[javafilter]
++en-US = ""
+diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
-+index 6e9ab75..61b329d 100755
++index 68cba59..19575ed 100755
+--- sysui/desktop/share/makefile.mk
++++ sysui/desktop/share/makefile.mk
+@@ -50,6 +50,7 @@ ULFFILES= \
@@ -978,7 +968,7 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+ @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 cb209e4..9c50cc3 100755
++index cdc636b..85cc9311 100755
+--- sysui/desktop/share/translate.pl
++++ sysui/desktop/share/translate.pl
+@@ -69,6 +69,12 @@ while ($_ = $ARGV[0], /^-/) {
@@ -995,8 +985,8 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+ unless (open(SOURCE, $ARGV[0])) {
+ print STDERR "Can't open $ARGV[0] file: $!\n";
+@@ -111,9 +117,12 @@ while (<SOURCE>) {
-+
-+ # Pass the head of the template to the output file
++
++ # Pass the head of the template to the output file
+ KEY: while (<TEMPLATE>) {
+- print OUTFILE;
++ $keyline = $_;
@@ -1005,19 +995,12 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+ }
++ $keyline=~s/^$key/$outkey/;
++ print OUTFILE $keyline;
-+
++
+ } else {
+ # split locale = "value" into 2 strings
-+@@ -125,16 +134,19 @@ KEY: while (<TEMPLATE>) {
-+
-+ # use just anything inside the ""
-+ $value = substr($value, index($value, "\"") + 1, rindex($value, "\"") - 1);
-+-
-++
-+ # replace resource placeholder
-+ $value=~s/%PRODUCTNAME_BR/$productname_br/g;
++@@ -131,10 +140,13 @@ KEY: while (<TEMPLATE>) {
+ $value=~s/%PRODUCTNAME/$productname/g;
-+
++
+ $locale=~s/-/_/;
++
++ if (not $value eq '') {
@@ -1034,13 +1017,11 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+--
+1.7.5.4
+
-+===== libs-extern =====
-+===== libs-extern-sys =====
-+===== libs-gui =====
-+From 2673d36334fc10b46adc19f3e6b2a6d042263c6b Mon Sep 17 00:00:00 2001
++
++From 9f049da15b0dca23a5951f32896a47f2c00ad2dc Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 29 Jun 2011 19:20:43 +0200
-+Subject: [PATCH] lp#746375: soffice.bin crashed with SIGSEGV in
++Subject: [PATCH 7/7] lp#746375: soffice.bin crashed with SIGSEGV in
+ uno_type_sequence_construct()
+
+---
@@ -1048,7 +1029,7 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+ 1 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
-+index 68bb949..97e44e7 100644
++index f7e849e..16ff410 100644
+--- vcl/unx/gtk/a11y/atkutil.cxx
++++ vcl/unx/gtk/a11y/atkutil.cxx
+@@ -66,7 +66,14 @@
@@ -1088,9 +1069,3 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+--
+1.7.5.4
+
-+===== postprocess =====
-+===== sdk =====
-+===== testing =====
-+===== translations =====
-+===== ure =====
-+===== writer =====
--
LibreOffice packaging repository
Reply to: