X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=INSTALL.ubuntu;h=b9f6d1b34040ccacd41b39854bf66e91d2e55c2c;hb=d13f5780dfeb062a9c677043b89f82d7d7a60b3a;hp=e869479cdf46d8a0ecaffac91028e39055ef4cdd;hpb=0db7ff27518f26b779b61cb67abe742fae80508b;p=koha.git

diff --git a/INSTALL.ubuntu b/INSTALL.ubuntu
index e869479cdf..b9f6d1b340 100644
--- a/INSTALL.ubuntu
+++ b/INSTALL.ubuntu
@@ -31,7 +31,7 @@ Your locale should be set to UTF-8, as should Apache2 and MySQL 5.
 This step is VERY IMPORTANT for a UNICODE compliant system. Please
 read over the following document carefully:
 
-http://wiki.koha.org/doku.php?id=encodingscratchpad
+http://wiki.koha-community.org/wiki/Encoding_and_Character_Sets_in_Koha
 
 You can verify your system locale by typing the following command:
 
@@ -52,13 +52,13 @@ Run the following command to update your system:
 1.4.1 Option A: Download Koha via Git (optional)
 
     $ sudo apt-get install git-core git-email
-    $ git clone git://git.koha-community.org/pub/scm/koha.git kohaclone
+    $ git clone git://git.koha-community.org/koha.git kohaclone
     $ cd kohaclone
     $ git checkout -b myinstall origin
 
 Note: for more information about Git, please see the Koha Git Usage Guide:
 
-    http://wiki.koha.org/doku.php?id=en:development:git_usage
+    http://wiki.koha-community.org/wiki/Version_Control_Using_Git
 
 1.4.2 Option B: Download Koha from http://download.koha-community.org
 
@@ -90,9 +90,7 @@ sources
 
 Run the following command:
 
-    $ sudo cpan MARC::Crosswalk::DublinCore GD GD::Barcode::UPCE Email::Date \
-                HTML::Scrubber Algorithm::CheckDigits::M43_001 Biblio::EndnoteStyle \
-                Locale::Currency::Format
+    $ sudo cpan GD GD::Barcode::UPCE Algorithm::CheckDigits::M43_001
 
 Note: you may need to run CPAN initialization if you've not run cpan
 before:
@@ -156,6 +154,8 @@ When the configuration is completed CPAN will install the Perl modules.
 
     /etc/perl/XML/SAX/ParserDetails.ini
 
+    You will need to move the entire section for '[XML::LibXML::SAX::Parser]' to the bottom of the ini file.
+
 2.4 Install DBD::mysql Perl module
 
 In order to handle UTF-8 correctly, Koha requires at least version 4.004
@@ -255,7 +255,7 @@ If not running named virtual hosts (The default koha installation does not use n
 
 Run the following commands:
 
-    $ sudo a2enmod rewrite
+    $ sudo a2enmod rewrite deflate
     $ sudo a2ensite koha
     $ sudo apache2ctl restart
 
@@ -366,14 +366,36 @@ NOTE: This job should be setup under the kohauser (the default is 'koha').
 
 UPGRADE
 =======
-If you are upgrading from a previous installation of Koha 3, you can
+If you are running in another language other than english, please
+switch to english before doing the upgrade, the templating system has
+changed and the templates will need to be regenerated.
+Once you have upgraded, please regenerate your templates in your
+chosen languages.
+
+If you are upgrading from a previous installation of Koha 3.x, you can
 use the following:
 
+ ./koha_perl_deps.pl -u -m # to identify new Perl dependencies
+
+Install any missing modules
+IMPORTANT: Koha 3.6.x uses Template::Toolkit, this must be installed
+before the webinstaller can run
+
+ sudo apt-get install libtemplate-perl
+
  perl Makefile.PL --prev-install-log /path/to/koha-install-log
  make
  make test
  sudo make upgrade
 
+Koha 3.4.x or later no longer stores items in biblio records so 
+if you are upgrading from an older version as part of the
+upgrade you will need to do the following two steps, they can take a
+long time (several hours) to complete for large databases
+
+ misc/maintenance/remove_items_from_biblioitems.pl --run
+ misc/migration_tools/rebuild_zebra.pl -b -r
+
 Uninstall Instructions
 =============================
 1) Stop Services: