From b319b74787de9f0064cb749cd6a842f7b979b34b Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 4 Jul 2002 13:05:52 +0000
Subject: [PATCH] merging 1.2 and main branches

---
 buildrelease | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/buildrelease b/buildrelease
index dc001730e4..a266acd45a 100644
--- a/buildrelease
+++ b/buildrelease
@@ -94,8 +94,12 @@ while (<CVSLOG>) {
 my $releaseversion='';
 my $currentversion='';
 
+
 if ($released) {
-    $releaseversion=($highestversion+1)."RC1";
+    my @components=split(/\./, $highestversion);
+    $components[$#components]++;
+    $nexthighestversion=join '.', @components;
+    $releaseversion=$nexthighestversion."RC1";
     $currentversion=$highestversion;
 } else {
     $releaseversion="$highestversion\RC".($highestrc+1);
@@ -103,7 +107,7 @@ if ($released) {
 }
 
 print "Current release tag is $currentversion.\n";
-print "\nWould you like to bump that up to $releaseversion?  [Y]/N: ";
+print "\nWould you like to bump that up to $releaseversion (or manually enter version)?  [Y]/N: ";
 chomp($input = <STDIN>);
 if ($input =~ /^n/i) {
     print "\nWould you like to rebuild the $currentversion tarball?  Y/[N]: ";
@@ -129,6 +133,14 @@ if ($input =~ /^n/i) {
 }
 
 
+print "\nWould you like to tag the CVS repository?\n(answer yes if releasing tarball)  [Y]/N: ";
+chomp ($input=<STDIN>);
+my $cvstag=1;
+if ($input=~/^n/i) {
+    $cvstag=0;
+}
+
+
 my $sfuserid='';
 if ($cvsroot=$ENV{'CVSROOT'}) {
     $cvsroot=~m#(.*)\@cvs#;
@@ -154,7 +166,7 @@ system("cvs update");
 print qq|
 Tagging koha with tag R_$tagname
 |;
-system("cvs tag -F R_$tagname");
+($cvstag) && (system("cvs tag -F R_$tagname"));
 print qq|
 Updating the 'koha-html' CVS files.  You may need to enter your SourceForge password.
 Using $kohahtmldir.
@@ -164,7 +176,7 @@ system("cvs update");
 print qq|
 Tagging koha-html with tag R_$tagname
 |;
-system("cvs tag -F R_$tagname");
+($cvstag) && (system("cvs tag -F R_$tagname"));
 
 
 
@@ -203,7 +215,6 @@ system("mv $rootdir/intranet-cgi/LICENSE $rootdir");
 system("mv $rootdir/intranet-cgi/News $rootdir");
 system("mv $rootdir/intranet-cgi/README $rootdir");
 system("mv $rootdir/intranet-cgi/TODO $rootdir");
-system("mv $rootdir/intranet-cgi/databaseinstall.sh $rootdir");
 system("mv $rootdir/intranet-cgi/installer.pl $rootdir"); 
 system("mv $rootdir/intranet-cgi/koha.upgrade $rootdir"); 
 chmod 0770, "$rootdir/installer.pl";
-- 
2.20.1