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

[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 24781dca464b9f9c7f5f051c5624ab7325b823d5
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Jun 5 15:08:30 2012 +0200

    styles dont really need -core as a hard dep, demote to recommends:

diff --git a/control.in b/control.in
index 8af9e92..93b571d 100644
--- a/control.in
+++ b/control.in
@@ -371,9 +371,10 @@ Description: office productivity suite -- database
     - PostgreSQL
     - MS SQL Server and Sybase
 
-Package: libreofficeVER-style-crystal
+Package: libreoffice-style-crystal
 Architecture: all
-Depends: ${misc:Depends}, libreofficeVER-core
+Depends: ${misc:Depends}
+Recommends: libreoffice-core
 Suggests: kde-icons-crystal, crystalcursors
 Provides: libreofficeVER-style
 Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -383,9 +384,10 @@ Description: office productivity suite -- Crystal symbol style
  .
  This package contains the "crystal" symbol style, default style for KDE 3.
 
-Package: libreofficeVER-style-oxygen
+Package: libreoffice-style-oxygen
 Architecture: all
-Depends: ${misc:Depends}, libreofficeVER-core
+Depends: ${misc:Depends}
+Recommends: libreoffice-core
 Suggests: kde-icons-oxygen, oxygencursors
 Provides: libreofficeVER-style
 Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -395,9 +397,10 @@ Description: office productivity suite -- Oxygen symbol style
  .
  This package contains the "oxygen" symbol style, default style for KDE 4.
 
-Package: libreofficeVER-style-tango
+Package: libreoffice-style-tango
 Architecture: all
-Depends: ${misc:Depends}, libreofficeVER-core
+Depends: ${misc:Depends}
+Recommends: libreoffice-core
 Suggests: tango-icon-theme
 Provides: libreofficeVER-style
 Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -408,9 +411,10 @@ Description: office productivity suite -- Tango symbol style
  This package contains the "tango" symbol style, default style
  for GTK+/Gnome.
 
-Package: libreofficeVER-style-hicontrast
+Package: libreoffice-style-hicontrast
 Architecture: all
-Depends: ${misc:Depends}, libreofficeVER-core
+Depends: ${misc:Depends}
+Recommends: libreoffice-core
 Suggests: gtk2-engines
 Provides: libreofficeVER-style
 Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -421,9 +425,10 @@ Description: office productivity suite -- Hicontrast symbol style
  This package contains the "hicontrast" symbol style, needs to be manually
  enabled in the LibreOffice option menu.
 
-Package: libreofficeVER-style-galaxy
+Package: libreoffice-style-galaxy
 Architecture: all
-Depends: ${misc:Depends}, libreofficeVER-core
+Depends: ${misc:Depends}
+Recommends: libreoffice-core
 Provides: libreofficeVER-style
 Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
 Description: office productivity suite -- Galaxy (Default) symbol style
@@ -434,9 +439,10 @@ 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
+Package: libreoffice-style-human
 Architecture: all
-Depends: ${misc:Depends}, libreofficeVER-core
+Depends: ${misc:Depends}
+Recommends: libreoffice-core
 Suggests: kde-icons-crystal, crystalcursors
 Provides: libreofficeVER-style-default, libreofficeVER-style
 Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)

-- 
LibreOffice packaging repository


Reply to: