------------------------------------------------------------
revno: 1005
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-02-19 11:40:21 +0100
message:
add $(GCJ_JAWT_DIR) to BUILD_LD_LIBRARY_PATH; install pythonloader.py to
$(PYTHON_SITE)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-02-17 08:55:15 +0000
+++ b/changelog 2008-02-19 10:40:21 +0000
@@ -1,18 +1,20 @@
openoffice.org (1:2.4.0~rc1-2.3pre) unstable; urgency=low
* ooo-build:
- - update (r11600)
+ - update (r11619)
+ cws-ia64port01.diff: backport ia64 port
* debian/rules:
- use readlink -f for determining libstlport_gcc.so.4.6s location
(closes: #466040)
- BUILD_IA64=y
- --disable-mono for arm(el)
+ - add GCJ_JAWT_DIR to LD_LIBRARY_PATH for a try to fix FTBFS on mips
+ - install pythonloader.py into $(PYTHON_SITE) (closes: #466412)
* debian/control.in:
- only recommend openoffice.org-writer2latex at -writer. Add it
to the "openoffice.org" metapackage as Depends (closes: #466170)
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 17 Feb 2008 09:44:33 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 19 Feb 2008 11:30:14 +0100
openoffice.org (1:2.4.0~rc1-2) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-02-16 21:18:23 +0000
+++ b/rules 2008-02-19 10:40:21 +0000
@@ -852,6 +852,7 @@
endif
endif
BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
+BUILD_LD_LIBRARY_PATH := $(BUILD_LD_LIBRARY_PATH):$(GCJ_JAWT_DIR)
ifeq "$(BUILD_ONLY_LIBMYTHES)" "y"
clean:
@@ -2059,6 +2060,7 @@
install -d $(PYTHON_SITE)
mv debian/python-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
mv debian/python-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
+ mv debian/python-uno/$(OODIR)/program/pythonloader.py $(PYTHON_SITE)
mv debian/python-uno/$(OODIR)/program/pyuno.so $(PYTHON_SITE)
touch debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u+w debian/python-uno/$(OODIR)/program/pythonloader.unorc
