[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-143-g4d4f4d6
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 4df77948edcff6a6b1cd8f871c45b2ce65f6f041
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Jan 13 00:08:54 2012 +0100
add human theme
enable human theme and make it the default for gtk desktops
diff --git a/control.in b/control.in
index 1a74686..e8deeac 100644
--- a/control.in
+++ b/control.in
@@ -206,6 +206,7 @@ Depends: libreofficeVER-style-default | libreofficeVER-style,
Suggests: libreofficeVER-style-hicontrast,
libreofficeVER-style-tango,
libreofficeVER-style-crystal,
+ libreofficeVER-style-human,
libreofficeVER-style-oxygen
Recommends: xfonts-mathml,
${textcat-data-recommends}
@@ -422,7 +423,7 @@ Description: office productivity suite -- Hicontrast symbol style
Package: libreofficeVER-style-galaxy
Architecture: all
Depends: ${misc:Depends}, libreofficeVER-core
-Provides: libreofficeVER-style-default, libreofficeVER-style
+Provides: libreofficeVER-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Galaxy (Default) symbol style
LibreOffice is a full-featured office productivity suite that provides
@@ -432,6 +433,18 @@ Description: office productivity suite -- Galaxy (Default) symbol style
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the LibreOffice option menu.
+Package: libreofficeVER-style-human
+Architecture: all
+Depends: ${misc:Depends}, libreofficeVER-core
+Suggests: kde-icons-crystal, crystalcursors
+Provides: libreofficeVER-style-default, libreofficeVER-style
+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
+Description: office productivity suite -- Human symbol style
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the "human" symbol style, default style for Ubuntu.
+
Package: libreofficeVER-gtk
Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
@@ -454,7 +467,7 @@ Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Recommends: libreofficeVER-style-tango
+Recommends: libreofficeVER-style-human | libreofficeVER-style-tango
Section: gnome
Enhances: libreofficeVER
Description: office productivity suite -- GTK+ 3.0 integration
diff --git a/rules b/rules
index 26d83dc..1738b3a 100755
--- a/rules
+++ b/rules
@@ -496,6 +496,8 @@ ifeq "$(WHEEZY_BACKPORT)" "y"
endif
ifeq "$(DEB_VENDOR)" "Ubuntu"
+ IMAGES+=human
+ CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
# lucene has too heavy deps for main, internal copy does only build parts
SYSTEM_STUFF := $(filter-out graphite libcdr libvisio lpsolve lucene, $(SYSTEM_STUFF))
endif
--
LibreOffice packaging repository
Reply to: