[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.01-84-ga61396b

[Git repo owner]

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  a61396b8572b2d1c490b77042250cbe8e24ae565 (commit)
       via  2803bab669162aebf0c8f6360328842d2dfa2dc7 (commit)
       via  6b94a9a3406f7c1b58a88b54c598ad617b84ee52 (commit)
      from  1b079256736f080ef4905088ae78bfe9f425f05c (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 a61396b8572b2d1c490b77042250cbe8e24ae565
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Mon Jul 22 11:59:31 2013 -0300

    Bug 8911: DBRev 3.12.01.005
    
    Advertise the users how to fix About Koha > Timeline for old instances.
    
    Sponsored-by: Universidad Nacional de Córdoba
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 2803bab669162aebf0c8f6360328842d2dfa2dc7
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Tue Jul 2 18:35:58 2013 -0300

    Bug 8911: make sure history.txt gets installed where history.txt can see it
    
    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.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 0fe3d053ffe0adc4fda4fdb660ed93203ecc02d8)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Fixed a trivial conflict in Makefile.PL (course reserves are not in 3.12)

commit 6b94a9a3406f7c1b58a88b54c598ad617b84ee52
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Jun 5 17:50:29 2013 +1200

    Bug 10411: add cache control headers for static resources (Debian package)
    
    This adds caching directives to the static resources so that the browser
    doesn't ask about them all the time.
    
    By default, Debian apache doesn't have the required module (mod_expires)
    enabled, and so this patch will have no effect. In order to enable this
    function, run:
    
    a2enmod expires
    
    and restart apache.
    
    Test Plan:
    * Using firebug or equivalent, load a page.
    * Note that none of the images, css, or js files have a Cache-Control or
      Expires header set.
    * Add this patch, redeploy the package with it (or overwrite the
      apache-share.conf file) enable the 'expires' module, restart apache.
    * Force-reload the page
    * Note that the images, css, js now have Cache-Control and Expires set
      for 12 hours into the future.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit be905428722522f1ace4e99d13ffcb5d11f65657)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.PL                            |    1 +
 about.pl                               |    4 ++--
 debian/templates/apache-shared.conf    |    7 +++++++
 debian/templates/koha-conf-site.xml.in |    1 +
 etc/koha-conf.xml                      |    1 +
 installer/data/mysql/updatedatabase.pl |    6 ++++++
 kohaversion.pl                         |    2 +-
 7 files changed, 19 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository