[SCM] Quake 3 engine branch, master, updated. f9474eeba468251086e341ca4362614664280427

[Simon McVittie]

The following commit has been merged in the master branch:
commit abea7ff62c054662cd9569a0203c759d1df6f6e1
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Aug 13 19:47:57 2010 +0100

    Simplify regex for debian_version, and include distro name in VERSION
    
    This should result in something like:
        ioq3 1.36+svn1788-1/Debian
        ioq3 1.36+svn1788-1/Ubuntu
        ioq3 1.36+svn1788-1ubuntu1/Ubuntu

diff --git a/debian/control b/debian/control
index 15020c2..3044d3d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 7.0.50~),
                libcurl4-gnutls-dev,
                libvorbis-dev,
                libjpeg62-dev,
-               libspeexdsp-dev
+               libspeexdsp-dev,
+               lsb-release
 Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/pkg-games/ioquake3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/ioquake3.git;a=summary
diff --git a/debian/rules b/debian/rules
index 1de8c4c..a45e836 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,8 @@ Q3ARCH             := $(shell sh $(CURDIR)/debian/q3arch.sh arch     HOST)
 Q3PLATFORM         := $(shell sh $(CURDIR)/debian/q3arch.sh platform HOST)
 Q3COMPILE_ARCH     := $(shell sh $(CURDIR)/debian/q3arch.sh arch     BUILD)
 Q3COMPILE_PLATFORM := $(shell sh $(CURDIR)/debian/q3arch.sh platform BUILD)
-debian_version     := $(shell dpkg-parsechangelog -c1 | sed -ne 's/^Version: \(\)/\1/p')
+distro             := $(shell lsb_release -is)
+debian_version     := $(shell dpkg-parsechangelog -c1 | sed -ne 's/^Version: //p')
 
 CFLAGS += -fsigned-char
 
@@ -38,7 +39,7 @@ override_dh_auto_build:
 		DEFAULT_BASEDIR=/usr/lib/ioquake3 \
 		BUILD_GAME_SO=1 \
 		BUILD_GAME_QVM=0 \
-		VERSION=$(debian_version) \
+		VERSION=$(debian_version)/$(distro) \
 		CFLAGS="$(CFLAGS)"
 	install build/release-*/ioquake3.* build/ioquake3
 	install build/release-*/ioq3ded.* build/ioq3ded

-- 
Quake 3 engine