r868 ./packages/openofficeorg/2.3/experimental: actually install the binfilters...; don't specify --with-java=gij anymore to use javac -> ecj from java-gcj-compat on sid
------------------------------------------------------------
revno: 868
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-08-28 20:33:47 +0200
message:
actually install the binfilters...; don't specify --with-java=gij anymore to use javac -> ecj from java-gcj-compat on sid
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-08-28 16:19:07 +0000
+++ b/changelog 2007-08-28 18:33:47 +0000
@@ -12,8 +12,11 @@
* debian/README.Debian: mention myspell-hy, myspell-fa, hunspell-ar
* debian/rules:
- BUILD_JARS_NATIVE=n until gcj-4.2 is unbroken
-
- -- Rene Engelhard <rene@debian.org> Mon, 27 Aug 2007 23:59:35 +0200
+ - actually install the binfilters...
+ - don't specify --with-java=gij anymore to use javac -> ecj from
+ java-gcj-compat on sid
+
+ -- Rene Engelhard <rene@debian.org> Tue, 28 Aug 2007 20:18:09 +0200
openoffice.org (1:2.3.0~oog680m2-1) experimental; urgency=medium
=== modified file 'rules'
--- a/rules 2007-08-28 16:19:07 +0000
+++ b/rules 2007-08-28 18:33:47 +0000
@@ -366,7 +366,7 @@
ifeq "$(ENABLE_JAVA)" "y"
JAVA_HOME=/usr/lib/jvm/java-gcj
- CONFIGURE_FLAGS += --with-java=gij --enable-gcjaot
+ CONFIGURE_FLAGS += --enable-gcjaot
ifeq "$(BUILD_JARS_NATIVE)" "y"
BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.65-4) [$(OOO_JAVA_ARCHS)]
else
@@ -1577,7 +1577,8 @@
umask 022
# Copy files placed by ooo-build/bin/package-ooo
- for i in base calc core draw impress math writer gnome dev headless; do \
+ for i in base calc core draw impress math writer gnome dev headless \
+ filter-binfilter; do \
rm -rf $(PKGDIR)-$$i $(PKGDIR)-$$i.*.debhelper ;\
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-$$i $(PKGDIR)-$$i || exit 1;\
done
Reply to: