[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.06-34-g3f671f7
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 13 14:38:46 CET 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 3.12.x has been updated
via 3f671f71aa106d77cfe25a6aeb2a86433aee785f (commit)
via 8e809ce4a0765335c93bed784afd563ff4274df4 (commit)
via b1c1cb4480e41b29f4c9905179585d7eb12777ab (commit)
via acd0ce1a83c8a9d4f8014a2897f03b31815a13dd (commit)
from 40b9ebdf6317e9ca4330a25d6fba35e96297c50f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3f671f71aa106d77cfe25a6aeb2a86433aee785f
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Sep 21 17:47:54 2013 +0000
Bug 10622: (follow-up) uppercase "SIP" in documentation and help text
"SIP" is an acronym and should be capitalized.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 67ad9d28f5477124d2bf30c0dc48d693657461a7)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8e809ce4a0765335c93bed784afd563ff4274df4
Author: Magnus Enger <magnus at enger.priv.no>
Date: Fri Aug 9 10:05:23 2013 +0200
Bug 10622 - [SIGNED OFF] Followup: Add --sip, --nosip and --help to man page
The original patch for bug 10622 added the --sip, --nosip and
--help switches to the koha-list command, but did not update the
manpage for the command. This patch does.
To test:
Run these commands and look at the formatted man page:
$ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
debian/docs/koha-list.xml
$ man -l koha-list.8
Make sure this test passes:
$ prove -v xt/verify-debian-docbook.t
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Forgot the docs this time, good catch Magnus
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 46574c916090a3e7e9ae9157b4053b1d683ac0e3)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b1c1cb4480e41b29f4c9905179585d7eb12777ab
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Jul 22 11:30:27 2013 -0300
Bug 10622: add --sip and --nosip switches to koha-list
Just added those switches.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
I applied the patch on my local dev install, and then copied the
patched koha-list script to a couple of servers with actual
instances running off the packages, to test the script.
- It seems that the -h switch did not work before this patch, now
both -h and --help works nicely
- --sip and --nosip work as expected, also in combination with
--email and --noemail
The patch does not add --sip and --nosip to the man page for
koha-list, but I will do a followup for that.
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 9f6e739ce0893fe7570adfa7cc2b7407351138ae)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit acd0ce1a83c8a9d4f8014a2897f03b31815a13dd
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri Jul 19 17:51:30 2013 -0300
Bug 10617 - koha-common init script cleanup
Removed unused stuff, added a new config file /etc/default/koha-common
to control the init script behaviour. Currently is only a stub. The config
file could be put on /etc/sysconfig on RedHat and friends. The init script
should work them too. Added a TODO comment regarding the 'status' switch.
To test:
- Apply the patch on master, build your own packages and install.
- The init script should continue to work as expected.
(it can be tested replacing the /etc/init.d/koha-common file with
debian/koha-common.init on a packages install).
- The absence of the /etc/default/koha-common file should not prevent
the init script from working.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 213fbdc5b40dd7638d652a8fd60f7391d0b10bb1)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
debian/docs/koha-list.xml | 25 +++++++++--
debian/koha-common.default | 3 ++
debian/koha-common.init | 33 +++++++--------
debian/scripts/koha-list | 99 ++++++++++++++++++++++++++++++++++++--------
4 files changed, 119 insertions(+), 41 deletions(-)
create mode 100644 debian/koha-common.default
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list