[libreoffice] 01/02: remove -style-default provides since it doesn't help at all on default changes; depend on tango since that apparently is (last) fallback
Rene Engelhard
rene at moszumanska.debian.org
Fri Sep 22 07:22:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit 57c54448aada00187dfc3dbd8c793bff138fac90
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Fri Sep 22 09:19:06 2017 +0200
remove -style-default provides since it doesn't help at all on default
changes; depend on tango since that apparently is (last) fallback
---
changelog | 8 +++++++-
control | 20 ++++++++------------
control.gtk2.in | 1 -
control.gtk3.in | 1 -
control.in | 16 +++++++---------
5 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/changelog b/changelog
index d036fbb..7d44b51 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,13 @@ libreoffice (1:5.4.2~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate
- -- Rene Engelhard <rene at debian.org> Sun, 17 Sep 2017 11:54:04 +0200
+ * debian/control.in: remove -style-default provides since it doesn't help at
+ all on default changes; depend on tango since that apparently is now the
+ (last) fallback (closes: #874196)
+ * debian/control.gtk?.in: remove -style-tango recommends, obsoleted by
+ above
+
+ -- Rene Engelhard <rene at debian.org> Thu, 21 Sep 2017 20:18:13 +0200
libreoffice (1:5.4.1-2) unstable; urgency=medium
diff --git a/control b/control
index e9f30b6..cee3e91 100644
--- a/control
+++ b/control
@@ -190,7 +190,7 @@ Build-Conflicts: amd-libopencl1,
Standards-Version: 4.0.1
Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice at lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -368,11 +368,8 @@ Description: office productivity suite -- arch-dependent files
Package: libreoffice-common
Architecture: all
-Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
-Suggests: libreoffice-style-breeze,
- libreoffice-style-hicontrast,
- libreoffice-style-sifr,
- libreoffice-style-tango
+Depends: libreoffice-style-tango, ure, ${misc:Depends}
+Suggests: libreoffice-style
Recommends: fonts-liberation | ttf-mscorefonts-installer,
${pyuno-depends},
${textcat-data-recommends}
@@ -529,7 +526,7 @@ Description: office productivity suite -- database
Package: libreoffice-style-breeze
Architecture: all
Enhances: libreoffice-core
-Depends: libreoffice-style-default, ${misc:Depends}
+Depends: libreoffice-style-galaxy, ${misc:Depends}
Suggests: breeze-icon-theme
Provides: libreoffice-style
Description: office productivity suite -- Breeze symbol style
@@ -541,7 +538,7 @@ Description: office productivity suite -- Breeze symbol style
Package: libreoffice-style-tango
Architecture: all
Enhances: libreoffice-core
-Depends: libreoffice-style-default, ${misc:Depends}
+Depends: libreoffice-style-galaxy, ${misc:Depends}
Suggests: tango-icon-theme
Provides: libreoffice-style
Replaces: libreoffice-common (<= 1:4.3.0~beta2-2)
@@ -555,7 +552,7 @@ Description: office productivity suite -- Tango symbol style
Package: libreoffice-style-hicontrast
Architecture: all
Enhances: libreoffice-core
-Depends: libreoffice-style-default, ${misc:Depends}
+Depends: libreoffice-style-galaxy, ${misc:Depends}
Suggests: gtk2-engines
Provides: libreoffice-style
Description: office productivity suite -- Hicontrast symbol style
@@ -582,7 +579,8 @@ Package: libreoffice-style-galaxy
Architecture: all
Enhances: libreoffice-core
Depends: ${misc:Depends}
-Provides: libreoffice-style, libreoffice-style-default
+Provides: libreoffice-style
+Breaks: libreoffice-core (<< 1:5.4.2~)
Description: office productivity suite -- Galaxy (Default) symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -4186,7 +4184,6 @@ Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreeb
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreoffice-style-tango
Section: gnome
Enhances: libreoffice
Replaces: libreoffice-gtk (<< 1:5.2.0~)
@@ -4216,7 +4213,6 @@ Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreeb
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreoffice-style-tango
Suggests: libreofficekit-data
Section: gnome
Enhances: libreoffice
diff --git a/control.gtk2.in b/control.gtk2.in
index 2a9c392..13e4542 100644
--- a/control.gtk2.in
+++ b/control.gtk2.in
@@ -3,7 +3,6 @@ Architecture: %OOO_ARCHS%
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreoffice-style-tango
Section: gnome
Enhances: libreoffice
Replaces: libreoffice-gtk (<< 1:5.2.0~)
diff --git a/control.gtk3.in b/control.gtk3.in
index 4a5b38e..412c4a7 100644
--- a/control.gtk3.in
+++ b/control.gtk3.in
@@ -3,7 +3,6 @@ Architecture: %OOO_ARCHS%
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreoffice-style-tango
Suggests: libreofficekit-data
Section: gnome
Enhances: libreoffice
diff --git a/control.in b/control.in
index 265375b..f900d42 100644
--- a/control.in
+++ b/control.in
@@ -191,11 +191,8 @@ Description: office productivity suite -- arch-dependent files
Package: libreoffice-common
Architecture: all
-Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
-Suggests: libreoffice-style-breeze,
- libreoffice-style-hicontrast,
- libreoffice-style-sifr,
- libreoffice-style-tango
+Depends: libreoffice-style-tango, ure, ${misc:Depends}
+Suggests: libreoffice-style,
Recommends: ${pyuno-depends}, ${textcat-data-recommends}, fonts-liberation | ttf-mscorefonts-installer
Conflicts: openoffice-unbundled,
broffice,
@@ -350,7 +347,7 @@ Description: office productivity suite -- database
Package: libreoffice-style-breeze
Architecture: all
Enhances: libreoffice-core
-Depends: libreoffice-style-default, ${misc:Depends}
+Depends: libreoffice-style-galaxy, ${misc:Depends}
Suggests: breeze-icon-theme
Provides: libreoffice-style
Description: office productivity suite -- Breeze symbol style
@@ -362,7 +359,7 @@ Description: office productivity suite -- Breeze symbol style
Package: libreoffice-style-tango
Architecture: all
Enhances: libreoffice-core
-Depends: libreoffice-style-default, ${misc:Depends}
+Depends: libreoffice-style-galaxy, ${misc:Depends}
Suggests: tango-icon-theme
Provides: libreoffice-style
Replaces: libreoffice-common (<= 1:4.3.0~beta2-2)
@@ -376,7 +373,7 @@ Description: office productivity suite -- Tango symbol style
Package: libreoffice-style-hicontrast
Architecture: all
Enhances: libreoffice-core
-Depends: libreoffice-style-default, ${misc:Depends}
+Depends: libreoffice-style-galaxy, ${misc:Depends}
Suggests: gtk2-engines
Provides: libreoffice-style
Description: office productivity suite -- Hicontrast symbol style
@@ -403,7 +400,8 @@ Package: libreoffice-style-galaxy
Architecture: all
Enhances: libreoffice-core
Depends: ${misc:Depends}
-Provides: libreoffice-style, libreoffice-style-default
+Provides: libreoffice-style
+Breaks: libreoffice-core (<< 1:5.4.2~)
Description: office productivity suite -- Galaxy (Default) symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list