The following commit has been merged in the master branch:
commit fc9c25dc1f2da6ac49161765378c80417dd1405f
Author: Rene Engelhard <[email protected]>
Date: Wed Jul 6 00:39:38 2011 +0200
debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
diff --git a/changelog b/changelog
index 9aa7b72..c299927 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,7 @@
libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
+ * debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
+
* debian/changelog: mention VU#953183 in 1:3.3.3-1
* debian/control.in:
- fix description: s/libreoffice-hyphenation/hyphen/,
diff --git a/patches/update-debian-opt.diff b/patches/update-debian-opt.diff
index 6c5ce2a..4a74914 100644
--- a/patches/update-debian-opt.diff
+++ b/patches/update-debian-opt.diff
@@ -29,7 +29,7 @@ index 4075123..7bc015b 100644
-+++ solenv/inc/unxlngi.mk (Arbeitskopie)
-@@ -30,7 +30,7 @@
++if [ -x /usr/bin/dpkg-buildflags ]; then
-++ CDEFAULTOPT=`dpkg-buildflags 2>/dev/null | grep -E -o "\-O[0-3]"`
+++ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o
"\-O[0-3]"`
++else
++ CDEFAULTOPT=-O2
++fi
@@ -59,7 +59,7 @@ index 4075123..7bc015b 100644
+ SOLAR_JAVA*=
+ # default optimization level for product code
+-CDEFAULTOPT*=-O2
-++CDEFAULTOPT*=$(shell dpkg-buildflags 2>/dev/null | $GREP -E -o "\-O[0-3]" ||
echo "-O2")
+++CDEFAULTOPT*=$(shell dpkg-buildflags --get CFLAGS 2>/dev/null | $(GREP) -E
-o "\-O[0-3]" || echo "-O2")
+ # architecture dependent flags for the C and C++ compiler that can be
changed by
+ # exporting the variable ARCH_FLAGS="..." in the shell, which is used to
start build
+ ARCH_FLAGS*=
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
