diff --git a/admin/aqplan.pl b/admin/aqplan.pl index 55367ef746..5fb70973b3 100755 --- a/admin/aqplan.pl +++ b/admin/aqplan.pl @@ -50,7 +50,7 @@ my ( $template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user type => "intranet", authnotrequired => 0, flagsrequired => { acquisition => 'planning_manage' }, - debug => 1, + debug => 0, } ); @@ -455,6 +455,8 @@ output_html_with_http_headers $input, $cookie, $template->output; sub _print_to_csv { my ( $header, $results ) = @_; + binmode STDOUT, ":utf8"; + my $csv = Text::CSV_XS->new( { sep_char => $del, always_quote => 'TRUE', @@ -477,7 +479,8 @@ sub _print_to_csv { print "$str\n"; foreach my $row (@$results) { - my @col = ( $row->{'budget_name'}, $row->{'budget_amount'} ); + $row->{'budget_name_indent'} =~ s/ / /g; + my @col = ( $row->{'budget_name_indent'}, $row->{'budget_amount'} ); my $l = $row->{'lines'}; foreach my $line (@$l) { push @col, $line->{'estimated_amount'}; diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot index 41f9d857d3..e46069c22b 100755 --- a/debian/build-git-snapshot +++ b/debian/build-git-snapshot @@ -30,11 +30,12 @@ latest_sha1() { } newversion() { - printf '3.2.git%s.%s' $(date +%Y%m%d%H%M%S) $(latest_sha1) + printf '3.2~git%s.%s' $(date +%Y%m%d%H%M%S) $(latest_sha1) } adjust_debian_changelog() { - dch -v "$1-1" "Building git snapshot." + dch --force-distribution -D squeeze-dev -v "$1" \ + "Building git snapshot." dch -r "Building git snapshot." } @@ -44,7 +45,7 @@ reset_debian_changelog() { build_package() { git archive --format=tar --prefix="koha-$1/" HEAD | - gzip -9 > "../koha_$1.orig.tar.gz" + gzip -9 > "../koha_$1.tar.gz" debuild -us -uc } diff --git a/debian/control b/debian/control index 459e1c3fe1..f3832d2f7f 100644 --- a/debian/control +++ b/debian/control @@ -69,6 +69,7 @@ Package: koha-common Architecture: all Depends: ${shlib:Depends}, ${misc:Depends}, ${koha:Depends}, apache2, + apache2-mpm-itk, at, daemon, idzebra-2.0, diff --git a/debian/koha-common.README.Debian b/debian/koha-common.README.Debian index 067628421e..42167eb5e2 100644 --- a/debian/koha-common.README.Debian +++ b/debian/koha-common.README.Debian @@ -1,3 +1,31 @@ +Post-installation configuration +=============================== + +You will want to consider doing the following after installing this +package: + +* Install mysql-server, for a local database. + +* Alternatively, set up a connection to a remote MySQL server: + - rm /etc/mysql/koha-common.cnf + - $EDITOR /etc/mysql/koha-common.cnf + + [client] + host = some.other.host + user = mysqlusername + password = mysqlpassword + +* Enable the rewrite module: a2enmod rewrite + +* Listen on port 8080: $EDITOR /etc/apache2/ports.conf + +* Alternatively, configure koha-create, using /etc/koha/koha-sites.conf + (see /usr/sbin/koha-create for which variables to set). + +* After that, you can create a new Koha instance: + - koha-create --create-db name + + Koha filesystem layout on Debian ================================ diff --git a/debian/koha.README.Debian b/debian/koha.README.Debian index a807092a96..399eedd2cd 100644 --- a/debian/koha.README.Debian +++ b/debian/koha.README.Debian @@ -23,14 +23,20 @@ following: * Restart Apache. - sudo service apache2 restart -The latter two steps can be done by running the koha-post-install-setup +The latter three steps can be done by running the koha-post-install-setup script. Then access the following URL: http://localhost:8080/ -Alternatively, any other name, IP address, and interface will work, too. +Alternatively, any other name, IP address, and interface will work, too, +although will probably need to configure /etc/apache2/ports.conf to +have the following line: + + NameVirtualHost *:8080 + +(You'll need to restart apache2 afterwards: /etc/init.d/apache2 restart.) This should bring up the Koha intranet administration screen, which will let you log in. The username is koha, the password is in the diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 5015289202..6f22d4649e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -1,4 +1,4 @@ -
+