[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-2-7-g3a6e7b1
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit a7acad15f2121d155ff930aeb2e07211677de8b9
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jul 20 14:11:13 2011 +0200
fix conditional for translate-toolkit
diff --git a/changelog b/changelog
index 408c284..1c04af5 100644
--- a/changelog
+++ b/changelog
@@ -18,6 +18,7 @@ libreoffice (1:3.4.1-2) experimental; urgency=low
- fix -javafilter.destop Exec=
- remove obsolete libstlport4.6-dev build-conflict, thanks Björn
Michaelsen
+ - fix conditional for translate-toolkit
* debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
* merge from ubuntu-oneiric-3.4:
- gconf also needs liborbit2-dev
diff --git a/rules b/rules
index e844871..737c469 100755
--- a/rules
+++ b/rules
@@ -1119,7 +1119,7 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
BUILD_DEPS_INDEP += , fontforge
endif
-ifeq "$(BUILD_ONLY_EN_US)" "n"
+ifneq "$(ISOS)" "en-US"
CONFIGURE_FLAGS += --with-system-translate-toolkit
BUILD_DEPS_INDEP += , translate-toolkit
endif
--
LibreOffice packaging repository
Reply to: