[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0_beta2-2ubuntu3

["Bjoern Michaelsen" <bjoern.michaelsen@canonical.com>]

The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 7500072a8d2594909805c3653fbec354f0065f2c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Jan 13 00:08:54 2012 +0100

    add human theme and adapt human adding patch for removal of three-layer office

diff --git a/patches/add-human-theme.diff b/patches/add-human-theme.diff
new file mode 100644
index 0000000..27c00e4
--- /dev/null
+++ b/patches/add-human-theme.diff
@@ -0,0 +1,48 @@
+From 903c82fa3bfeafe33965ca5d38c4ff144dbad572 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Sun, 3 Jul 2011 11:37:02 +0200
+Subject: 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 a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
+index 65769d2..0eb9ff6 100644
+--- a/scp2/source/ooo/file_ooo.scp
++++ b/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_Brand_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 a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
+index c27d21d..308fe04 100644
+--- a/scp2/source/ooo/module_hidden_ooo.scp
++++ b/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
diff --git a/patches/add-human-to-configure.diff b/patches/add-human-to-configure.diff
new file mode 100644
index 0000000..5c25466
--- /dev/null
+++ b/patches/add-human-to-configure.diff
@@ -0,0 +1,18 @@
+--- a/configure.in	2012-01-13 09:42:37.366836952 +0100
++++ b/configure.in	2012-01-13 10:07:59.389705736 +0100
+@@ -8006,13 +8006,13 @@
+ AC_MSG_CHECKING([which themes to include])
+ # if none given, use all available themes
+ if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
+-    with_theme="default crystal hicontrast oxygen tango"
++    with_theme="default crystal hicontrast oxygen tango human"
+ fi
+ 
+ WITH_THEMES=""
+ for theme in $with_theme; do
+     case $theme in
+-        default|crystal|hicontrast|oxygen|tango) : ;;
++        default|crystal|hicontrast|oxygen|tango|human) : ;;
+         *) AC_MSG_ERROR([Unknown value for --with-themes: $theme]) ;;
+     esac
+     WITH_THEMES="$WITH_THEMES $theme"
diff --git a/patches/series b/patches/series
index 2103f05..1dea686 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,5 @@ pkgconfig-mozilla-plugin.diff
 propagate-gb_FULLDEPS.diff
 disable-sc-unoapi-subsequentcheck-for-now.diff
 workaround-for-LO-namespace-pollution-breaking-KDE4.diff
+add-human-theme.diff
+add-human-to-configure.diff
diff --git a/rules b/rules
index 76c8c78..caec2e4 100755
--- a/rules
+++ b/rules
@@ -439,6 +439,8 @@ ifeq "$(SQUEEZE_BACKPORT)" "y"
 endif
 
 ifeq "$(DEB_VENDOR)" "Ubuntu"
+  IMAGES+=human
+  CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
   ENABLE_REPORTDESIGN:=n
   ENABLE_EVO2:=n
   SYSTEM_STUFF := $(filter-out lucene libcmis libexttextcat graphite sampleicc libvisio lpsolve, $(SYSTEM_STUFF))

-- 
LibreOffice packaging repository