The following commit has been merged in the debian-experimental-4.0 branch:
commit e3b4171afe4d7400aecb3f045a283a4570232490
Author: Rene Engelhard <[email protected]>
Date: Mon Mar 25 17:24:40 2013 +0100
make fix-internal-hsqldb-build.diff apply again
diff --git a/patches/fix-internal-hsqldb-build.diff
b/patches/fix-internal-hsqldb-build.diff
index 4f7be6e..ed03511 100644
--- a/patches/fix-internal-hsqldb-build.diff
+++ b/patches/fix-internal-hsqldb-build.diff
@@ -1,16 +1,3 @@
-diff -urN hsqldb.old/makefile.mk hsqldb/makefile.mk
---- a/hsqldb/makefile.mk 2012-10-03 14:05:01.000000000 +0200
-+++ b/hsqldb/makefile.mk 2013-03-19 15:10:12.857800613 +0100
-@@ -59,7 +59,8 @@
- patches$/i97032.patch \
- patches$/i103528.patch \
- patches$/i104901.patch \
-- patches$/fdo36824.patch
-+ patches$/fdo36824.patch \
-+ patches$/use-system-servlet-api.jar.diff
-
- .IF "$(JAVANUMVER:s/.//)" >= "000100060000"
- PATCH_FILES+= \
diff -urN hsqldb.old/patches/use-system-servlet-api.jar.diff
hsqldb/patches/use-system-servlet-api.jar.diff
--- a/hsqldb/patches/use-system-servlet-api.jar.diff 1970-01-01
01:00:00.000000000 +0100
+++ b/hsqldb/patches/use-system-servlet-api.jar.diff 2013-03-19
15:09:42.137801521 +0100
@@ -44,3 +31,13 @@ diff -urN hsqldb.old/patches/use-system-servlet-api.jar.diff
hsqldb/patches/use-
+ author="true"
+ version="false"
+ use="true"
+--- a/hsqldb/UnpackedTarball_hsqldb.mk-old 2013-03-25 17:22:35.830348665
+0100
++++ b/hsqldb/UnpackedTarball_hsqldb.mk 2013-03-25 17:23:12.354347585 +0100
+@@ -26,6 +26,7 @@
+ $(if $(filter YES,$(HSQLDB_USE_JDBC_4_1)),\
+ hsqldb/patches/jdbc-4.1.patch \
+ ) \
++ hsqldb/patches/use-system-servlet-api.jar.diff \
+ ))
+
+ # vim: set noet sw=4 ts=4:
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
