ooo-build r14285 - in branches/ooo-build-3-0: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Sat Oct 11 11:56:04 2008
New Revision: 14285
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14285&view=rev

Log:
2008-10-11  Rene Engelhard  <rene debian org>

        * patches/dev300/system-python-ure-bootstrap.diff,
          patches/dev300/pyuno-rpath-ooodir.diff: move ...
        * patches/dev300/system-python-ure-bootstrap.diff.in,
          patches/dev300/pyuno-rpath-ooodir.diff.in: .. here and exchange path
          with @OOINSTALLDIR@
        * configure.in: add patches/dev300/system-python-ure-bootstrap.diff and
          patches/dev300/pyuno-rpath-ooodir.diff to AC_OUTPUT
        * patches/dev300/apply: move pyuno-rpath-ooodir.diff and
          system-python-ure-bootstrap.diff to the common set (SystemBits)
        * patches/dev300/Makefile.am: also pack *.diff.in


Added:
   branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff.in
      - copied, changed from r14284, /branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff
   branches/ooo-build-3-0/patches/dev300/system-python-ure-bootstrap.diff.in   (contents, props changed)
      - copied, changed from r14284, /branches/ooo-build-3-0/patches/dev300/system-python-ure-bootstrap.diff
Removed:
   branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff
   branches/ooo-build-3-0/patches/dev300/system-python-ure-bootstrap.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/configure.in
   branches/ooo-build-3-0/patches/dev300/Makefile.am
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Sat Oct 11 11:56:04 2008
@@ -1321,6 +1321,8 @@
 Makefile
 bin/setup
 bin/Makefile
+patches/dev300/pyuno-rpath-ooodir.diff
+patches/dev300/system-python-ure-bootstrap.diff
 bin/piece/sys-setup
 bin/piece/Makefile
 desktop/Makefile

Modified: branches/ooo-build-3-0/patches/dev300/Makefile.am
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/Makefile.am	(original)
+++ branches/ooo-build-3-0/patches/dev300/Makefile.am	Sat Oct 11 11:56:04 2008
@@ -1,4 +1,4 @@
-EXTRA_DIST = apply ${wildcard *.diff}
+EXTRA_DIST = apply ${wildcard *.diff*}
 
 patch.apply:
 	cd ../.. ; make patch.apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Sat Oct 11 11:56:04 2008
@@ -910,7 +910,6 @@
 
 sensible-ooomua.diff
 sensible-browser.diff
-pyuno-rpath-ooodir.diff
 default-cairo-disable.diff
 gcj-32bit-runtime-path.diff, i#64888, mklose
 # remove mozilla plug-in option completely since we enable it per default
@@ -928,8 +927,6 @@
 # to download it from elsewhere
 reportdesign-mention-package.diff, rengelha
 
-system-python-ure-bootstrap.diff, deb#501028, i#90701
-
 [ DebianOnly >= dev300-m20 >= ooo300-m1]
 SectionOwner => rengelha
 # fix the splash progressbar colors
@@ -1266,6 +1263,9 @@
 # Mozilla build-bits to not break on Solaris 11
 moz-solaris11-makefiles.diff, fridrich
 
+pyuno-rpath-ooodir.diff
+system-python-ure-bootstrap.diff, deb#501028, i#90701
+
 [ DejaVuFonts ]
 
 # Following the changed names of DejaVu fonts

Copied: branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff.in (from r14284, /branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff)
==============================================================================
--- /branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff.in	Sat Oct 11 11:56:04 2008
@@ -10,7 +10,7 @@
  $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
  .IF "$(OS)" == "LINUX"
 -	@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-+	@echo $(LINK) -Wl,-z,combreloc $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) -Wl,-rpath,/usr/lib/openoffice/basis-link/program $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
++	@echo $(LINK) -Wl,-z,combreloc $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) -Wl,-rpath,@libdir@/@OOOINSTALLDIRNAME@/basis-link/program $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
  .ELIF "$(OS)" == "SOLARIS"
  	@echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
  .ELIF "$(OS)" == "FREEBSD"

Copied: branches/ooo-build-3-0/patches/dev300/system-python-ure-bootstrap.diff.in (from r14284, /branches/ooo-build-3-0/patches/dev300/system-python-ure-bootstrap.diff)
==============================================================================
--- /branches/ooo-build-3-0/patches/dev300/system-python-ure-bootstrap.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/system-python-ure-bootstrap.diff.in	Sat Oct 11 11:56:04 2008
@@ -13,7 +13,7 @@
  _g_delegatee = __builtin__.__dict__["__import__"]
  
 +if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/openoffice/program/fundamentalrc"
++    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@libdir@/@OOOINSTALLDIRNAME@/program/fundamentalrc"
 +
  def getComponentContext():
      """ returns the UNO component context, that was used to initialize the python runtime.