[hamradio-commits] [dump1090-mutability] 171/172: debian/rules: new environments used and cosmetic rework

[Matteo F. Vescovi]

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

mfv pushed a commit to branch master
in repository dump1090-mutability.

commit 30bf2b595659cb5466b1f434d978f5d74a887a1e
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Sat Jan 27 23:26:50 2018 +0100

    debian/rules: new environments used and cosmetic rework
    
    Gbp-Dch: Ignore
---
 debian/rules | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index 37724d0..67b834b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,18 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/pkg-info.mk
 
-export DUMP1090_VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: /v/p')
-SRCNAME=$(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+export DUMP1090_VERSION=$DEB_VERSION
+SRCNAME=$DEB_SOURCE
+
+%:
+	dh $@ --with apache2
 
 override_dh_auto_build:
 	dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\"'
@@ -27,6 +24,3 @@ override_dh_install:
 	cp -a view1090 debian/dump1090-mutability/usr/bin/view1090-mutability
 	$(RM) debian/dump1090-mutability/usr/share/dump1090-mutability/html/coolclock/excanvas.js
 	mv debian/dump1090-mutability/usr/share/dump1090-mutability/html/config.js debian/dump1090-mutability/etc/dump1090-mutability/
-
-%:
-	dh $@ --with apache2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090-mutability.git