From 226bdaa8bee83e6883346af7c2cac205f6a4f7ed Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 2 Jul 2013 18:35:58 -0300 Subject: [PATCH] Bug 8911 - history.txt file missing for about.pl This patch makes Makefile.PL put the history.txt file in the right places depending on the chosen setup layout, adds a reference to that place in koha-conf.xml (and debian template version), and finally tweaks about.pl to use it. To test, apply the patch and verify that perl Makefile.PL runs fine, and installing in - dev - single - standard layouts works as expected. Then go to the about.pl page and see if Koha's history shows there. Then, build your packages and test on your newly created instances. Regards To+ --- Makefile.PL | 1 + about.pl | 4 ++-- debian/templates/koha-conf-site.xml.in | 1 + etc/koha-conf.xml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index 22ce8da..b2a247e 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -266,6 +266,7 @@ my $target_map = { './check_sysprefs.pl' => 'NONE', './circ' => 'INTRANET_CGI_DIR', './course_reserves' => 'INTRANET_CGI_DIR', + './docs/history.txt' => { target => 'DOC_DIR', trimdir => -1 }, './offline_circ' => 'INTRANET_CGI_DIR', './edithelp.pl' => 'INTRANET_CGI_DIR', './etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 }, diff --git a/about.pl b/about.pl index b9508c6..ef45340 100755 --- a/about.pl +++ b/about.pl @@ -148,8 +148,8 @@ $template->param( table => $table ); ## Koha time line code #get file location -my $dir = C4::Context->config('intranetdir'); -open( my $file, "<", "$dir" . "/docs/history.txt" ); +my $docdir = C4::Context->config('docdir'); +open( my $file, "<", "$docdir" . "/history.txt" ); my $i = 0; my @rows2 = (); diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in index f3da6ec..ab8aff5 100644 --- a/debian/templates/koha-conf-site.xml.in +++ b/debian/templates/koha-conf-site.xml.in @@ -265,6 +265,7 @@ /usr/share/koha/intranet/htdocs/intranet-tmpl /usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/includes/ /var/log/koha/__KOHASITE__ + /usr/share/doc/koha-common /var/spool/koha/__KOHASITE__