------------------------------------------------------------
revno: 1290
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-10-16 21:52:56 +0200
message:
  update ooo-build; fix SDK wrapper scripts' LD_LIBRARY_PATH
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog 2008-10-15 21:08:48 +0000
+++ b/changelog 2008-10-16 19:52:56 +0000
@@ -1,15 +1,17 @@
 openoffice.org (1:3.0.0-2.3pre) experimental; urgency=low
 
   * ooo-build:
-    - update (r14318)
+    - update (r14320)
   * debian/copyright, debian/README.Debian-source: fix 
   * debian/rules:
     - don't run the smoketest again as it still causes weird build/install
       failures on the buildds
     - remove etch-backport conditionals, add lenny-backport conditionla -
       use internal lucene there.
+    - update LD_LIBRARY_PATH setting in the SDK wrapper scripts for the
+      URE
 
- -- Rene Engelhard <[EMAIL PROTECTED]>  Wed, 15 Oct 2008 23:04:58 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]>  Thu, 16 Oct 2008 21:25:56 +0200
 
 openoffice.org (1:3.0.0-2) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules     2008-10-15 21:08:48 +0000
+++ b/rules     2008-10-16 19:52:56 +0000
@@ -2276,7 +2276,7 @@
                  echo "#!/bin/sh"; \
                  echo "# wrapper script for OOos SDK programs"; \
                  echo ""; \
-                 echo 'LD_LIBRARY_PATH=/$(OODIR)/program 
/$(OODIR)/sdk/bin/`basename $$0`.bin "$$@"'; \
+                 echo 'LD_LIBRARY_PATH=/$(OOUREDIR)/lib 
/$(OODIR)/sdk/bin/`basename $$0`.bin "$$@"'; \
                ) > $$i; \
                chmod 755 $$i; \
        done && \
@@ -2284,7 +2284,7 @@
          echo "#!/bin/sh"; \
          echo "# wrapper script for OOos SDK programs"; \
          echo ""; \
-         echo 'LD_LIBRARY_PATH=/$(OODIR)/program /$(OODIR)/sdk/bin/`basename 
$$0`.bin "$$@"'; \
+         echo 'LD_LIBRARY_PATH=/$(OOUREDIR) /$(OODIR)/sdk/bin/`basename 
$$0`.bin "$$@"'; \
        ) > regcomp; \
        chmod 755 regcomp
         # remove symlink, it should be in -dev-doc

Reply via email to