updating changelog

diff --git a/Makefile b/Makefile
index 6183a8f..ee346c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CFLAGS ?= -march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp -O2 -g -
 ASFLAGS ?= -march=armv6j -mfpu=vfp -mfloat-abi=softfp -g
 CXXFLAGS ?= $(CFLAGS)
 
-GAME_VERSION ?= 0.9.4
+GAME_VERSION ?= $(shell head -n 1 debian/changelog | sed 's/[^0-9.-]//g')-git
 export GAME_VERSION
 export DESTDIR
 

diff --git a/debian/changelog b/debian/changelog
index 061a5aa..91509d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,12 @@ drnoksnes (0.9.4) unstable; urgency=low
   * A lot of emu options now available in GUI.
   * Emu now installs a symlink in /usr/bin so it can be easily launched.
   * Slightly fixed icon and graphics.
+  * Optimized mode7 renderer.
+  * Fixed bug with non-smc roms in frontend.
+  * Switched to SDL GetTicks/Delay functions instead of gettimeofday/usleep.
   * Distributing config file.
 
- -- Javier S. Pedro <maemo@javispedro.com>  Tue, 18 Aug 2009 23:48:53 +0200
+ -- Javier S. Pedro <maemo@javispedro.com>  Sun, 23 Aug 2009 21:02:06 +0200
 
 drnoksnes (0.9.3) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 385b377..ccfac55 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 # Determine Maemo version
 MAEMO_VERSION := $(shell cut -d"." -f1 /etc/maemo_version)
 
+# Determine app version from debian changelog
+GAME_VERSION := $(shell head -n 1 debian/changelog | sed 's/[^0-9.-]//g')
+
 CFLAGS = -Wall -g -DMAEMO -DMAEMO_VERSION=$(MAEMO_VERSION)
 LDFLAGS = -Wl,-z,defs
 CONFOPTS = 
@@ -48,7 +51,7 @@ build: build-stamp
 build-stamp: configure-stamp 
        dh_testdir
 
-       $(MAKE) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
+       $(MAKE) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" GAME_VERSION="$(GAME_VERSION)"
 
        touch $@