[libreoffice] 01/02: fix logic error; make -g1 etc work also with noddebs

[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 7780b4ef60a43f1d4b3143518294c116066269cc
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat May 20 14:33:41 2017 +0200

    fix logic error; make -g1 etc work also with noddebs
---
 changelog | 8 ++++++++
 rules     | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index bbcf945..d28f79f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+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
+
+ -- Rene Engelhard <rene at debian.org>  Sat, 20 May 2017 14:32:02 +0200
+
 libreoffice (1:5.3.3-1) experimental; urgency=medium
 
   * New upstream release
diff --git a/rules b/rules
index 8d09743..5846326 100755
--- a/rules
+++ b/rules
@@ -203,10 +203,10 @@ endif
 ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
   BUILD_TEST_PACKAGE=y
 endif
-ifeq "$(shell echo $(BUILD_DBGSYM_PACKAGES) | grep -q y && echo true)" "true"
-  ENABLE_SYMBOLS=y
-  SMALL_SYMBOLS=y
-endif
+
+ENABLE_SYMBOLS=y
+SMALL_SYMBOLS=y
+
 ifeq "$(ENABLE_JAVA)" "y"
   SYSTEM_STUFF += beanshell
   SYSTEM_STUFF += hsqldb

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