[libreoffice] 01/01: add libsane-suggests substvar to prepare for libsane1
Rene Engelhard
rene at moszumanska.debian.org
Fri Jul 21 14:14:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit a11f5b7381097ea0ae9a3e03db909f4075628935
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Fri Jul 21 16:14:21 2017 +0200
add libsane-suggests substvar to prepare for libsane1
---
changelog | 2 ++
control | 2 +-
control.in | 2 +-
rules | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 9936661..1b6af97 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,8 @@ libreoffice (1:5.4.0~rc2-2) UNRELEASED; urgency=medium
- add pstoedit, imagemagick and ghostscript as (test) Build-Depends:
* debian/control.in:
- add ghostscript to the "EPS Suggests"
+ * debian/rules. debian/control.in:
+ - add libsane-suggests substvar to prepare for libsane1
-- Rene Engelhard <rene at debian.org> Sat, 15 Jul 2017 12:24:52 +0000
diff --git a/control b/control
index 65d976d..592b8fa 100644
--- a/control
+++ b/control
@@ -240,7 +240,6 @@ Suggests: cups-bsd,
libreoffice-grammarcheck,
libreoffice-help (= ${help-l10n-virtual-version}),
libreoffice-l10n (= ${help-l10n-virtual-version}),
- libsane,
libxrender1,
myspell-dictionary,
mythes-thesaurus,
@@ -249,6 +248,7 @@ Suggests: cups-bsd,
unixodbc,
${gstreamer-plugins-suggests},
${java-runtime-depends},
+ ${libsane-suggests},
${ooo-officebean-dep}
Conflicts: libreoffice-dev (<= 1:5.0.3~rc1-2),
libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
diff --git a/control.in b/control.in
index 7a12ed5..8695cc1 100644
--- a/control.in
+++ b/control.in
@@ -68,7 +68,7 @@ Suggests: cups-bsd,
libreoffice-grammarcheck,
libreoffice-help (= ${help-l10n-virtual-version}),
libreoffice-l10n (= ${help-l10n-virtual-version}),
- libsane,
+ ${libsane-suggests},
libxrender1,
myspell-dictionary,
mythes-thesaurus,
diff --git a/rules b/rules
index 5e73c77..ae6b439 100755
--- a/rules
+++ b/rules
@@ -3430,6 +3430,7 @@ endif
-V'avmedia-be-depends=$(AVMEDIA_BE_DEPENDS)' \
-V'gnome-gtk-recommends=$(GNOME_GTK_RECOMMENDS)' \
-V'firebird-engine-depends=$(FIREBIRD_ENGINE_DEPENDS)' \
+ -V'libsane-suggests=$(shell dpkg -S /usr/lib/$(DEB_HOST_MULTIARCH)/libsane.so.1 | cut -d: -f1) \
-v$(BINARY_VERSION)
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ifeq "$(PACKAGE_BASE)" "y"
--
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