← Back to branch summary

~ubuntu-branches/ubuntu/natty/libreoffice-l10n/natty-updates

« back to all changes in this revision

Viewing changes to debian/patches/alpha-no-relax.diff

  • Committer: Package Import Robot
  • Author(s): Bjoern Michaelsen
  • Date: 2011-03-24 14:22:36 UTC
  • mfrom: (0.14.1) (0.13.1) (0.12.1) (0.11.1) (0.8.2)
  • Revision ID: package-import@ubuntu.com-20110324142236-zr2t1cz8xgxl67b5
Tags: 1:3.3.2-1ubuntu1
* merged all changes from ubuntu-natty-3.3.1 up to 3.3.2-1ubuntu1
* regenerated control file

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/alpha-no-relax.diff
1
 
Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/alpha-no-relax.diff
 
1
Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/alpha-no-relax.diff
2
2
===================================================================
3
3
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4
 
+++ libreoffice-3.3.1/libreoffice-build/patches/dev300/alpha-no-relax.diff      2011-02-28 21:07:28.649837859 +0100
 
4
+++ libreoffice-3.3.2/libreoffice-build/patches/dev300/alpha-no-relax.diff      2011-03-22 14:17:57.621328824 +0100
5
5
@@ -0,0 +1,12 @@
6
6
+diff --git a/solenv/inc/unxlngaxp.mk b/solenv/inc/unxlngaxp.mk
7
7
+index bf7711a..ca20fb3 100644
15
15
++LINKFLAGS+=-Wl,--no-relax
16
16
+ DLLPOSTFIX=ll
17
17
+ BUILD64=1
18
 
Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
 
18
Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/apply
19
19
===================================================================
20
 
--- libreoffice-3.3.1.orig/libreoffice-build/patches/dev300/apply       2011-02-28 21:06:03.000000000 +0100
21
 
+++ libreoffice-3.3.1/libreoffice-build/patches/dev300/apply    2011-02-28 21:08:44.069837863 +0100
22
 
@@ -2386,3 +2386,6 @@
 
20
--- libreoffice-3.3.2.orig/libreoffice-build/patches/dev300/apply       2011-03-22 14:17:51.671328826 +0100
 
21
+++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply    2011-03-22 14:17:57.621328824 +0100
 
22
@@ -2372,3 +2372,6 @@
23
23
 
24
24
 [ TemporaryHacks ]
25
25
 hack-no-rm-fr-of-smoketest-userconfig.diff