The following commit has been merged in the master branch:
commit 5984a3c6421697c2b80b844c2bc00440827f0f3e
Author: Rene Engelhard <r...@debian.org>
Date: Thu Dec 29 18:05:24 2011 +0000
fix typo, and move GCJ_JDK_VERSION check to control (as echo)
diff --git a/rules b/rules
index 29c42ed..7b0950c 100755
--- a/rules
+++ b/rules
@@ -472,9 +472,6 @@ ifeq "$(GCC_VERSION)" ""
ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_ARCHS)))
GCJ_JDK_PACKAGE=$(shell dpkg -s gcj-jdk | grep Depends | sed -e
's/.*\(gcj-[0-9]\.[0-9]-jdk\).*/\1/')
GCJ_JDK_VERSION=$(shell echo $(GCJ_JDK_PACKAGE) | cut -d- -f2)
- ifeq "$(GCJ_JDK_VERSION)" ""
- $(error GCJ_JDK_VERSION not defined, you need gcj-jdk installed for
generating correct build-deps on $(GCJ_JDK_ARCHS))
- endif
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCJ_JDK_VERSION)"
BUILD_DEPS += , gcc-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)],
g++-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)]
ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
@@ -1398,6 +1395,12 @@ endif
# Based on script by Martin Quinson <martin.quin...@tuxfamily.org>
control: debian/control
debian/control: $(wildcard debian/control*in)
$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang debian/rules
+ifeq "$(GCJ_JDK_VERSION)" ""
+ echo "GCJ_JDK_VERSION not defined."; \
+ echo "You need gcj-jdk installed for generating correct
build-deps on $(OOO_GCJ_JDK_ARCHS)"; \
+ exit 1
+endif
+
chmod 755 $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang
sed -e "s#libreofficeVER#libreoffice$(VER)#g" \
-e "s#libreofficeVER#libreoffice$(VER)#g" \
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rgl5k-0004qc...@vasks.debian.org
