Merge remote branch 'kc/new/signoffs' into kcmaster

Conflicts:
	installer/data/mysql/updatedatabase.pl

Updated updatedatabase.pl to handle new version number

diff --cc etc/zebradb/marc_defs/marc21/biblios/record.abs
index 4874bfd,ba46db1..ed71a93
mode 100644,100755..100755
--- 1/etc/zebradb/marc_defs/marc21/biblios/record.abs
--- 2/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs

diff --cc installer/data/mysql/updatedatabase.pl
index a6f6be6,3ddc2ce..3aa1e20
--- 1/installer/data/mysql/updatedatabase.pl
--- 2/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@@ -3799,33 -3799,22 +3799,49 @@@ if (C4::Context->preference("Version") 
      SetVersion ($DBversion);
  }
  
 -$DBversion = '3.03.00.XXX';
 +$DBversion = "3.03.00.001";
 +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 +    $dbh->do("DELETE FROM subscriptionroutinglist WHERE borrowernumber IS NULL;");
 +    $dbh->do("ALTER TABLE subscriptionroutinglist MODIFY COLUMN `borrowernumber` int(11) NOT NULL;");
 +    $dbh->do("DELETE FROM subscriptionroutinglist WHERE subscriptionid IS NULL;");
 +    $dbh->do("ALTER TABLE subscriptionroutinglist MODIFY COLUMN `subscriptionid` int(11) NOT NULL;");
 +    $dbh->do("CREATE TEMPORARY TABLE del_subscriptionroutinglist 
 +              SELECT s1.routingid FROM subscriptionroutinglist s1
 +              WHERE EXISTS (SELECT * FROM subscriptionroutinglist s2
 +                            WHERE s2.borrowernumber = s1.borrowernumber
 +                            AND   s2.subscriptionid = s1.subscriptionid 
 +                            AND   s2.routingid < s1.routingid);");
 +    $dbh->do("DELETE FROM subscriptionroutinglist
 +              WHERE routingid IN (SELECT routingid FROM del_subscriptionroutinglist);");
 +    $dbh->do("ALTER TABLE subscriptionroutinglist ADD UNIQUE (subscriptionid, borrowernumber);");
 +    $dbh->do("ALTER TABLE subscriptionroutinglist 
 +                ADD CONSTRAINT `subscriptionroutinglist_ibfk_1` FOREIGN KEY (`borrowernumber`) 
 +                REFERENCES `borrowers` (`borrowernumber`)
 +                ON DELETE CASCADE ON UPDATE CASCADE");
 +    $dbh->do("ALTER TABLE subscriptionroutinglist 
 +                ADD CONSTRAINT `subscriptionroutinglist_ibfk_2` FOREIGN KEY (`subscriptionid`) 
 +                REFERENCES `subscription` (`subscriptionid`)
 +                ON DELETE CASCADE ON UPDATE CASCADE");
 +    print "Upgrade to $DBversion done (Make subscriptionroutinglist more strict)\n";
 +    SetVersion ($DBversion);
 +}
 +
++$DBversion = '3.03.00.002';
+ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+     $dbh->do("UPDATE language_rfc4646_to_iso639 SET iso639_2_code='arm' WHERE rfc4646_subtag='hy';");
+     $dbh->do("UPDATE language_rfc4646_to_iso639 SET iso639_2_code='eng' WHERE rfc4646_subtag='en';");
+     $dbh->do("INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'fi','fin');");
+     $dbh->do("UPDATE language_rfc4646_to_iso639 SET iso639_2_code='fre' WHERE rfc4646_subtag='fr';");
+     $dbh->do("INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'lo','lao');");
+     $dbh->do("UPDATE language_rfc4646_to_iso639 SET iso639_2_code='ita' WHERE rfc4646_subtag='it';");
+     $dbh->do("INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'sr','srp');");
+     $dbh->do("INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'tet','tet');");
+     $dbh->do("INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code) VALUES( 'ur','urd');");
+ 
+     print "Upgrade to $DBversion done (Correct language mappings)\n";
+     SetVersion ($DBversion);
+ }
+ 
  =item DropAllForeignKeys($table)
  
    Drop all foreign keys of the table $table

diff --cc kohaversion.pl
index e7d7bff,b919410..0ddf98e
--- 1/kohaversion.pl
--- 2/kohaversion.pl
+++ b/kohaversion.pl
@@@ -10,7 -10,7 +10,7 @@@
  use strict;
  
  sub kohaversion {
-     our $VERSION = '3.03.00.001';
 -    our $VERSION = '3.02.00.004';
++    our $VERSION = '3.03.00.002';
      # version needs to be set this way
      # so that it can be picked up by Makefile.PL
      # during install