[libreoffice] 01/01: more optimization: don't use DEB_C(XX)FLAGS_MAINT_APPEND but _STRIP and _PREPEND

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 934855c985c3dbbbe25b654c67335692240d80b6
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jan 31 22:03:27 2017 +0100

    more optimization: don't use DEB_C(XX)FLAGS_MAINT_APPEND but _STRIP and _PREPEND
---
 changelog | 2 +-
 rules     | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 914d7f9..b0b82d6 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,7 @@ libreoffice (1:5.3.0-2) UNRELEASED; urgency=medium
 
   * debian/rules:
     - move from hardcoded C(XX)FLAGS for -g -> -g1 to recommended
-      DEB_C(XX)FLAGS_MAINT_APPEND
+      DEB_C(XX)FLAGS_MAINT_*
 
  -- Rene Engelhard <rene at debian.org>  Mon, 30 Jan 2017 15:12:29 +0100
 
diff --git a/rules b/rules
index 8d2518f..5ed2433 100755
--- a/rules
+++ b/rules
@@ -860,9 +860,12 @@ ifeq "$(ENABLE_SYMBOLS)" "y"
   # Small symbols?
   ifeq "$(SMALL_SYMBOLS)" "y"
 	CONFIGURE_FLAGS += --enable-symbols=SMALL
-	DEB_CFLAGS_MAINT_APPEND += $(shell echo $(CFLAGS) | sed -e "s/-g/-g1/")
-	DEB_CXXFLAGS_MAINT_APPEND += $(shell echo $(CXXFLAGS) | sed -e "s/-g/-g1/")
-export DEB_CFLAGS_MAINT_APPEND DEB_CXXFLAGS_MAINT_APPEND
+	DEB_CFLAGS_MAINT_STRIP := -g
+	DEB_CXXFLAGS_MAINT_STRIP := -g
+	DEB_CFLAGS_MAINT_PREPEND += -g1
+	DEB_CXXFLAGS_MAINT_PREPEND += -g1
+export DEB_CFLAGS_MAINT_STRIP DEB_CXXFLAGS_MAINT_STRIP
+export DEB_CFLAGS_MAINT_PREPEND DEB_CXXFLAGS_MAINT_PREPEND
   else
 	CONFIGURE_FLAGS += --enable-symbols
   endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git