prepare for 1.1.4

This commit is contained in:
Florian Schlichting 2016-01-03 18:18:31 +01:00
parent b8512ad520
commit af1707ef1d
5 changed files with 18 additions and 6 deletions

View File

@ -1 +1 @@
1.1.3.1
1.1.4

View File

@ -1,6 +1,8 @@
TRUNCATE supported_locales;
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'en', 'English', 'English' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'ar', 'Arabic', 'العَرَبِية' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'de', 'German', 'Deutsch' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
@ -13,6 +15,8 @@ INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'es_VE', 'Spanish (Venezuela)', 'Español (Venezuela)' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'et', 'Estonian', 'Eesti' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'fi', 'Finnish', 'Suomi' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'fr', 'French', 'Français' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
@ -21,6 +25,8 @@ INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'it', 'Italian', 'Italiano' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'ja', 'Japanese', '日本語' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'ko_KR', 'Korean (Korea)', '한국어' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'nb', 'Norwegian', 'Bokmål' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
@ -33,5 +39,7 @@ INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'pt_PT', 'Portuguese', 'Portuguese' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'ru', 'Russian', 'Русский' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'sk_SK', 'Slovak (Slovakia)', 'Slovenčina' );
INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
VALUES( 'sv', 'Swedish', 'Svenska' );

6
debian/changelog vendored
View File

@ -1,7 +1,11 @@
davical (1.1.4~pre-1) UNRELEASED; urgency=medium
davical (1.1.4-1~git) UNRELEASED; urgency=medium
* New upstream release (closes: ...)
* Ship all config examples and user documentation, but remove website
references since it was moved to its own git repository.
* Don't run make / make built-docs during package build to avoid nasty
surprises; files should be up-to-date in git anyway
* Purge /etc/davical/.keep directory
-- Florian Schlichting <fsfs@debian.org> Tue, 16 Dec 2014 22:43:07 +0100

4
debian/control vendored
View File

@ -6,7 +6,7 @@ Uploaders: Andrew McMillan <awm@debian.org>,
Florian Schlichting <fsfs@debian.org>
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9),
libawl-php (>= 0.55-1~), libawl-php (<< 0.56),
libawl-php (>= 0.56-1~), libawl-php (<< 0.57),
gettext,
php5-cli,
rst2pdf
@ -17,7 +17,7 @@ Homepage: http://www.davical.org/
Package: davical
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends},
libawl-php (>= 0.55-1~), libawl-php (<< 0.56),
libawl-php (>= 0.56-1~), libawl-php (<< 0.57),
libdbd-pg-perl,
libyaml-perl,
php5,

View File

@ -204,7 +204,7 @@ if ( function_exists('awl_set_locale') ) {
*/
$c->code_version = 0;
$c->want_awl_version = '0.56';
$c->version_string = '1.1.3.1'; // The actual version # is replaced into that during the build /release process
$c->version_string = '1.1.4'; // The actual version # is replaced into that during the build /release process
if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
$c->code_major = $matches[1];
$c->code_minor = $matches[2];
@ -221,7 +221,7 @@ $_SERVER['SERVER_NAME'] = $c->domain_name;
require_once('AwlQuery.php');
$c->want_dbversion = array(1,2,11);
$c->want_dbversion = array(1,2,12);
$c->schema_version = 0;
$qry = new AwlQuery( 'SELECT schema_major, schema_minor, schema_patch FROM awl_db_revision ORDER BY schema_id DESC LIMIT 1;' );
if ( $qry->Exec('always',__LINE__,__FILE__) && $row = $qry->Fetch() ) {