[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. 2ff12a2599fe72b2a859495ef7c8f65f81bbd7d0



The following commit has been merged in the master branch:
commit 2ff12a2599fe72b2a859495ef7c8f65f81bbd7d0
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jun 7 21:12:12 2011 +0200

    move jurt-soffice-location.diff in correct section to be always applied

diff --git a/patches/jurt-soffice-location.diff b/patches/jurt-soffice-location.diff
index 512cbf3..8a63030 100644
--- a/patches/jurt-soffice-location.diff
+++ b/patches/jurt-soffice-location.diff
@@ -27,13 +27,13 @@ Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/apply
 ===================================================================
 --- libreoffice-3.3.2.orig/libreoffice-build/patches/dev300/apply	2011-06-07 14:07:04.887334622 +0200
 +++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply	2011-06-07 14:08:18.797334602 +0200
-@@ -542,6 +542,9 @@
- # to download it from elsewhere
- reportdesign-mention-package-l10n.diff, rengelha
+@@ -531,6 +531,9 @@
+ # build using -O2 on x86 and sparc according to Debian policy.
+ debian-opt.diff
  
 +# on debian based systems, we know where our soffice is
 +jurt-soffice-location.diff
 +
- [ GoOoSplash ]
- # move progress bar for go-oo splash
- go-oo-splash.diff
+ [ LocalizeFixes and DebianBaseOnly ]
+ # mention openoffice.org-report-builder instead of getting people
+ # to download it from elsewhere

-- 
LibreOffice packaging repository


Reply to: