← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ooo-build/patches/src680/win32-use_relative_path_in_ddf_files.diff

  • Committer: Bazaar Package Importer
  • Author(s): Chris Cheney
  • Date: 2008-01-08 23:17:08 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20080108231708-7f5yc4h021ikwgyz
Tags: 1:2.3.1-3ubuntu1
* Copy of the openoffice.org source.
  - debian/changelog: Change source name.
  - debian/control.in: Change source name.
  - debian/control: Regenerate control file.

* Resynchronise with Debian (r989). Remaining changes:
  - debian/broffice.org.postrm.in:
    . Change diversions to ubuntu bitmap filenames.
  - debian/broffice.org.preinst.in:
    . Change diversions to ubuntu bitmap filenames.
  - debian/control.2.in:
    . Add file for Ubuntu.
  - debian/control.in:
    . Change maintainer line.
    . Use imagemagick instead of graphicsmagick.
    . Change bzr repo location.
    . Use java-runtime-depends variable for java dependencies.
    . Make openoffice.org-core Depends on openoffice.org-hyphenation.
    . Add package openoffice.org-style-human.
    . Various other minor Ubuntu changes.
  - debian/control.l10n.in:
    . Add file for Ubuntu.
  - debian/control.lang.in:
    . Add L10N_COMMON to Depends.
  - debian/control.mozilla.in:
    . Add Xb-Npp-xxx tags according to "firefox distro add-on suport" spec.
  - debian/control.ubuntu.in:
    . Add file for Ubuntu.
  - debian/deppackage.postinst.in:
    . Add file for Ubuntu.
  - debian/module-po.map:
    . Add file for Ubuntu.
  - debian/ooo-build-ubuntu.diff:
    . Various Ubuntu specific changes to ooo-build.
  - debian/rules:
    . Add USE_LZMA_COMPRESS option.
    . Add USE_COMMON_DOCDIR option.
    . Add support to build on lpia.
    . Add support to build l10n as a separate source.
    . Add java-runtime-depends variable for java dependencies.
    . Add support to chmod +x programs in debian dir.
    . Add support to uuencode binary files in ubuntu dir.
    . Add support to Ubuntu specific bitmaps.
    . Use imagemagick instead of graphicsmagick.
    . Add support for openoffice.org-style-human package.
    . Add support for launchpad translations.
    . Various Ubuntu specific changes.
  - debian/scripts/convert2po:
    . Add file for Ubuntu.
  - debian/scripts/fix_image_rgb:
    . Use imagemagick instead of graphicsmagick.
  - debian/scripts/gsifilter.py:
    . Add file for Ubuntu.
  - debian/scripts/splitgsi:
    . Add file for Ubuntu.
  - debian/template.desktop.in:
    . Add NoDisplay=true.
  - ooo-build/configure.in:
    . Added support for Hardy.
  - ooo-build/distro-configs/UbuntuHardy.conf.in:
    . Added support for Hardy.
  - ooo-build/distro-configs/UbuntuHardy64.conf.in:
    . Added support for Hardy.
  - ooo-build/patches/src680/apply:
    . Added support for Hardy.
  - ooo-build/patches/src680/ubuntu-lpi.diff:
    . Updated patch.
  - ubuntu/*
    . Various Ubuntu specific changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/src680/win32-use_relative_path_in_ddf_files.diff
 
1
--- instsetoo_native/util/openoffice.lst.orig   2007-08-10 19:12:13.000000000 +0200
 
2
+++ instsetoo_native/util/openoffice.lst        2007-11-07 20:04:59.955928500 +0100
 
3
@@ -47,6 +47,7 @@
 
4
                        DOWNLOADBANNER  ooobanner.bmp
 
5
                        DOWNLOADBITMAP  ooobitmap.bmp
 
6
                        DOWNLOADSETUPICO        ooosetup.ico
 
7
+                       RELATIVE_PATHES_IN_DDF 1
 
8
                }
 
9
                active                  1
 
10
                compression             5
 
11
@@ -98,6 +99,7 @@
 
12
                        DOWNLOADBANNER  ooobanner.bmp
 
13
                        DOWNLOADBITMAP  ooobitmap.bmp
 
14
                        DOWNLOADSETUPICO        ooosetup.ico
 
15
+                       RELATIVE_PATHES_IN_DDF 1
 
16
                }
 
17
                active                  1
 
18
                compression             5
 
19
@@ -149,6 +151,7 @@
 
20
                        DOWNLOADBITMAP  ooobitmap.bmp
 
21
                        DOWNLOADSETUPICO        ooosetup.ico
 
22
                        LOCALUSERDIR $ORIGIN/..
 
23
+                       RELATIVE_PATHES_IN_DDF 1
 
24
                }
 
25
                active                  1
 
26
                compression             5
 
27
@@ -178,6 +181,7 @@
 
28
             DOWNLOADBITMAP urebitmap.bmp
 
29
             DOWNLOADSETUPICO ooosetup.ico
 
30
             DONTUSESTARTMENUFOLDER 1
 
31
+            RELATIVE_PATHES_IN_DDF 1
 
32
         }
 
33
         active 1
 
34
         compression 5
 
35
@@ -257,6 +261,7 @@
 
36
                        DOWNLOADBANNER  brobanner.bmp
 
37
                        DOWNLOADBITMAP  brobitmap.bmp
 
38
                        DOWNLOADSETUPICO        ooosetup.ico
 
39
+                       RELATIVE_PATHES_IN_DDF 1
 
40
                }
 
41
                active                  1
 
42
                compression             5
 
43
@@ -308,6 +313,7 @@
 
44
                        DOWNLOADBANNER  brobanner.bmp
 
45
                        DOWNLOADBITMAP  brobitmap.bmp
 
46
                        DOWNLOADSETUPICO        ooosetup.ico
 
47
+                       RELATIVE_PATHES_IN_DDF 1
 
48
                }
 
49
                active                  1
 
50
                compression             5
 
51
@@ -358,6 +364,7 @@
 
52
                        DOWNLOADBITMAP  brobitmap.bmp
 
53
                        DOWNLOADSETUPICO        ooosetup.ico
 
54
                        LOCALUSERDIR $ORIGIN/..
 
55
+                       RELATIVE_PATHES_IN_DDF 1                        
 
56
                }
 
57
                active                  1
 
58
                compression             5