[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



The following commit has been merged in the ubuntu-precise-3.5 branch:
commit a7847e852088a664a08032ea04dfb11ec6e551ba
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Jan 12 16:54:48 2012 +0100

    enable human theme and make it the default for gtk desktops

diff --git a/changelog b/changelog
index 1645151..4ade421 100644
--- a/changelog
+++ b/changelog
@@ -4,10 +4,11 @@ libreoffice (1:3.5.0~beta2-2ubuntu3) precise; urgency=low
   * get rid of obsolete BrOffice specialcasing (LP: #884786)
   * add control tags as per 'firefox distro add-on support'-spec (picked
     from oneiric-3.4)
+  * enable human theme and make it the default for gtk desktops
   * cherry-pick Replaces commit from 3.4 (LP: #705343)
   * cherry-pick demotion of java-Recommends for -writer to Suggests
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Thu, 12 Jan 2012 17:45:47 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 13 Jan 2012 11:09:32 +0100
 
 libreoffice (1:3.5.0~beta2-2ubuntu2) precise; urgency=low
 
diff --git a/control.in b/control.in
index a017d9f..929d8d4 100644
--- a/control.in
+++ b/control.in
@@ -204,6 +204,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}
@@ -419,7 +420,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
@@ -429,6 +430,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}),
@@ -451,7 +464,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

-- 
LibreOffice packaging repository


Reply to: