[Pkg-lustre-svn-commit] updated: [117f60a] Change UPVERSION to contain a proper minor version

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 117f60a09441102f2c4c3ca0401603a868eb348b
Author: Patrick Winnertz <winnie at debian.org>
Date:   Tue Jun 2 11:17:12 2009 +0200

    Change UPVERSION to contain a proper minor version

diff --git a/debian/rules b/debian/rules
index 2dcb8a1..0f612df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,7 @@ TOP_DIR:=$(shell pwd)
 # Lustre version to use
 VERSION=`cat $(TOP_DIR)/debian/lustre-version`
 SUPPORTED_KERNELS=2.6.18 2.6.20 2.6.22
-UPVERSION=`basename $(TOP_DIR) | awk -F- '{print $$2}'`
-UPMINVERSION=`head -n1 $(TOP_DIR)debian/changelog | awk '{print $$2}' | awk -F- '{print $$2}' | sed -e 's/[()]//g'`
+UPVERSION=`head -n1 $(TOP_DIR)/debian/changelog | awk '{print $$2}' | sed -e 's%[()]%%g'`
 
 # Packages
 PATCH_PKG=linux-patch-lustre
@@ -222,7 +221,7 @@ binary-$(SOURCE_PKG): build-stamp
 	       debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/patches/* 
 	$(MAKE) -C debian/$(SOURCE_PKG)/usr/src/modules/lustre -f debian/rules clean
 	# Create the module-source tarball.
-	echo $(UPVERSION)-$(UPMINVERSION) > debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/lustre-version
+	echo $(UPVERSION) > debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/lustre-version
 	cd debian/$(SOURCE_PKG)/usr/src && tar jcf lustre.tar.bz2 modules 
 	rm -rf debian/$(SOURCE_PKG)/usr/src/modules
 	dh_install -p$(SOURCE_PKG)

-- 
Lustre Debian Packaging