~ubuntu-branches/ubuntu/lucid/openoffice.org-l10n/lucid

« back to all changes in this revision

Viewing changes to ooo-build/patches/dev300/buildfix-svx-uiconfig-layout.diff

  • Committer: Bazaar Package Importer
  • Author(s): Chris Cheney
  • Date: 2010-01-19 16:00:00 UTC
  • mfrom: (1.1.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100119160000-freeu943fe1z3o76
Tags: 1:3.2.0~rc2-1ubuntu1
* Resynchronise with Debian (r1764). Remaining changes:
  - Add Launchpad integration support.
  - Add Launchpad translations support.
  - Add package openoffice.org-style-human.
  - Add some Ubuntu-specific bitmaps. Adjust broffice diversions for these.
  - Add support for compressing debs with lzma.
  - Add support for shared /usr/share/doc directories.
  - Add support to build l10n as a separate source.
  - Add support to turn off building on sparc.
  - Add Xb-Npp-xxx tags according to "firefox distro add-on suport" spec.
  - Use imagemagick instead of graphicsmagick.
  - openoffice.org-help switch to internal copy of lucene.
  - Disable gnome-vfs support since it is buggy.
  - Switch desktop files from %U to %F for gvfs fuse.
* Resynchronise with ooo-build-3-2 (454ea0d62d4321b54cd5ef870ac99d8d7929c459).

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- svx/uiconfig/layout/layout.mk.old   2009-10-15 14:52:41.000000000 +0200
 
2
+++ svx/uiconfig/layout/layout.mk       2009-10-23 20:14:22.000000000 +0200
 
3
@@ -1,7 +1,7 @@
 
4
 # TODO: move to solenv/inc
 
5
 # copies: sw/uiconfig/layout svx/uiconfig/layout
 
6
 
 
7
-TRALAY=tralay
 
8
+TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay
 
9
 XML_DEST=$(DLLDEST)
 
10
 XML_LANGS=$(alllangiso)
 
11