[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.3.3-1-220-g355b98e
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 355b98e214a2255101f4e94026134aa854ece2c5
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Jul 4 11:58:01 2011 +0200
add human icon theme patch
diff --git a/patches/ubuntufixes.diff b/patches/ubuntufixes.diff
index 7f08be6..6abd37b 100644
--- a/patches/ubuntufixes.diff
+++ b/patches/ubuntufixes.diff
@@ -1,13 +1,13 @@
Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff 2011-07-01 11:29:47.023623250 +0200
-@@ -0,0 +1,1015 @@
++++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff 2011-07-04 11:56:09.197050119 +0200
+@@ -0,0 +1,1065 @@
+===== main repo =====
+From c8b0c9ab769ca586407a49578f251e3aaa1b7ead 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/2] apply system-lpsolve-rpath.diff from libreoffice-build
++Subject: [PATCH 1/3] apply system-lpsolve-rpath.diff from libreoffice-build
+
+---
+ solenv/inc/libs.mk | 6 ++++++
@@ -38,7 +38,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+From 36e80b8f2d8a79508f1f147c8def30f3140c54a7 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/2] disable default as-needed on linking
++Subject: [PATCH 2/3] disable default as-needed on linking
+
+ * for not breaking pkg-config provided link switches (because of order)
+---
@@ -60,6 +60,56 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+--
+1.7.5.4
+
++
++From 72a1fc0064f2fe33765f60b6772eb056b3ae71c1 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/3] adding human theme to scp2
++
++---
++ scp2/source/ooo/file_ooo.scp | 9 +++++++++
++ scp2/source/ooo/module_hidden_ooo.scp | 5 ++++-
++ 2 files changed, 13 insertions(+), 1 deletions(-)
++
++diff --git scp2/source/ooo/file_ooo.scp scp2/source/ooo/file_ooo.scp
++index 65769d2..0eb9ff6 100644
++--- scp2/source/ooo/file_ooo.scp
+++++ scp2/source/ooo/file_ooo.scp
++@@ -1818,6 +1818,15 @@ File gid_File_ImagesTango_Zip
++ End
++ #endif
++
+++#ifdef THEME_HUMAN
+++File gid_File_ImagesHuman_Zip
+++ TXT_FILE_BODY;
+++ Dir = gid_Dir_Share_Config;
+++ Name = "images_human.zip";
+++ Styles = (PACKED);
+++End
+++#endif
+++
++ File gid_File_Share_Registry_Lingucomponent_Xcd
++ TXT_FILE_BODY;
++ Styles = (PACKED);
++diff --git scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp
++index c27d21d..308fe04 100644
++--- scp2/source/ooo/module_hidden_ooo.scp
+++++ scp2/source/ooo/module_hidden_ooo.scp
++@@ -772,7 +772,10 @@ Module gid_Module_Root_Files_Images
++ gid_File_ImagesHicontrast_Zip,
++ #endif
++ #ifdef THEME_TANGO
++- gid_File_ImagesTango_Zip
+++ gid_File_ImagesTango_Zip,
+++#endif
+++#ifdef THEME_HUMAN
+++ gid_File_ImagesHuman_Zip
++ #endif
++ );
++ End
++--
++1.7.5.4
++
+===== artwork =====
+===== base =====
+===== calc =====
--
LibreOffice packaging repository
Reply to: