[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-4-5-gf406004
The following commit has been merged in the master branch:
commit f406004450c907a8af2d396196d699e4ae4fe764
Author: Rene Engelhard <rene@debian.org>
Date: Fri Mar 2 23:17:07 2012 +0100
fix debian-opt.diff test/grep
diff --git a/changelog b/changelog
index a65ccd2..ddaa7e1 100644
--- a/changelog
+++ b/changelog
@@ -3,11 +3,15 @@ libreoffice (1:3.4.5-5) UNRELEASED; urgency=low
* debian/patches/nsplugin-fix-SimpleFileAccess-instance.diff:
fix nsplugin to create a correct com.sun.star.ucb.SimpleFileAccess
instance (closes: #661747)
+ * debian/patches/fix-debian-opt.diff: fix to actually make test and grep
+ work
* debian/control.in: build-conflict against
libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64]
+ * debian/rules:
+ - remove -O0 setting via ARCH_FLAGS, already handled by debian-opt.diff
- -- Rene Engelhard <rene@debian.org> Thu, 01 Mar 2012 00:09:11 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 02 Mar 2012 23:15:39 +0100
libreoffice (1:3.4.5-4) unstable; urgency=low
diff --git a/patches/update-debian-opt.diff b/patches/update-debian-opt.diff
index f1b1bd5..c9d5e95 100644
--- a/patches/update-debian-opt.diff
+++ b/patches/update-debian-opt.diff
@@ -28,8 +28,8 @@ index 4075123..7bc015b 100644
---- solenv/inc/unxlngi.mk (Revision 276754)
-+++ solenv/inc/unxlngi.mk (Arbeitskopie)
-@@ -30,7 +30,7 @@
-++if [ -x /usr/bin/dpkg-buildflags ]; then
-++ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[0-3]"`
+++if test -x /usr/bin/dpkg-buildflags; then
+++ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
++else
++ CDEFAULTOPT=-O2
++fi
diff --git a/rules b/rules
index add2ca9..4347dc5 100755
--- a/rules
+++ b/rules
@@ -623,10 +623,6 @@ ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
endif
-ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- ARCH_FLAGS += -O0
-endif
-
ifeq "$(USE_XZ_COMPRESS)" "y"
# used only for -dbg yet, so disabled and done manually
# in binary-arch
--
LibreOffice packaging repository
Reply to: