[hamradio-commits] [dump1090-mutability] 80/172: Move to a simpler versioning scheme (the one derived from upstream is going to break the ordering that Debian expects very soon).

[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 730ad7c3083ed85e05e547d91f1978bbb0065b97
Author: Oliver Jowett <oliver at mutability.co.uk>
Date:   Thu Jan 22 13:19:15 2015 +0000

    Move to a simpler versioning scheme (the one derived from upstream
    is going to break the ordering that Debian expects very soon).
    
    When building from source not via debian/rules, derive a version from
    git describe.
---
 debian/changelog | 2 +-
 debian/rules     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3a9ea3..0c37883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dump1090-mutability (1.10.3010.14mu-13) UNRELEASED; urgency=medium
+dump1090-mutability (1.13) UNRELEASED; urgency=medium
 
   * Fix stable sort of rows with no sortable values (would cause "jumping"
     rows at the end of the table)
diff --git a/debian/rules b/debian/rules
index dc9e15b..46a3aec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,11 +14,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-VER=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+export DUMP1090_VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: /v/p')
 SRCNAME=$(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 
 override_dh_auto_build:
-	dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\" -DMODES_DUMP1090_VERSION=\"$(VER)\"'
+	dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\"'
 
 override_dh_install:
 	dh_install

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