[openarena] 01/11: Use DEB_VENDOR instead of lsb_release

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openarena.

commit a303bfafefcbb4216a6b29f7eb266d1cfdab65fd
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Aug 2 14:15:56 2015 +0100

    Use DEB_VENDOR instead of lsb_release
---
 debian/changelog | 6 ++++++
 debian/control   | 1 -
 debian/rules     | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a68c002..5ab2aed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openarena (0.8.8-15) UNRELEASED; urgency=medium
+
+  * Use DEB_VENDOR instead of lsb_release
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 02 Aug 2015 14:15:44 +0100
+
 openarena (0.8.8-14) unstable; urgency=medium
 
   * Add arm64 support by applying Martin Michlmayr's patch from ioquake3,
diff --git a/debian/control b/debian/control
index cae0496..d1354a9 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                imagemagick,
                ioquake3-server (>= 1.36+svn1802-1~),
-               lsb-release
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-games/openarena.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena.git/
diff --git a/debian/rules b/debian/rules
index 2006edd..8f2c11b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@ Q3ARCH             := $(shell /usr/share/ioquake3/q3arch arch     HOST)
 Q3PLATFORM         := $(shell /usr/share/ioquake3/q3arch platform HOST)
 Q3COMPILE_ARCH     := $(shell /usr/share/ioquake3/q3arch arch     BUILD)
 Q3COMPILE_PLATFORM := $(shell /usr/share/ioquake3/q3arch platform BUILD)
-distro             := $(shell lsb_release -is)
 PRODUCT_DATE := $(shell date --utc --date="`dpkg-parsechangelog -SDate`" "+%b %_d %Y")
 
 # the Q3 engine's build system doesn't respect CPPFLAGS, so put them in CFLAGS
@@ -37,7 +36,7 @@ GAME_OPTIONS = \
 	BUILD_SERVER=0 \
 	BUILD_GAME_SO=1 \
 	CROSS_COMPILING=1 \
-	VERSION=$(DEB_VERSION)/$(distro) \
+	VERSION=$(DEB_VERSION)/$(DEB_VENDOR) \
 	PRODUCT_DATE='$(PRODUCT_DATE)' \
 	$(NULL)
 

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