Nice/distrib Makefile,1.17,1.18

Update of /cvsroot/nice/Nice/distrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6487/distrib

Modified Files:
	Makefile 
Log Message:
Check that upstream and debian versions are the same before building the debian
package.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/distrib/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile	26 Jun 2004 10:41:20 -0000	1.17
--- Makefile	6 Jun 2005 16:29:51 -0000	1.18
***************
*** 1,5 ****
  # Get the version from the debian changelog.
  FULL_DEB_VERSION = ${shell expr "`head -1 ../debian/changelog`" : '.*(\(.*\))'}
! VERSION = ${shell expr "$(FULL_DEB_VERSION)" : '\(.*\)-[^-]*'}
  DEBIAN_REVISION = ${shell expr "$(FULL_DEB_VERSION)" : '.*-\([^-]*\)'}
  
--- 1,7 ----
+ VERSION = ${shell expr "`head -1 ../NEWS`" : '.*(\(.*\))'}
+ 
  # Get the version from the debian changelog.
  FULL_DEB_VERSION = ${shell expr "`head -1 ../debian/changelog`" : '.*(\(.*\))'}
! DEB_VERSION = ${shell expr "$(FULL_DEB_VERSION)" : '\(.*\)-[^-]*'}
  DEBIAN_REVISION = ${shell expr "$(FULL_DEB_VERSION)" : '.*-\([^-]*\)'}
  
***************
*** 30,33 ****
--- 32,38 ----
  
  deb $(DEB):
+ 	@[ $(VERSION) ] || ( echo "No version in NEWS file"; false )
+ 	@[ $(VERSION) = "$(DEB_VERSION)" ] ||\
+ 		 (echo "Upstream and Debian versions not matching"; false )
  	@echo Creating Debian package version ${VERSION}
  	rm -rf $(BUILDROOT) $(BUILDROOT).orig



-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20