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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-15-gb8609e7



The following commit has been merged in the debian-experimental-3.5 branch:
commit b8609e759ff12137a47406da48aa524ea18ffca1
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jan 4 16:59:48 2012 +0100

    fix fix-ARM-detection-in-set-soenv.diff for armhf

diff --git a/changelog b/changelog
index 1336dc2..b228cd3 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@ libreoffice (1:3.5.0~beta2-3) UNRELEASED; urgency=low
 
   * debian/patches/conditionalize-qadevOOo-build.diff: build qadevOOo only
     when OOO_JUNIT_JAR is not empty
+  * debian/patches/fix-ARM-detection-in-set-soenv.diff: fix for armhf...
 
   * debian/libreoffice-core.preinst.in:
     - rm -f /var/lib/libreoffice/basis3.4/program/services.rdb on upgrade
@@ -13,7 +14,7 @@ libreoffice (1:3.5.0~beta2-3) UNRELEASED; urgency=low
   * merge from ubuntu-precise-3.5:
     - add debian multiarch support for Qt4
 
- -- Rene Engelhard <rene@debian.org>  Mon, 02 Jan 2012 22:36:03 +0100
+ -- Rene Engelhard <rene@debian.org>  Wed, 04 Jan 2012 16:59:01 +0100
 
 libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
 
diff --git a/patches/fix-ARM-detection-in-set-soenv.diff b/patches/fix-ARM-detection-in-set-soenv.diff
index 1eb918a..fa2532e 100644
--- a/patches/fix-ARM-detection-in-set-soenv.diff
+++ b/patches/fix-ARM-detection-in-set-soenv.diff
@@ -7,7 +7,7 @@ index 5347a84..7afcabb 100755
        $JRETHREADDIR   = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
     }
 -   elsif ($platform =~ m/^arm.*?l-/)
-+   elsif ($platform =~ m/^arm.*-gnueabi/)
++   elsif ($platform =~ m/^arm.*-gnueabi.*/)
     {  print "Setting Linux ARM specific values... ";
        $oldoutfile     = "LinuxARMEnv.Set.sh";
        $CPU            = "R";

-- 
LibreOffice packaging repository


Reply to: