[koha-commits] main Koha release repository branch master updated. v3.12.00-alpha2-166-gb9db6ae

[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, master has been updated
       via  b9db6ae0f75b68b0788fd079589f30620fc0ff63 (commit)
      from  8a97ab05a8923f81d88f209a74aa88b9d466dca8 (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 b9db6ae0f75b68b0788fd079589f30620fc0ff63
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Sat Mar 23 00:36:37 2013 -0400

    Revert "Merge branch 'bug_7688' into 3.12-master"
    
    This reverts commit 60508cb03d825f515461c1898361ac0eb3cffb2b, reversing
    changes made to 8579d07f1474a2393e518b66e9aa6c3464ab2e81.
    
    The patches for bug 7688 caused a failure in t/db_dependent/Serials.t:
    not ok 8 - test getting history from sub-scription
    
    Conflicts:
    
    	installer/data/mysql/kohastructure.sql
    	installer/data/mysql/updatedatabase.pl
    	kohaversion.pl

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

Summary of changes:
 C4/Serials.pm                                      |  980 ++++------
 C4/Serials/Frequency.pm                            |  292 ---
 C4/Serials/Numberpattern.pm                        |  289 ---
 .../mysql/de-DE/optional/sample_frequencies.sql    |   16 -
 .../mysql/de-DE/optional/sample_frequencies.txt    |    1 -
 .../mysql/de-DE/optional/sample_numberpatterns.sql |   25 -
 .../mysql/de-DE/optional/sample_numberpatterns.txt |    1 -
 .../data/mysql/en/optional/sample_frequencies.sql  |   16 -
 .../data/mysql/en/optional/sample_frequencies.txt  |    1 -
 .../mysql/en/optional/sample_numberpatterns.sql    |   25 -
 .../mysql/en/optional/sample_numberpatterns.txt    |    1 -
 .../mysql/es-ES/optional/sample_frequencies.sql    |   16 -
 .../mysql/es-ES/optional/sample_frequencies.txt    |    1 -
 .../mysql/es-ES/optional/sample_numberpatterns.sql |   25 -
 .../mysql/es-ES/optional/sample_numberpatterns.txt |    1 -
 .../mysql/fr-FR/2-Optionel/sample_frequencies.sql  |   16 -
 .../mysql/fr-FR/2-Optionel/sample_frequencies.txt  |    1 -
 .../fr-FR/2-Optionel/sample_numberpatterns.sql     |   25 -
 .../fr-FR/2-Optionel/sample_numberpatterns.txt     |    1 -
 .../mysql/it-IT/optional/sample_frequencies.sql    |   16 -
 .../mysql/it-IT/optional/sample_frequencies.txt    |    1 -
 .../mysql/it-IT/optional/sample_numberpatterns.sql |   25 -
 .../mysql/it-IT/optional/sample_numberpatterns.txt |    1 -
 installer/data/mysql/kohastructure.sql             |   74 +-
 .../mysql/nb-NO/2-Valgfritt/sample_frequencies.sql |   16 -
 .../mysql/nb-NO/2-Valgfritt/sample_frequencies.txt |    1 -
 .../nb-NO/2-Valgfritt/sample_numberpatterns.sql    |   25 -
 .../nb-NO/2-Valgfritt/sample_numberpatterns.txt    |    1 -
 .../mysql/pl-PL/optional/sample_frequencies.sql    |   16 -
 .../mysql/pl-PL/optional/sample_frequencies.txt    |    1 -
 .../mysql/pl-PL/optional/sample_numberpatterns.sql |   25 -
 .../mysql/pl-PL/optional/sample_numberpatterns.txt |    1 -
 .../mysql/ru-RU/optional/sample_frequencies.sql    |   16 -
 .../mysql/ru-RU/optional/sample_frequencies.txt    |    1 -
 .../mysql/ru-RU/optional/sample_numberpatterns.sql |   25 -
 .../mysql/ru-RU/optional/sample_numberpatterns.txt |    1 -
 .../mysql/uk-UA/optional/sample_frequencies.sql    |   16 -
 .../mysql/uk-UA/optional/sample_frequencies.txt    |    1 -
 .../mysql/uk-UA/optional/sample_numberpatterns.sql |   25 -
 .../mysql/uk-UA/optional/sample_numberpatterns.txt |    1 -
 installer/data/mysql/updatedatabase.pl             |  253 ---
 .../prog/en/includes/serials-menu.inc              |   10 -
 .../prog/en/modules/serials/serials-collection.tt  |   63 +-
 .../en/modules/serials/showpredictionpattern.tt    |   82 -
 .../prog/en/modules/serials/subscription-add.tt    | 2016 +++++++++++++-------
 .../prog/en/modules/serials/subscription-detail.tt |  143 ++-
 .../en/modules/serials/subscription-frequencies.tt |  215 ---
 .../en/modules/serials/subscription-history.tt     |   60 -
 .../modules/serials/subscription-numberpatterns.tt |  333 ----
 serials/create-numberpattern.pl                    |   42 -
 serials/serials-collection.pl                      |   70 +-
 serials/serials-recieve.pl                         |    9 +-
 serials/showpredictionpattern.pl                   |  194 --
 serials/subscription-add.pl                        |  254 +--
 serials/subscription-detail.pl                     |   20 +-
 serials/subscription-frequencies.pl                |  120 --
 serials/subscription-frequency.pl                  |   19 -
 serials/subscription-history.pl                    |   87 -
 serials/subscription-numberpattern.pl              |   15 -
 serials/subscription-numberpatterns.pl             |  150 --
 60 files changed, 2010 insertions(+), 4167 deletions(-)
 delete mode 100644 C4/Serials/Frequency.pm
 delete mode 100644 C4/Serials/Numberpattern.pm
 delete mode 100644 installer/data/mysql/de-DE/optional/sample_frequencies.sql
 delete mode 100644 installer/data/mysql/de-DE/optional/sample_frequencies.txt
 delete mode 100644 installer/data/mysql/de-DE/optional/sample_numberpatterns.sql
 delete mode 100644 installer/data/mysql/de-DE/optional/sample_numberpatterns.txt
 delete mode 100644 installer/data/mysql/en/optional/sample_frequencies.sql
 delete mode 100644 installer/data/mysql/en/optional/sample_frequencies.txt
 delete mode 100644 installer/data/mysql/en/optional/sample_numberpatterns.sql
 delete mode 100644 installer/data/mysql/en/optional/sample_numberpatterns.txt
 delete mode 100644 installer/data/mysql/es-ES/optional/sample_frequencies.sql
 delete mode 100644 installer/data/mysql/es-ES/optional/sample_frequencies.txt
 delete mode 100644 installer/data/mysql/es-ES/optional/sample_numberpatterns.sql
 delete mode 100644 installer/data/mysql/es-ES/optional/sample_numberpatterns.txt
 delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.sql
 delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.txt
 delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.sql
 delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.txt
 delete mode 100644 installer/data/mysql/it-IT/optional/sample_frequencies.sql
 delete mode 100644 installer/data/mysql/it-IT/optional/sample_frequencies.txt
 delete mode 100644 installer/data/mysql/it-IT/optional/sample_numberpatterns.sql
 delete mode 100644 installer/data/mysql/it-IT/optional/sample_numberpatterns.txt
 delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.sql
 delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.txt
 delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.sql
 delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.txt
 delete mode 100644 installer/data/mysql/pl-PL/optional/sample_frequencies.sql
 delete mode 100644 installer/data/mysql/pl-PL/optional/sample_frequencies.txt
 delete mode 100644 installer/data/mysql/pl-PL/optional/sample_numberpatterns.sql
 delete mode 100644 installer/data/mysql/pl-PL/optional/sample_numberpatterns.txt
 delete mode 100644 installer/data/mysql/ru-RU/optional/sample_frequencies.sql
 delete mode 100644 installer/data/mysql/ru-RU/optional/sample_frequencies.txt
 delete mode 100644 installer/data/mysql/ru-RU/optional/sample_numberpatterns.sql
 delete mode 100644 installer/data/mysql/ru-RU/optional/sample_numberpatterns.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/sample_frequencies.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/sample_frequencies.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/sample_numberpatterns.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/sample_numberpatterns.txt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
 delete mode 100755 serials/create-numberpattern.pl
 delete mode 100755 serials/showpredictionpattern.pl
 delete mode 100755 serials/subscription-frequencies.pl
 delete mode 100755 serials/subscription-frequency.pl
 delete mode 100755 serials/subscription-history.pl
 delete mode 100755 serials/subscription-numberpattern.pl
 delete mode 100755 serials/subscription-numberpatterns.pl


hooks/post-receive
-- 
main Koha release repository