[ioquake3] 06/10: Stop using lsb_release for version info, use DEB_VENDOR instead

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository ioquake3.

commit 4937226b87b14697112767a5ceba7df0ade78e9e
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Aug 2 13:37:20 2015 +0100

    Stop using lsb_release for version info, use DEB_VENDOR instead
---
 debian/changelog | 1 +
 debian/control   | 1 -
 debian/rules     | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8bf307..4697789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ioquake3 (1.36+u20150730+dfsg1-1) UNRELEASED; urgency=medium
     - arm* CPU maps to ARCH=arm
     - remove compat_arch: unused and never actually worked
     - remove rtcw_file_arch: unused
+  * Stop using lsb_release for version info, use DEB_VENDOR instead
 
  -- Simon McVittie <smcv at debian.org>  Tue, 14 Jul 2015 10:08:13 +0100
 
diff --git a/debian/control b/debian/control
index 0ec04de..72ad097 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 9),
                libsdl2-dev (>= 2.0.0),
                libspeexdsp-dev,
                libvorbis-dev,
-               lsb-release
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-games/ioquake3.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/ioquake3.git
diff --git a/debian/rules b/debian/rules
index e285da1..63ad192 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,6 @@ DEB_CFLAGS_MAINT_APPEND := \
 
 include /usr/share/dpkg/default.mk
 
-distro             := $(shell lsb_release -is)
 PRODUCT_DATE := $(shell date --utc --date="`dpkg-parsechangelog -SDate`" "+%b %_d %Y")
 
 %:
@@ -44,7 +43,7 @@ OPTIONS := \
 		DEFAULT_BASEDIR=/usr/lib/ioquake3 \
 		BUILD_GAME_SO=1 \
 		BUILD_GAME_QVM=0 \
-		VERSION=$(DEB_VERSION)/$(distro) \
+		VERSION=$(DEB_VERSION)/$(DEB_VENDOR) \
 		PRODUCT_DATE='$(PRODUCT_DATE)' \
 		CFLAGS='$(CFLAGS) $(CPPFLAGS)' \
 		FULLBINEXT="" \

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