[libreoffice] 02/02: make -gnome only recommend -gtk
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 90d688fd968674255abebfaad7ea3e00ebd692f5
Author: Rene Engelhard <rene@debian.org>
Date: Mon Oct 19 00:51:25 2015 +0200
make -gnome only recommend -gtk
---
changelog | 2 ++
control | 2 +-
control.in | 2 +-
rules | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index a3caaee..04c44d3 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:5.0.3~rc1-2) unstable; urgency=medium
* debian/*.maintscript: add loads of dir_to_symlink calls to packages
moving dir->symlink due to dh_installdocs --link-doc (closes: #801753)
+ * debian/control.in:
+ - make -gnome only recommend -gtk. it doesn't need -gtks libs
-- Rene Engelhard <rene@debian.org> Mon, 19 Oct 2015 00:01:06 +0200
diff --git a/control b/control
index f1423f7..392537a 100644
--- a/control
+++ b/control
@@ -698,9 +698,9 @@ Package: libreoffice-gnome
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: gconf2,
libreoffice-core (= ${binary:Version}),
- ${gnome-gtk-depends},
${misc:Depends},
${shlibs:Depends}
+Recommends: ${gnome-gtk-recommends}
Suggests: libreoffice-evolution
Section: gnome
Enhances: libreoffice
diff --git a/control.in b/control.in
index 772395f..12fd330 100644
--- a/control.in
+++ b/control.in
@@ -532,9 +532,9 @@ Package: libreoffice-gnome
Architecture: %OOO_ARCHS%
Depends: gconf2,
libreoffice-core (= ${binary:Version}),
- ${gnome-gtk-depends},
${misc:Depends},
${shlibs:Depends}
+Recommends: ${gnome-gtk-recommends},
Suggests: libreoffice-evolution
Section: gnome
Enhances: libreoffice
diff --git a/rules b/rules
index ff9f3de..8602353 100755
--- a/rules
+++ b/rules
@@ -1297,9 +1297,9 @@ ifeq "$(BUILD_GTK3)" "y"
ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
$(error GTK3 build fails without system-cairo!!)
endif
- GNOME_GTK_DEPENDS += libreoffice-gtk3
+ GNOME_GTK_RECOMMENDS += libreoffice-gtk3
else
- GNOME_GTK_DEPENDS += libreoffice-gtk
+ GNOME_GTK_RECOMMENDS += libreoffice-gtk
endif
ifeq "$(ENABLE_EVO2)" "n"
@@ -3328,7 +3328,7 @@ endif
-V'avmedia-be-depends=$(AVMEDIA_BE_DEPENDS)' \
-V'dejavu-depends=$(DEJAVU_DEPENDS)' \
-V'opencl-sug=$(OPENCL_SUGGESTS)' \
- -V'gnome-gtk-depends=$(GNOME_GTK_DEPENDS)' \
+ -V'gnome-gtk-recommends=$(GNOME_GTK_RECOMMENDS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
ifeq "$(ENABLE_JAVA)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: