------------------------------------------------------------
revno: 1047
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-02 14:09:26 +0200
message:
- handle new aotcompile.py location to prevent FTBFS when
java-gcj-compat-dev gets rebuilt with a python-central >= 0.6.
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-02 11:39:36 +0000
+++ b/changelog 2008-04-02 12:09:26 +0000
@@ -1,5 +1,9 @@
openoffice.org (1:2.4.0-3.4pre) unstable; urgency=low
+ * debian/rules:
+ - handle new aotcompile.py location to prevent FTBFS when
+ java-gcj-compat-dev gets rebuilt with a python-central >= 0.6.
+ Thanks Chris Cheney for the warning.
* merge from Ubuntu:
- debian/*.mime:
+ Update and sort mime-types.
=== modified file 'rules'
--- a/rules 2008-03-28 12:43:00 +0000
+++ b/rules 2008-04-02 12:09:26 +0000
@@ -1802,8 +1802,12 @@
# 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.
- cp /usr/share/pycentral/java-gcj-compat-dev/site-packages/aotcompile.py
\
- debian/scripts
+ if [ -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 && \
patch -p0 < $(CURDIR)/debian/aotcompile-256M-default.diff
PYTHONPATH="debian/scripts:$(shell echo $(PYTHON_SITE) | sed -e
s,debian/python-uno,,)" \
