release davical 1.1.13

This commit is contained in:
Florian Schlichting 2026-05-11 22:14:24 +02:00
parent d4dc174543
commit c3591225c5
7 changed files with 47 additions and 22 deletions

View File

@ -1 +1 @@
1.1.12 1.1.13

26
debian/changelog vendored
View File

@ -1,3 +1,21 @@
davical (1.1.13-1) unstable; urgency=medium
[ Andrew Ruthven ]
* New upstream release (Closes: #1040996, #1054143)
[ Florian Schlichting ]
* Acknowledge NMUs by David Prévot - thank you! (closes: #1121419)
* Depend on AWL 0.65
* Update copyright years
* Drop redundant "Priority: optional" and "Rules-Requires-Root: no" fields
in debian/control
* Update Doxyfile using "doxygen -u"
* Add graphviz to Build-Depends, our doxygen config needs "dot"
* Update debian/watch to version 5 (Gitlab template)
* Declare compliance with Debian Policy 4.7.4
-- Florian Schlichting <fsfs@debian.org> Mon, 11 May 2026 23:00:17 +0200
davical (1.1.12-2.3) unstable; urgency=medium davical (1.1.12-2.3) unstable; urgency=medium
* Non-maintainer upload * Non-maintainer upload
@ -19,11 +37,13 @@ davical (1.1.12-2.1) unstable; urgency=medium
-- David Prévot <taffit@debian.org> Tue, 14 Jan 2025 13:45:14 +0100 -- David Prévot <taffit@debian.org> Tue, 14 Jan 2025 13:45:14 +0100
davical (1.1.13-1) UNRELEASED; urgency=medium davical (1.1.12-2) unstable; urgency=medium
* New upstream release (Closes: #1040996) * Cherry-pick two bug fixes from upstream:
+ use "." to concatenate strings, not "+" (gitlab #288)
+ Add a missing space to a SQL statement to fix adding groups (gitlab #294)
-- Andrew Ruthven <andrew@etc.gen.nz> Mon, 23 Oct 2023 17:57:01 +1300 -- Florian Schlichting <fsfs@debian.org> Mon, 01 May 2023 00:29:20 +0200
davical (1.1.12-1) unstable; urgency=medium davical (1.1.12-1) unstable; urgency=medium

9
debian/control vendored
View File

@ -1,27 +1,26 @@
Source: davical Source: davical
Section: web Section: web
Priority: optional
Maintainer: Davical Development Team <davical-devel@lists.sourceforge.net> Maintainer: Davical Development Team <davical-devel@lists.sourceforge.net>
Uploaders: Andrew McMillan <awm@debian.org>, Uploaders: Andrew McMillan <awm@debian.org>,
Florian Schlichting <fsfs@debian.org> Florian Schlichting <fsfs@debian.org>
Standards-Version: 4.6.2 Standards-Version: 4.7.4
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 13),
dh-exec, dh-exec,
jdupes, jdupes,
libawl-php (>= 0.64-1~), libawl-php (<< 0.65), libawl-php (>= 0.65-1~), libawl-php (<< 0.66),
gettext, gettext,
doxygen, doxygen,
graphviz,
php-cli | php5-cli, php-cli | php5-cli,
phpunit phpunit
Vcs-Git: https://gitlab.com/davical-project/davical.git Vcs-Git: https://gitlab.com/davical-project/davical.git
Vcs-Browser: https://gitlab.com/davical-project/davical Vcs-Browser: https://gitlab.com/davical-project/davical
Homepage: https://www.davical.org/ Homepage: https://www.davical.org/
Rules-Requires-Root: no
Package: davical Package: davical
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}, Depends: ${misc:Depends}, ${perl:Depends},
libawl-php (>= 0.64-1~), libawl-php (<< 0.65), libawl-php (>= 0.65-1~), libawl-php (<< 0.66),
libdbd-pg-perl, libdbd-pg-perl,
libyaml-perl, libyaml-perl,
php | php5, php | php5,

10
debian/copyright vendored
View File

@ -7,7 +7,7 @@ Files: *
Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz> Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
2006 - 2008, Catalyst IT Ltd 2006 - 2008, Catalyst IT Ltd
2008 - 2013, Morphoss Ltd 2008 - 2013, Morphoss Ltd
2007 - 2023, Davical contributors (see CREDITS for details) 2007 - 2026, Davical contributors (see CREDITS for details)
License: GPL-2+ License: GPL-2+
Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php
@ -18,7 +18,7 @@ Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php
Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz> Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
2006 - 2008, Catalyst IT Ltd 2006 - 2008, Catalyst IT Ltd
2008 - 2013, Morphoss Ltd 2008 - 2013, Morphoss Ltd
2007 - 2023, Davical contributors (see CREDITS for details) 2007 - 2026, Davical contributors (see CREDITS for details)
License: GPL-2 License: GPL-2
Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php
@ -28,14 +28,14 @@ Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php
Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz> Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
2006 - 2008, Catalyst IT Ltd 2006 - 2008, Catalyst IT Ltd
2008 - 2013, Morphoss Ltd 2008 - 2013, Morphoss Ltd
2007 - 2023, Davical contributors (see CREDITS for details) 2007 - 2026, Davical contributors (see CREDITS for details)
License: GPL-3+ License: GPL-3+
Files: inc/caldav-client-v2.php Files: inc/caldav-client-v2.php
Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz> Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
2006 - 2008, Catalyst IT Ltd 2006 - 2008, Catalyst IT Ltd
2008 - 2013, Morphoss Ltd 2008 - 2013, Morphoss Ltd
2007 - 2023, Davical contributors (see CREDITS for details) 2007 - 2026, Davical contributors (see CREDITS for details)
License: LGPL-3+ License: LGPL-3+
Files: inc/check_UTF8.php Files: inc/check_UTF8.php
@ -93,7 +93,7 @@ License: 3-clause-bsd
Files: debian/* Files: debian/*
Copyright: 2006-2012, Andrew McMillan <awm@debian.org> Copyright: 2006-2012, Andrew McMillan <awm@debian.org>
2014-2023, Florian Schlichting <fsfs@debian.org> 2014-2026, Florian Schlichting <fsfs@debian.org>
License: GPL-2+ License: GPL-2+
License: GPL-2+ License: GPL-2+

7
debian/watch vendored
View File

@ -1,2 +1,5 @@
version=4 Version: 5
https://gitlab.com/davical-project/davical/tags?sort=updated_desc \/davical-project\/davical\/-\/archive\/r([\d.]+)\/davical-r[\d.]+\.tar\.gz
Template: GitLab
Dist: https://gitlab.com/davical-project/davical
Matching-Pattern: r(\d[\-+\.:\~\da-zA-Z]*)

View File

@ -161,10 +161,6 @@ $c->template_usr = array( 'active' => true,
$c->hide_TODO = true; // VTODO only visible to collection owner $c->hide_TODO = true; // VTODO only visible to collection owner
$c->readonly_webdav_collections = true; // WebDAV access is readonly $c->readonly_webdav_collections = true; // WebDAV access is readonly
// Any many times GetMoreInstances in inc/RRule.php should loop trying to
// find more instances.
$c->rrule_loop_limit = 100;
// Authentication caching details // Authentication caching details
$c->auth_cache = false; // Default to off $c->auth_cache = false; // Default to off
$c->auth_cache_pass = 0; // Default to off $c->auth_cache_pass = 0; // Default to off
@ -173,6 +169,13 @@ $c->auth_cache_fail = 0; // Default to off
// Kind of private configuration values // Kind of private configuration values
$c->total_query_time = 0; $c->total_query_time = 0;
// How many times GetMoreInstances in inc/RRule.php should loop trying to
// find more instances.
$c->rrule_loop_limit = 100;
// Kind of private configuration values
$c->total_query_time = 0;
// Are we in test mode? // Are we in test mode?
$c->test_mode = false; $c->test_mode = false;
@ -308,7 +311,7 @@ if ( function_exists('awl_set_locale') ) {
*/ */
$c->code_version = 0; $c->code_version = 0;
$c->want_awl_version = '0.65'; $c->want_awl_version = '0.65';
$c->version_string = '1.1.12'; // The actual version # is replaced into that during the build /release process $c->version_string = '1.1.13'; // 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) ) { if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
$c->code_major = $matches[1]; $c->code_major = $matches[1];
$c->code_minor = $matches[2]; $c->code_minor = $matches[2];

View File

@ -169,7 +169,7 @@ $c->auth_cache_fail = 0; // Default to off
// Kind of private configuration values // Kind of private configuration values
$c->total_query_time = 0; $c->total_query_time = 0;
// Any many times GetMoreInstances in inc/RRule.php should loop trying to // How many times GetMoreInstances in inc/RRule.php should loop trying to
// find more instances. // find more instances.
$c->rrule_loop_limit = 100; $c->rrule_loop_limit = 100;