[libreoffice] 01/01: micro-optimization of gettext build-dep

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 856cf94b51e94498bda85abb96cd049cf61a3a09
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jul 21 17:07:21 2017 +0200

    micro-optimization of gettext build-dep
---
 control | 2 +-
 rules   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/control b/control
index 1b57162..6c92a67 100644
--- a/control
+++ b/control
@@ -32,7 +32,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                g++-7 (>= 7-20170106) [m68k],
                gcc-7 (>= 7-20170106) [m68k],
                gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
-               gettext,
                ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                gobject-introspection (>= 1.32.0),
                gperf,
@@ -161,6 +160,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                zlib1g-dev
 Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
                      g++-mingw-w64-i686,
+                     gettext,
                      libbase-java [!hppa !ia64 !mips64 !s390 !sparc],
                      libbsh-java,
                      libcommons-logging-java [!hppa !ia64 !mips64 !s390 !sparc],
diff --git a/rules b/rules
index d644658..aa82247 100755
--- a/rules
+++ b/rules
@@ -1025,6 +1025,7 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
 	CONFIGURE_FLAGS_INDEP += $(CONFIGURE_FLAGS_LANG)
 	# solenv/bin/interim-update-module-for-gettext has #!/usr/bin/python
 	# 16:25 <@caolan> _rene_: it is intended to be a temporary thing, this in-build update
+	BUILD_DEPS_INDEP += , gettext
 	BUILD_DEPS_INDEP += , python
   endif
 endif
@@ -1534,8 +1535,6 @@ else
 	CONFIGURE_FLAGS += --disable-gio
 endif
 
-	BUILD_DEPS += , gettext
-
 ifeq "$(ENABLE_DCONF)" "y"
 	BUILD_DEPS += , libdconf-dev
 else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git