[ooo-build-commit] patches/dev300

René Engelhard rene at kemper.freedesktop.org
Fri Oct 23 11:19:58 PDT 2009


 patches/dev300/apply |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 834cd8beba1af592ce32b7ce98c728ce22b4cd6a
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Oct 23 20:18:56 2009 +0200

    fix patch applying for Debian
    
    * patches/dev300/apply: move system-lpsolve-link-with-colamd.diff to the end

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d12e1a0..dbe4a24 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2168,10 +2168,6 @@ ark-experimental-gcj-use-ecj.diff, i#64917
 # FIXME this needs reimplementation with the current build system
 ark-system-precompiled-java.diff
 
-[ DebianBaseOnly ]
-# link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
-system-lpsolve-link-with-colamd.diff, rengelha
-
 [ DebianOnly ]
 debian-dictionary.diff, rengelha
 #debian-gccXXXXX.solenv.javaregistration.diff
@@ -3332,6 +3328,10 @@ configure-fix-lpsolve-depends.diff, janneke
 configure-fix-use-c++-for-mythes.diff, janneke
 build-fix-xulrunner-npapi-inc.diff, janneke
 
+[ DebianBaseOnly ]
+# link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
+system-lpsolve-link-with-colamd.diff, rengelha
+
 [ NovellOnlyWin32 ]
 # Don't attempt to restart soffice.bin immediately if it crashes.  At
 # such a restart, if the document recovery dialog is cancelled, an


More information about the ooo-build-commit mailing list