[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-287-g58523f8
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit d6d422127d65928e741443089b6753884dc9fa88
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 1 14:06:35 2013 +0200
build against "new" libhsqldb1.8.0-java
Conflicts:
changelog
control
diff --git a/changelog b/changelog
index a1a49c0..f9c18f2 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.0.2-0ubuntu3) saucy; urgency=low
+
+ * cherry-pick from Debian:
+ - build against "new" libhsqldb1.8.0-java
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 31 May 2013 13:05:01 +0200
+
libreoffice (1:4.0.2-0ubuntu2) saucy; urgency=low
[ Dmitrijs Ledkovs ]
diff --git a/rules b/rules
index 129529d..bdd73b4 100755
--- a/rules
+++ b/rules
@@ -213,6 +213,11 @@ ifeq "$(ENABLE_JAVA)" "y"
SYSTEM_STUFF += hsqldb
HSQLDB_MINVER= (>> 1.8.0.10)
HSQLDB_TOONEWVER=1.8.1
+ ifeq "$(WHEEZY_BACKPORT)" "y"
+ HSQLDB_JAR=/usr/share/java/hsqldb.jar
+ else
+ HSQLDB_JAR=/usr/share/java/hsqldb1.8.0.jar
+ endif
endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
@@ -1160,9 +1165,15 @@ endif
ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
+ ifeq "$(WHEEZY_BACKPORT)" "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
+ BUILD_DEPS += , libhsqldb1.8.0-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)
+ BASE_HSQLDB_DEPENDS = libhsqldb1.8.0-java $(HSQLDB_MINVER)
+ JAVA_GCJ_DEPENDS += , libhsqldb1.8.0-java-gcj [$(OOO_GCJ_ARCHS)]
+ endif
else
BUILD_DEPS += , libservlet2.5-java
ifneq "$(JDK)" "openjdk"
@@ -1570,8 +1581,10 @@ ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/GNOME GIO/GIO/' debian/control
endif
-ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
+ifeq "$(WHEEZY_BACKPORT)" "y"
+ ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
perl -pi -e "s/(Build-Conflicts: .*)/\1,libhsqldb-java (>= $(HSQLDB_TOONEWVER)~),/" debian/control
+ endif
endif
ifeq (4.4,$(SYSTEM_GCC_VERSION))
@@ -1923,7 +1936,7 @@ ifeq "$(ENABLE_JAVA)" "y"
$(PKGDIR)-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
# fix the classpath (file:// breaks javahelper)
- jh_classpath --classpath="/usr/share/java/hsqldb.jar .." \
+ jh_classpath --classpath="$(HSQLDB_JAR) .." \
$(PKGDIR)-base/$(shell echo /$(OODIR) | sed -e s/lib/share/)/program/classes/sdbc_hsqldb.jar
endif
ifeq (,$(filter hsqldb, $(SYSTEM_STUFF)))
@@ -2237,7 +2250,7 @@ ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
# link to system hsqldb
mkdir -p $(PKGDIR)-base/$(OODIR)/program/classes
- ln -sf /usr/share/java/hsqldb.jar \
+ ln -sf $(HSQLDB_JAR) \
$(PKGDIR)-base/$(OODIR)/program/classes/hsqldb.jar
endif
endif
@@ -2992,8 +3005,10 @@ ifeq "$(ENABLE_JAVA)" "y"
jh_depends -p$$p -Xlibreoffice-gcj -Xlibreoffice-dbg -Xure; \
done
ifeq "$(PACKAGE_BASE)" "y"
+ ifeq "$(WHEEZY_BACKPORT)" "y"
perl -pi -e "s/libhsqldb-java/$(BASE_HSQLDB_DEPENDS)/" \
debian/libreoffice-base.substvars
+ endif
perl -pi -e "s/base-files,//" \
debian/libreoffice-base.substvars
endif
--
LibreOffice packaging repository
Reply to: