[libreoffice] 02/02: move DPKG_EXPORT_BUILDFLAGS and buildflags.mk include later to make it effective...

[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 c2149403bb6d7c1f173c3047a8c58eabc4439555
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon May 22 14:10:43 2017 +0200

    move DPKG_EXPORT_BUILDFLAGS and buildflags.mk include later to make it effective...
---
 changelog | 2 ++
 rules     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index d870b9e..be3cd5d 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:5.3.3-2) UNRELEASED; urgency=medium
   * debian/rules:
     - fix logic error; make -g1 etc work also with noddebs. Build with those
       flags also if building no -dbgsym
+    - move DPKG_EXPORT_BUILDFLAGS and buildflags.mk include later to make it
+      effective (worked before, but...)
   * debian/control.in:
     - remove obsolete Pre-Depends
   * debian/rules, debian/control.in: remove now unneeded dejavu-depends substvar,
diff --git a/rules b/rules
index 126962a..ec09449 100755
--- a/rules
+++ b/rules
@@ -875,8 +875,6 @@ ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 	PYTHON_SIX_RECOMMENDS = python3-six
 endif
 
-export DPKG_EXPORT_BUILDFLAGS=y 
-include /usr/share/dpkg/buildflags.mk
 ifeq "$(ENABLE_SYMBOLS)" "y"
   # Small symbols?
   ifeq "$(SMALL_SYMBOLS)" "y"
@@ -891,6 +889,8 @@ export DEB_CFLAGS_MAINT_PREPEND DEB_CXXFLAGS_MAINT_PREPEND
 	CONFIGURE_FLAGS += --enable-symbols
   endif
 endif
+export DPKG_EXPORT_BUILDFLAGS=y 
+include /usr/share/dpkg/buildflags.mk
 ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CONFIGURE_FLAGS += --enable-debug
 endif

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