[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc2-1-15-gd6bb384
The following commit has been merged in the debian-experimental-4.0 branch:
commit bf27df32a74473a045605a8e7b02b5586a6ebcd8
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 1 14:06:35 2013 +0200
build against "new" libhsqldb1.8.0-java
diff --git a/changelog b/changelog
index 7381711..b55115a 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,7 @@ libreoffice (1:4.0.2~rc2-2) UNRELEASED; urgency=low
see 701310/695826 (closes: #701310)
- always build -dbg package if we build -subsequentcheckbase, as the
test depends on -dbg
+ - build against "new" libhsqldb1.8.0-java
-- Rene Engelhard <rene@debian.org> Fri, 29 Mar 2013 15:45:09 +0100
diff --git a/control b/control
index fe769e4..bdde064 100644
--- a/control
+++ b/control
@@ -54,7 +54,7 @@ Build-Depends: ant (>= 1.7.0),
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
libgtk2.0-dev (>= 2.10),
- libhsqldb-java (>> 1.8.0.10),
+ libhsqldb1.8.0-java (>> 1.8.0.10),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
libice-dev,
@@ -154,7 +154,6 @@ Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
libc6-dev (= 2.6.1-3) [i386 amd64],
libc6-dev (= 2.6.1-4) [i386 amd64],
libcairo2 (= 1.4.8-1),
- libhsqldb-java (>= 1.8.1~),
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
@@ -4464,7 +4463,7 @@ Depends: ant (>= 1.7.0),
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
libgtk2.0-dev (>= 2.10),
- libhsqldb-java (>> 1.8.0.10),
+ libhsqldb1.8.0-java (>> 1.8.0.10),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
libice-dev,
diff --git a/rules b/rules
index d5311eb..2569f37 100755
--- a/rules
+++ b/rules
@@ -222,6 +222,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
@@ -1144,9 +1149,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"
@@ -1557,8 +1568,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))
@@ -1910,7 +1923,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)))
@@ -2222,7 +2235,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
@@ -2977,8 +2990,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: