summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2010-04-21 03:56:58 +0000
committerivan <ivan>2010-04-21 03:56:58 +0000
commit760eb99105d6505eccc1fa58b4b104c7f6b780b9 (patch)
tree8b34141d7ae8594435b1367fb132f6b6519f04f8
parentc8053393ccf26d91bedabeb28111493afe7d0931 (diff)
ensure that the trainwreck which was 1.9.2 does not happen again
-rw-r--r--Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index ae46074ff..01f094c62 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/*/*/*/*
@@ -399,6 +399,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}
@@ -422,8 +426,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 )'
-