[dolphin-emu] 07/33: Cleanup d/rules and calculate version from changelog

[James Cowgill]

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

jcowgill-guest pushed a commit to branch master
in repository dolphin-emu.

commit 9f14a39ee8cf03338116c68172bcd7a8486a0e21
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat Oct 25 20:28:33 2014 +0100

    Cleanup d/rules and calculate version from changelog
---
 debian/control |  1 +
 debian/rules   | 38 ++++++++------------------------------
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/debian/control b/debian/control
index 61257ff..776dfee 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders:
  James Cowgill <james410 at cowgill.org.uk>
 Build-Depends: debhelper (>= 9),
 		cmake (>= 2.6),
+		dpkg-dev (>= 1.17.0),
 		libao-dev,
 		libasound2-dev,
 		libavcodec-dev (>= 6:0.8.6),
diff --git a/debian/rules b/debian/rules
index 199a4ae..2c542ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,43 +1,21 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
-export DH_OPTIONS
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	OPT =-O0
-	BUILD_TYPE=Debug #No other build type will allow no opt
-else
-	OPT ="-O2 -DNDEBUG"
-	BUILD_TYPE=RelWithDebInfo
-endif
-
-BUILD_FLAGS=$(OPT)
+VER := $(shell dpkg-parsechangelog --show-field Version)
+UPSTREAM_VER := $(shell echo $(VER) | sed 's/+dfsg.*//')
 
 %:
 	dh $@ --parallel
 
-GITREV = $(shell dpkg-parsechangelog | grep '^   \* GIT Release' | sed 's/^   \* GIT Release //')
-#VERSION = $(shell dpkg-parsechangelog | grep Version | sed 's/Version: \([0-9.]*\)+git.*/\1/')
-#GITDESC = $(VERSION)-$(shell dpkg-parsechangelog | grep Version | sed 's/.*git\([0-9]*\)-.*/\1/')
-#GITSEQ=$(shell echo $(GITDESC) | cut -d'-' -f2)
-GITBRANCH = stable
-STABLE_VERSION = 4.0.2
-
-CMAKE_OPTIONS =                             \
-	-Dbindir=/usr/games                      \
-	-Ddatadir=/usr/share/games/dolphin-emu   \
-	-DDOLPHIN_WC_DESCRIBE=$(STABLE_VERSION)  \
-	-DDOLPHIN_WC_REVISION=$(GITREV)          \
-	-DDOLPHIN_WC_BRANCH=$(GITBRANCH)         \
-	-DCMAKE_BUILD_TYPE=$(BUILD_TYPE)         \
-	-DCMAKE_CXX_FLAGS=$(BUILD_FLAGS)         \
-	-DCMAKE_C_FLAGS=$(BUILD_FLAGS)
+CMAKE_OPTIONS := \
+	-Dbindir=/usr/games \
+	-Ddatadir=/usr/share/games/dolphin-emu \
+	-DDOLPHIN_WC_DESCRIBE=$(UPSTREAM_VER) \
+	-DDOLPHIN_WC_REVISION=$(VER) \
+	-DDOLPHIN_WC_BRANCH=debian
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_OPTIONS)
 
-override_dh_auto_install:
-	dh_auto_install
-	find $(CURDIR)/debian/tmp -type d -empty -delete
-
 get-orig-source:
 	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --repack --compression=xz --download-current-version

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