[libreoffice] 01/01: update -style-* dependencies based on the recommendation in https://lists.debian.org/debian-openoffice/2015/09/msg00343.html ff.
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 4d0cc1a4a766b7b27655433f083381cef4b53929
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 28 16:01:23 2015 +0200
update -style-* dependencies based on the recommendation in https://lists.debian.org/debian-openoffice/2015/09/msg00343.html ff.
---
changelog | 8 +++++++-
control | 14 +++++++-------
control.in | 12 ++++++------
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/changelog b/changelog
index 4b5bda1..c7118fd 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,14 @@ libreoffice (1:5.0.2-2) UNRELEASED; urgency=medium
* debian/rules:
- use dh_installdocs --link-doc=libreoffice-{core,common}
+ * debian/control.in:
+ - update -style-* dependencies based on the recommendation in
+ https://lists.debian.org/debian-openoffice/2015/09/msg00343.html ff.
+ + add various dependencies on fallback to the various -style-*
+ + suggest -breeze instead of -crystal in common, crystal is disabled
+ + depend on -style-default in libreoffice-core
- -- Rene Engelhard <rene@debian.org> Wed, 23 Sep 2015 13:45:25 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 28 Sep 2015 15:53:59 +0200
libreoffice (1:5.0.2-1) unstable; urgency=medium
diff --git a/control b/control
index 62040f6..27ec7ec 100644
--- a/control
+++ b/control
@@ -188,7 +188,7 @@ Build-Conflicts: amd-libopencl1,
Standards-Version: 3.9.4
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.0
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -431,7 +431,7 @@ Package: libreoffice-common
Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
-Suggests: libreoffice-style-crystal,
+Suggests: libreoffice-style-breeze,
libreoffice-style-hicontrast,
libreoffice-style-oxygen,
libreoffice-style-sifr,
@@ -597,7 +597,7 @@ Description: office productivity suite -- database
Package: libreoffice-style-oxygen
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-tango, ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -610,7 +610,7 @@ Description: office productivity suite -- Oxygen symbol style
Package: libreoffice-style-breeze
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-default, ${misc:Depends}
Suggests: breeze-icon-theme
Provides: libreoffice-style
Description: office productivity suite -- Breeze symbol style
@@ -622,7 +622,7 @@ Description: office productivity suite -- Breeze symbol style
Package: libreoffice-style-tango
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-default, ${misc:Depends}
Suggests: tango-icon-theme
Provides: libreoffice-style
Replaces: libreoffice-common (<= 1:4.3.0~beta2-2)
@@ -636,7 +636,7 @@ Description: office productivity suite -- Tango symbol style
Package: libreoffice-style-hicontrast
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-default, ${misc:Depends}
Suggests: gtk2-engines
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -650,7 +650,7 @@ Description: office productivity suite -- Hicontrast symbol style
Package: libreoffice-style-sifr
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-breeze, ${misc:Depends}
Provides: libreoffice-style
Description: office productivity suite -- Sifr symbol style
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.in b/control.in
index d1d32d6..3e98835 100644
--- a/control.in
+++ b/control.in
@@ -266,7 +266,7 @@ Package: libreoffice-common
Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
-Suggests: libreoffice-style-crystal,
+Suggests: libreoffice-style-breeze,
libreoffice-style-hicontrast,
libreoffice-style-oxygen,
libreoffice-style-sifr,
@@ -432,7 +432,7 @@ Description: office productivity suite -- database
Package: libreoffice-style-oxygen
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-tango, ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -445,7 +445,7 @@ Description: office productivity suite -- Oxygen symbol style
Package: libreoffice-style-breeze
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-default, ${misc:Depends}
Suggests: breeze-icon-theme
Provides: libreoffice-style
Description: office productivity suite -- Breeze symbol style
@@ -457,7 +457,7 @@ Description: office productivity suite -- Breeze symbol style
Package: libreoffice-style-tango
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-default, ${misc:Depends}
Suggests: tango-icon-theme
Provides: libreoffice-style
Replaces: libreoffice-common (<= 1:4.3.0~beta2-2)
@@ -471,7 +471,7 @@ Description: office productivity suite -- Tango symbol style
Package: libreoffice-style-hicontrast
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-default, ${misc:Depends}
Suggests: gtk2-engines
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -485,7 +485,7 @@ Description: office productivity suite -- Hicontrast symbol style
Package: libreoffice-style-sifr
Architecture: all
Enhances: libreoffice-core
-Depends: ${misc:Depends}
+Depends: libreoffice-style-breeze, ${misc:Depends}
Provides: libreoffice-style
Description: office productivity suite -- Sifr symbol style
LibreOffice is a full-featured office productivity suite that provides
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: