[Nice-commit] Nice/distrib Makefile,1.8,1.9

[<bo...@us...>]

Update of /cvsroot/nice/Nice/distrib
In directory sc8-pr-cvs1:/tmp/cvs-serv9632/distrib

Modified Files:
	Makefile 
Log Message:
Tag with only the upstream version, not the Debian revision.

Delete the CVS tag before setting it, so that if a file was removed between
two taggings it does not keep the tag.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/distrib/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	12 Nov 2003 21:39:04 -0000	1.8
--- Makefile	10 Dec 2003 19:16:52 -0000	1.9
***************
*** 1,7 ****
  # Get the version from the debian changelog.
! VERSION = ${shell expr "`head -1 ../debian/changelog`" : '.*(\(.*\))'}
! TAG = $(shell echo -n "version_$(VERSION)" | tr -c -- "-_a-zA-Z0-9" "_")
  
- DEBVERSION = ${shell expr "$(VERSION)" : '.*-\([0-9]\)'}
  DEB = nice_${VERSION}_all.deb
  
--- 1,9 ----
  # 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)" : '.*-\([^-]*\)'}
! 
! CVS_TAG = $(shell echo -n "version_$(VERSION)" | tr -c -- "-_a-zA-Z0-9" "_")
  
  DEB = nice_${VERSION}_all.deb
  
***************
*** 29,34 ****
  	@echo Creating Debian package version ${VERSION}
  	rm -rf $(BUILDROOT) $(BUILDROOT).orig
! 	cd .. && cvs tag -F $(TAG)
! 	CVSROOT=$(CVSROOT) cvs export -d $(BUILDROOT).orig -r $(TAG) Nice
  	mv -f $(BUILDROOT).orig/debian $(BUILDROOT).orig-debian
  	find $(BUILDROOT).orig -name '.cvsignore' | xargs rm
--- 31,36 ----
  	@echo Creating Debian package version ${VERSION}
  	rm -rf $(BUILDROOT) $(BUILDROOT).orig
! 	cd .. && cvs tag -d $(CVS_TAG) && cvs tag $(CVS_TAG)
! 	CVSROOT=$(CVSROOT) cvs export -d $(BUILDROOT).orig -r $(CVS_TAG) Nice
  	mv -f $(BUILDROOT).orig/debian $(BUILDROOT).orig-debian
  	find $(BUILDROOT).orig -name '.cvsignore' | xargs rm