------------------------------------------------------------
revno: 1566
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Fri 2009-05-22 19:55:02 +0200
message:
use /usr/lib/gcc/aotcompile.py; update ooo-build
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-05-22 11:19:20 +0000
+++ b/changelog 2009-05-22 17:55:02 +0000
@@ -1,11 +1,13 @@
openoffice.org (1:3.1.0-4) UNRELEASED; urgency=low
* ooo-build:
- - update (56dc753297fd22a51013ecc9d5ece4a74aea2c86 - 3.1.0.3)
+ - update (3f777bce5cbe0665fb840eee9cfe08fd9e1c710e)
* debian/rules:
- use gcj-jdk instead of java-gcj-compat-dev (closes: #526292)
- add | java5-runtime | jre to JAVA_RUNTIME_DEPENDS (closes: #509690)
+ - use /usr/lib/gcc/aotcompile.py instead of (gone)
+ /usr/share/pyshared/aotcompile.py
* debian/control.in:
- make -evolution depend on libebook-1.2-9 (which is dlopen()ed)
* debian/openoffice.org-common.preinst.in, debian/rules:
@@ -16,7 +18,7 @@
- adapt to rely on /usr/lib/openoffice/basis-link instead of
hardcoding the path
- -- Rene Engelhard <[email protected]> Fri, 22 May 2009 11:14:57 +0200
+ -- Rene Engelhard <[email protected]> Fri, 22 May 2009 18:55:05 +0200
openoffice.org (1:3.1.0-3) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-05-22 12:01:30 +0000
+++ b/rules 2009-05-22 17:55:02 +0000
@@ -1933,10 +1933,10 @@
# Also the native jar build is MUCH faster with this. But it
# won't be accepted into the official java-gcj-compat package so this
# hack here is needed.
- if [ -e /usr/share/pyshared/aotcompile.py ]; then \
+ if [ -e /usr/lib/gcc/aotcompile.py ]; then \
+ aotcompile_py=/usr/lib/gcc/aotcompile.py; \
+ elif [ -e /usr/share/pyshared/aotcompile.py ]; then \
aotcompile_py=/usr/share/pyshared/aotcompile.py; \
- else \
-
aotcompile_py=/usr/share/pycentral/java-gcj-compat-dev/site-packages/aotcompile.py;
\
fi && \
cp $$aotcompile_py debian/scripts
cd debian/scripts && \
