small bugfixes

diff --git a/misc/buildrelease b/misc/buildrelease
index 99cbda4..5e659bd 100644 (file)
--- a/misc/buildrelease
+++ b/misc/buildrelease
@@ -269,6 +269,7 @@ system("mv $rootdir/intranet-cgi/C4 $rootdir/modules");
 # Move files from intranet-cgi to root of tarball
 system("mv $rootdir/intranet-cgi/misc/info/* $rootdir");
 system("mv $rootdir/intranet-cgi/misc/installer.pl $rootdir");
+system("mv $rootdir/intranet-cgi/misc/installer.pm $rootdir");
 system("mv $rootdir/intranet-cgi/misc/koha.upgrade $rootdir");
 #system("mv $rootdir/intranet-cgi/Install.pm $rootdir"); #does not exist ??
 #system("mv $rootdir/intranet-cgi/kohareporter $rootdir"); # does not exist ??

diff --git a/misc/installer.pl b/misc/installer.pl
index 47fa97c..329eca3 100644 (file)
--- a/misc/installer.pl
+++ b/misc/installer.pl
@@ -35,7 +35,7 @@ if ($::kohaversion =~ /RC/) {
     releasecandidatewarning();
 }
 
-checkabortedinstall();
+#checkabortedinstall();
 
 if (-e "$::etcdir/koha.conf") {
     $::installedversion=`grep kohaversion= $::etcdir/koha.conf`;

diff --git a/misc/marc_datas/marc21_en/structure_def.sql b/misc/marc_datas/marc21_en/structure_def.sql
index 6ef6a1f..ebcd8f0 100644 (file)
--- a/misc/marc_datas/marc21_en/structure_def.sql
+++ b/misc/marc_datas/marc21_en/structure_def.sql
@@ -254,7 +254,7 @@ INSERT INTO marc_subfield_structure VALUES ('100', '6', 'Linkage "See "', 'Linka
 INSERT INTO marc_subfield_structure VALUES ('100', '8', 'Field link and sequence number "See "', 'Field link and sequence number "See "', 1, 0, '', -1, NULL, NULL, '');
 INSERT INTO marc_subfield_structure VALUES ('100', 'a', 'Personal name', 'Personal name', 0, 0, 'biblio.author', 1, NULL, NULL, '');
 INSERT INTO marc_subfield_structure VALUES ('100', 'b', 'Numeration', 'Numeration', 0, 0, 'biblio.author', 1, NULL, NULL, '');
-INSERT INTO marc_subfield_structure VALUES ('100', 'c', 'Titles and other words associated with a name', 'Titles and other words associated with a name', 1, 1, 'biblio.author', 1, NULL, NULL, '');
+INSERT INTO marc_subfield_structure VALUES ('100', 'c', 'Titles and other words associated with a name', 'Titles and other words associated with a name', 1, 0, 'biblio.author', 1, NULL, NULL, '');
 INSERT INTO marc_subfield_structure VALUES ('100', 'd', 'Dates associated with a name', 'Dates associated with a name', 0, 0, 'biblio.author', 1, NULL, NULL, '');
 INSERT INTO marc_subfield_structure VALUES ('100', 'e', 'Relator term', 'Relator term', 1, 0, '', -1, NULL, NULL, '');
 INSERT INTO marc_subfield_structure VALUES ('100', 'f', 'Date of a work', 'Date of a work', 0, 0, '', -1, NULL, NULL, '');