From e5aef8203d5e01873246eeecf67f3c214ea79220 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 21 Apr 2010 03:56:56 +0000 Subject: [PATCH] ensure that the trainwreck which was 1.9.2 does not happen again --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index aca452fd3..bba2d7918 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,7 @@ help: @echo " wikiman" @echo " perl-modules" #@echo - #@echo " upload-docs release update-webdemo" + #@echo " upload-docs release" masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* @@ -404,6 +404,10 @@ release: dch -v ${DEBVERSION} -p "New upstream release" cvs commit -m "Updated for ${VERSION}" debian/changelog + # Make sure other people's changes are pulled in! + cvs update -d -P + + # Tag the release #cvs tag ${TAG} cvs tag -F ${TAG} @@ -427,8 +431,3 @@ release: #update web demo self-service? -update-webdemo: - ssh ivan@420.am '( cd freeside; cvs update -d -P )' - #ssh root@420.am '( cd /home/ivan/freeside; make clean; make deploy )' - ssh root@420.am '( cd /home/ivan/freeside; make deploy )' - -- 2.11.0