nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-09-19 05:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

release 1.1.9.3

Browse Source
This commit is contained in:
Florian Schlichting 2020-04-13 22:11:46 +02:00
parent e64fd2b868
commit 55d485045f
11 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2020-04-04 Florian Schlichting <fsfs@debian.org>
* LSID logins were removed from AWL, drop related bits in davical
2019-12-06 Florian Schlichting <fsfs@debian.org> 2019-12-06 Florian Schlichting <fsfs@debian.org>
* use foreach() instead of deprecated each() (fixes #190) * use foreach() instead of deprecated each() (fixes #190)
* HTTP_REFERER will usually be unset for caldav requests, prevent "Undefined index" warnings * HTTP_REFERER will usually be unset for caldav requests, prevent "Undefined index" warnings

2
VERSION
View File

@ -1 +1 @@
1.1.9.2 1.1.9.3

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
davical (1.1.9.3-1) unstable; urgency=medium
* New upstream release to support AWL 0.61
* Restore rst2pdf dependency removed in 1.1.9.2
* Use d/davical.maintscript instead of individual calls to rm_conffile
* Amend d/upstream/metadata (add Bug-Database)
* Update copyright years
* Declare compliance with Debian Policy 4.5.0
-- Florian Schlichting <fsfs@debian.org> Mon, 13 Apr 2020 22:11:31 +0200
davical (1.1.9.2-1) unstable; urgency=medium davical (1.1.9.2-1) unstable; urgency=medium
* New upstream release (closes: #934106) * New upstream release (closes: #934106)

7
debian/control vendored
View File

@ -4,13 +4,14 @@ 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.4.1 Standards-Version: 4.5.0
Build-Depends: debhelper-compat (= 12), Build-Depends: debhelper-compat (= 12),
dh-exec, dh-exec,
jdupes, jdupes,
libawl-php (>= 0.60-1~), libawl-php (<< 0.61), libawl-php (>= 0.61-1~), libawl-php (<< 0.62),
gettext, gettext,
doxygen, doxygen,
rst2pdf,
php-cli | php5-cli php-cli | php5-cli
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
@ -19,7 +20,7 @@ Homepage: https://www.davical.org/
Package: davical Package: davical
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}, Depends: ${misc:Depends}, ${perl:Depends},
libawl-php (>= 0.60-1~), libawl-php (<< 0.61), libawl-php (>= 0.61-1~), libawl-php (<< 0.62),
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 - 2019, Davical contributors (see CREDITS for details) 2007 - 2020, 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 - 2019, Davical contributors (see CREDITS for details) 2007 - 2020, 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 - 2019, Davical contributors (see CREDITS for details) 2007 - 2020, 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 - 2019, Davical contributors (see CREDITS for details) 2007 - 2020, 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-2019, Florian Schlichting <fsfs@debian.org> 2014-2020, Florian Schlichting <fsfs@debian.org>
License: GPL-2+ License: GPL-2+
License: GPL-2+ License: GPL-2+

1
debian/davical.maintscript vendored Normal file
View File

@ -0,0 +1 @@
rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical

2
debian/davical.postinst vendored
View File

@ -14,8 +14,6 @@ case $1 in
;; ;;
esac esac
dpkg-maintscript-helper rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical -- "$@"
#DEBHELPER# #DEBHELPER#
# remove leftover /etc/davical/.keep directory, if empty (cf. #584185) # remove leftover /etc/davical/.keep directory, if empty (cf. #584185)

2
debian/davical.postrm vendored
View File

@ -7,8 +7,6 @@ PACKAGE=::package::
[ -n "${DEBUG}" ] && echo "PostRM Parameters: $@" [ -n "${DEBUG}" ] && echo "PostRM Parameters: $@"
dpkg-maintscript-helper rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical -- "$@"
#DEBHELPER# #DEBHELPER#
# remove leftover /etc/davical/.keep directory, if empty (cf. #584185) # remove leftover /etc/davical/.keep directory, if empty (cf. #584185)

7
debian/davical.preinst vendored
View File

@ -1,7 +0,0 @@
#!/bin/sh
set -e
dpkg-maintscript-helper rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical -- "$@"
#DEBHELPER#

4
debian/upstream/metadata vendored
View File

@ -1,2 +1,2 @@
Repository: https://gitlab.com/davical-project/davical.git Repository: https://gitlab.com/davical-project/davical
Repository-Browse: https://gitlab.com/davical-project/davical Bug-Database: https://gitlab.com/davical-project/davical/issues

4
htdocs/always.php
View File

@ -286,8 +286,8 @@ if ( function_exists('awl_set_locale') ) {
* *
*/ */
$c->code_version = 0; $c->code_version = 0;
$c->want_awl_version = '0.60'; $c->want_awl_version = '0.61';
$c->version_string = '1.1.9.2'; // The actual version # is replaced into that during the build /release process $c->version_string = '1.1.9.3'; // 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];