[libreoffice] 02/02: replace some manual dpkg-parsechangelog calls with $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for --disable-dependency-tracking

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit b6a4d06319fcc4fa4e22c5b744518000cca2c7f6
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 21 19:07:42 2017 +0100

    replace some manual dpkg-parsechangelog calls with $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for --disable-dependency-tracking
---
 changelog |  4 ++++
 rules     | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index 90b7848..61bc39b 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,10 @@ libreoffice (1:5.4.3-3) UNRELEASED; urgency=medium
 
   * debian/patches/icu-60.diff: backport icu 60 support patch from master
 
+  * debian/rules: replace some manual dpkg-parsechangelog calls with
+    $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
+    --disable-dependency-tracking
+
  -- Rene Engelhard <rene at debian.org>  Mon, 20 Nov 2017 19:50:09 +0100
 
 libreoffice (1:5.4.3-2) unstable; urgency=medium
diff --git a/rules b/rules
index b280962..ffdf806 100755
--- a/rules
+++ b/rules
@@ -536,7 +536,7 @@ INSTALL_APPARMOR_PROFILES=y
 # Default flags to pass to configure
 CONFIGURE_FLAGS= \
 		--with-vendor='$(OOO_VENDOR)' \
-		--with-build-version='$(shell dpkg-parsechangelog |grep "^Version:" |cut -f2 -d\ )' \
+		--with-build-version='$(DEB_VERSION)' \
                 --prefix=/usr --mandir=/usr/share/man \
                 --docdir=/usr/share/doc/libreoffice \
 		--libdir=/usr/lib \
@@ -556,9 +556,12 @@ CONFIGURE_FLAGS += --enable-release-build
 RELEASE_BUILD := y
 endif
 
-ifeq "$(shell dpkg-parsechangelog | grep urgency | grep -q UNRELEASED && echo true)" "true"
+ifneq "$(DEB_DISTRIBUTION)" "UNRELEASED"
 CONFIGURE_FLAGS += --disable-dependency-tracking
 endif
+ifeq "$(DEB_DISTRIBUTION)" "UNRELEASED"
+BUGS=mailto:debian-openoffice at lists.debian.org
+endif
 
 export verbose=t
 
@@ -701,7 +704,7 @@ endif
 # Distro-specific overrides
 
 # Debian Stretch
-ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "stretch-backports"
+ifeq "$(DEB_DISTRIBUTION)" "stretch-backports"
   BUGS=mailto:debian-backports at lists.debian.org
   SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit xmlsec,$(SYSTEM_STUFF))
   # needs newer stuff for tests, we can't make it conditional on RUN_MAKE_CHECK since
@@ -709,9 +712,6 @@ ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "s
   SYSTEM_STUFF := $(filter-out libwps libmwaw,$(SYSTEM_STUFF))
   STRETCH_BACKPORT=y
 endif
-ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
-  BUGS=mailto:debian-openoffice at lists.debian.org
-endif
 
 ifeq "$(DEB_VENDOR)" "Debian"
   ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_GDRIVE_ARCHS)))

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