[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4-1-2-g7576571

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 461231255177c7634e6d7ce16fa3d74803807372
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jun 5 12:28:54 2012 +0200

    sigh. fix $(error clause in gcj builds

diff --git a/changelog b/changelog
index 5822f31..93f0fdd 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.5.4-2) unstable; urgency=medium
+
+  * debian/rules:
+    - sigh. fix $(error clause in gcj builds
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 05 Jun 2012 12:08:20 +0200
+
 libreoffice (1:3.5.4-1) unstable; urgency=medium
 
   * LibreOffice 3.5.4 final (identical to rc2)
diff --git a/rules b/rules
index 63ebb06..6d84d9e 100755
--- a/rules
+++ b/rules
@@ -1069,9 +1069,10 @@ ifeq "$(ENABLE_JAVA)" "y"
 	BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)
 	BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
 	JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj [$(OOO_GCJ_ARCHS)]
+  else
     ifneq "$(JDK)" "openjdk"
-	# hsqldb with jdk7 buildfix (see jdk7.diff) fails with gcj
-	$(error hsqldb with jdk7 buildfix (see jdk7.diff) fails with gcj)
+	# hsqldb with jdk7 buildfix from jdk7.diff fails with gcj
+	$(error hsqldb with jdk7 buildfix from jdk7.diff fails with gcj)
     endif
   endif
   ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"

-- 
LibreOffice packaging repository