------------------------------------------------------------
revno: 1152
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-07-07 12:46:06 +0200
message:
fix installation
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-07-07 01:09:12 +0000
+++ b/changelog 2008-07-07 10:46:06 +0000
@@ -1,5 +1,7 @@
openoffice.org (1:2.4.1-4.5pre) unstable; urgency=medium
+ * ooo-build:
+ - update (13085)
* debian/rules:
- reenable Java for armel, gcj-4.3 OOM reportedly fixed. Add build-dep
on gcj-4,3 (>= 4.3.1-2) for armel
@@ -16,7 +18,7 @@
to register mailmerge.py as it otherwise doesn't seem to work
(closes: #488875)
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 06 Jul 2008 23:28:58 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 07 Jul 2008 12:45:09 +0200
openoffice.org (1:2.4.1-4) unstable; urgency=medium
=== modified file 'rules'
--- a/rules 2008-07-07 00:45:05 +0000
+++ b/rules 2008-07-07 10:46:06 +0000
@@ -2045,9 +2045,6 @@
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages
$$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
) > debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u-w debian/python-uno/$(OODIR)/program/pythonloader.unorc
- chmod 755 debian/python-uno/$(OODIR)/program/mailmerge.py
- perl -pi -e 's,/bin,/usr/bin,' \
- debian/python-uno/$(OODIR)/program/mailmerge.py
mkdir -p debian/python-uno/usr/share/doc/python-uno
for i in doc demo; do \
@@ -2370,6 +2367,9 @@
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-dev-doc
$(PKGDIR)-dev-doc || exit 1
endif
+ perl -pi -e 's,/bin,/usr/bin,' \
+ debian/openoffice.org-emailmerge/$(OODIR)/program/mailmerge.py
+
dh_installdirs -i
ifneq "$(USE_GSTREAMER)" "y"
@@ -2747,7 +2747,7 @@
ifeq "$(ENABLE_MONO)" "y"
for i in libuno-cli-basetypes1.0-cil libuno-cli-types1.1-cil \
libuno-cli-cppuhelper1.0-cil libuno-cli-ure1.0-cil; do \
- rm -rf debian/$$i && mkdir -p -m755 debian/$$i/usr/lib/cli/uno;
\
+ rm -rf debian/$$i && mkdir -p -m755
debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
mv $(PKGDIR)-common/$(OODIR)/program/`echo $$i | sed -e
"s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e
's/\d.\d//'`.dll* \
debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e
's/.*(\d.\d).*/$$1/'`; \
done
