From d57e9486d7ee057aa8fcad4abb8947569b8b1d78 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 26 May 2010 16:18:34 +1200 Subject: [PATCH 01/10] Make sure the temporary version number comes before 3.2. This way, upgrades from the temporary ones to the final release will happen automatically. Signed-off-by: Galen Charlton --- debian/build-git-snapshot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot index 41f9d857d3..9bdd365ac9 100755 --- a/debian/build-git-snapshot +++ b/debian/build-git-snapshot @@ -30,7 +30,7 @@ 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() { From b27ef1280a686dca3f9afc89c5d4dc90a2139b7b Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 26 May 2010 18:52:59 +1200 Subject: [PATCH 02/10] Add dependency on apache2-mpm-itk for koha-common. The way things are set up, each Koha instance runs under its own user account. At least for now, this requires apache2-mpm-itk. Later we can investigate other possibilities. Signed-off-by: Galen Charlton --- debian/control | 1 + 1 file changed, 1 insertion(+) 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, From fc769cd0524cbe6878b5038869a8af531e7827ae Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 26 May 2010 18:52:57 +1200 Subject: [PATCH 03/10] Use a native Debian package. Since the packaging is part of the upstream source, there's no point in having a Debian version. Signed-off-by: Galen Charlton --- debian/build-git-snapshot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot index 9bdd365ac9..bcf71d4bdd 100755 --- a/debian/build-git-snapshot +++ b/debian/build-git-snapshot @@ -34,7 +34,7 @@ newversion() { } adjust_debian_changelog() { - dch -v "$1-1" "Building git snapshot." + dch -v "$1" "Building git snapshot." dch -r "Building git snapshot." } @@ -44,7 +44,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 } From 14ad5059abab25a6ef34a585c8b1b4a0f728228a Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 26 May 2010 18:53:01 +1200 Subject: [PATCH 04/10] Update README.Debian for koha.deb package. One bug fix (three steps, not two, are automated in koha-post-install-setup). Also add a note about the need to possibly edit ports.conf. Signed-off-by: Galen Charlton --- debian/koha.README.Debian | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 From 6fb9a6036d59a038fa9356011bcf2b8d78b83507 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 26 May 2010 18:53:00 +1200 Subject: [PATCH 05/10] Update README.Debian for koha-common with post-install setup. Signed-off-by: Galen Charlton --- debian/koha-common.README.Debian | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) 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 ================================ From fe418ea607bc1be233b5db1c82d97577da1ce399 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 26 May 2010 18:52:58 +1200 Subject: [PATCH 06/10] Set upload target to squeeze-dev. Since we're uploading a git snapshot, this is not meant for production, and thus it should not be uploaded to squeeze, but for squeeze-dev. Documentation for the pockets will appear in the apt repository or the wiki once it is ready. Signed-off-by: Galen Charlton --- debian/build-git-snapshot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot index bcf71d4bdd..e46069c22b 100755 --- a/debian/build-git-snapshot +++ b/debian/build-git-snapshot @@ -34,7 +34,8 @@ newversion() { } adjust_debian_changelog() { - dch -v "$1" "Building git snapshot." + dch --force-distribution -D squeeze-dev -v "$1" \ + "Building git snapshot." dch -r "Building git snapshot." } From 340f8f072596cbb1595a4888657fe8582f25b230 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 26 May 2010 10:51:09 -0400 Subject: [PATCH 07/10] bug 4508: fix crash when editing patron attributes or message prefs When editing patron attributes or messaging preferences on the patron editor, Koha would crash with the following error: Software error: Can't use an undefined value as an ARRAY reference at /home/koha/kohaclone/C4/SQLHelper.pm line 186. This would occur only when editing the specific attribute or message preferences section, not when editing the entire patron record. Signed-off-by: Galen Charlton --- members/memberentry.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/members/memberentry.pl b/members/memberentry.pl index c15828575d..5cb4d723ad 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -335,7 +335,10 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ delete $newdata{'password'}; delete $newdata{'userid'}; } - &ModMember(%newdata); + &ModMember(%newdata) unless scalar(keys %newdata) <= 1; # bug 4508 - avoid crash if we're not + # updating any columns in the borrowers table, + # which can happen if we're only editing the + # patron attributes or messaging preferences sections if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) { C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes); } From d43cf0883709b0844d9936f072f497c6217c77b4 Mon Sep 17 00:00:00 2001 From: Nahuel ANGELINETTI Date: Wed, 26 May 2010 16:06:45 +0200 Subject: [PATCH 08/10] (MT #2565) fix aqplan csv export, and turn off debug This fix the csv export that doesn't export correctly the budget name, it's empty column. And it turn off some SQL debug that slow down the result of the page and the csv export. Signed-off-by: Galen Charlton --- admin/aqplan.pl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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'}; From ad2babecf388e89a394ccde56d3073276209061e Mon Sep 17 00:00:00 2001 From: Cindy Murdock Ames Date: Wed, 26 May 2010 12:56:26 -0400 Subject: [PATCH 09/10] Added "dialog alert" class to "No Results Found" message on the patron search so the alert stands out. Previously no css was applied to it so it was just plain text. Librarians weren't noticing it. Signed-off-by: Galen Charlton --- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl index 39dd8f7306..fef7b69074 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl @@ -79,7 +79,7 @@ - No results found +
No results found
From bef08997420b0d418d39fcef09e68789621bb76c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 26 May 2010 14:32:41 -0400 Subject: [PATCH 10/10] Whitespace removal, removal of U+FEFF character Signed-off-by: Galen Charlton --- .../prog/en/includes/members-toolbar.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 @@ -
+