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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta1-2-11-gb52fe44



The following commit has been merged in the debian-experimental-4.1 branch:
commit b52fe44839bce34cf3c254349560d9871d5deed9
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jun 4 20:35:29 2013 +0200

    unfuzzy debian-opt.diff

diff --git a/changelog b/changelog
index 22c47a9..f17ac5a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~beta2~git20130602-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~beta2~git20130604-1) UNRELEASED; urgency=low
 
   * debian/patches/show-the-startcenter.diff: as name says, remove
     NoDisplay=true from startcenter.desktop
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index d347afa..d893e72 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -2,9 +2,9 @@ diff --git a/configure.ac b/configure.in
 index c0b76f8..d10222f 100644
 --- libreoffice-3.5.0/configure.ac
 +++ libreoffice-3.5.0/configure.ac
-@@ -11762,6 +11779,9 @@ else
- fi
- AC_SUBST(ICECREAM_RUN)
+@@ -11741,6 +11780,9 @@ fi
+ AC_SUBST(MPL_SUBSET)
+ 
  
 +CDEFAULTOPT=`echo $CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
 +AC_SUBST(CDEFAULTOPT)

-- 
LibreOffice packaging repository


Reply to: