[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.1/unstable r1666: add export PYTHONPATH into /usr/lib/openoffice/program/unopkg, too.



------------------------------------------------------------
revno: 1666
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2009-09-08 11:16:04 +0200
message:
  add export PYTHONPATH into /usr/lib/openoffice/program/unopkg, too.
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2009-09-07 13:31:19 +0000
+++ b/changelog	2009-09-08 09:16:04 +0000
@@ -8,6 +8,8 @@
       for STLport flavour
     - fix parallel=X handling to actually works, thanks to Wouter Verhelst for
       pointing it out
+    - add export PYTHONPATH into /usr/lib/openoffice/program/unopkg, too.
+      Thanks Frederic Peters (closes: #545482)
   * debian/control.in:
     - s/msttcorefonts/ttf-mscorefonts-installer/. Former is a transitional
       package even in lenny

=== modified file 'rules'
--- a/rules	2009-09-04 13:19:03 +0000
+++ b/rules	2009-09-08 09:16:04 +0000
@@ -2846,7 +2846,11 @@
 		$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml
 	ln -s /$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml \
 		$(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
+	# set PYTHONPATH in unopkg
+	perl -pi -e 's,export PATH,export PATH\n\nexport PYTHONPATH=\"/$(OOBASISDIR)/program\"\n\n," \
+		$(PKGDIR)-common/$(OOBRANDDIR)/program/unopkg
 
+#!/bin/sh,#!/bin/sh\nexport PYTHONPATH=\"\$P\",' unopkg
 	# install DicOOo; we need to do this manually; the
 	# dictionaries/ module isn't built with --without-myspell-dicts
 	# and those two somehow (why?) are in there...


Reply to: