[Pkg-fglrx-devel] r313 - fglrx-driver/trunk/debian

[Patrick Matthäi]

Author: pmatthaei
Date: 2009-11-02 21:10:29 +0000 (Mon, 02 Nov 2009)
New Revision: 313

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
* Fix VERSION and UPSTREAM_VERSION in debian/rules.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2009-11-02 20:59:48 UTC (rev 312)
+++ fglrx-driver/trunk/debian/changelog	2009-11-02 21:10:29 UTC (rev 313)
@@ -2,8 +2,9 @@
 
   * Implemented dkms support with our new fglrx-modules-dkms package.
   * Remove old fglrx-amdcccle and fglrx-kernel-src dummy packages.
+  * Fix VERSION and UPSTREAM_VERSION in debian/rules.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 25 Oct 2009 16:21:48 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 02 Nov 2009 22:10:08 +0100
 
 fglrx-driver (1:9-10-1) unstable; urgency=low
 

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2009-11-02 20:59:48 UTC (rev 312)
+++ fglrx-driver/trunk/debian/rules	2009-11-02 21:10:29 UTC (rev 313)
@@ -22,10 +22,9 @@
 	DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 endif
 
-VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2)
+VERSION := $(shell dpkg-parsechangelog|egrep '^Version:'|cut -d' ' -f2|cut -d':' -f2)
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog|egrep '^Version:'|cut -d' ' -f2|cut -d':' -f2|sed 's/-.+*$//')
 
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2 | cut -d'-' -f1)
-
 KSRCDIR  := usr/src/modules/fglrx
 
 ifeq ($(DEB_BUILD_ARCH),amd64)