[Koha-cvs] CVS: koha/misc buildrelease,1.22,1.23 Install.pm,1.87,1.88 koha.upgrade,1.16,1.17

[Paul POULAIN]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27147/misc

Modified Files:
        buildrelease Install.pm koha.upgrade 
Log Message:
minor update just before releasing official 2.2.0

Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** buildrelease        16 Nov 2004 13:04:18 -0000      1.22
--- buildrelease        5 Jan 2005 14:31:06 -0000       1.23
***************
*** 219,223 ****
  |;
  chdir($kohadir) || die "$kohadir: $!\n";
! system("cvs update -P");
  if ($cvstag) {
      print qq|
--- 219,223 ----
  |;
  chdir($kohadir) || die "$kohadir: $!\n";
! # system("cvs update -P");
  if ($cvstag) {
      print qq|

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -r1.87 -r1.88
*** Install.pm  3 Jan 2005 11:11:10 -0000       1.87
--- Install.pm  5 Jan 2005 14:31:17 -0000       1.88
***************
*** 149,153 ****
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade from Koha %s to %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 149,153 ----
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 1819,1823 ****
  such as DANMARC.  We would like to hear from you if you do.
  
! UPGRADE : If you UPGRADE your version from a previous 2.x.x, the right choice 
here is N (None) to preserve your local MARC setup.
  
  Choose MARC definition [1]: |;
--- 1819,1824 ----
  such as DANMARC.  We would like to hear from you if you do.
  
! *** UPGRADE ***
! If you UPGRADE your version from a previous 2.x.x, the right choice here is N 
(None) to preserve your local MARC setup.
  
  Choose MARC definition [1]: |;
***************
*** 1827,1833 ****
  
    en : default language, all pages available
!   fr : complete translation (except pictures)
!   es : partial librarian site translation (including pictures)
!   pl : complete OPAC and partial librarian translation
    zh_TW : partial translation
  
--- 1828,1833 ----
  
    en : default language, all pages available
!   fr : complete translation
!   es : partial librarian site translation
    zh_TW : partial translation
  

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** koha.upgrade        23 Nov 2004 16:02:33 -0000      1.16
--- koha.upgrade        5 Jan 2005 14:31:17 -0000       1.17
***************
*** 15,34 ****
  loadconfigfile();
  
! my $kohaversion=`cat koha.version`;
! chomp $kohaversion;
! Install::setkohaversion $kohaversion;
  
  
! if ($kohaversion =~ /RC/) {
      releasecandidatewarning();
  }
  
! my $answer = 
showmessage(getmessage('WelcomeToUpgrader',[$kohaversion,$::newversion]),'yn');
! 
! unless ($answer =~/y/i) {
        showmessage(getmessage('AbortingInstall'),'none');
        exit;
- } else {
-       print "Great! continuing upgrade... \n";
  };
  
--- 15,33 ----
  loadconfigfile();
  
! $::newversion=`cat koha.version`;
! chomp $::newversion;
! Install::setkohaversion $::newversion;
  
  
! if ($::newversion =~ /RC/) {
      releasecandidatewarning();
  }
  
! my $answer = 
showmessage(getmessage('WelcomeToUpgrader',[$::newversion]),'yn','n');
! if ($answer eq "Y" || $answer eq "y") {
!       print "Great! continuing upgrade... \n";
! } else {
        showmessage(getmessage('AbortingInstall'),'none');
        exit;
  };