From 55d485045f43b52ccdbedbded2bfebb33b781d57 Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Mon, 13 Apr 2020 22:11:46 +0200 Subject: [PATCH] release 1.1.9.3 --- ChangeLog | 3 +++ VERSION | 2 +- debian/changelog | 11 +++++++++++ debian/control | 7 ++++--- debian/copyright | 10 +++++----- debian/davical.maintscript | 1 + debian/davical.postinst | 2 -- debian/davical.postrm | 2 -- debian/davical.preinst | 7 ------- debian/upstream/metadata | 4 ++-- htdocs/always.php | 4 ++-- 11 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 debian/davical.maintscript delete mode 100644 debian/davical.preinst diff --git a/ChangeLog b/ChangeLog index 2dfc002f..10223814 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2020-04-04 Florian Schlichting + * LSID logins were removed from AWL, drop related bits in davical + 2019-12-06 Florian Schlichting * use foreach() instead of deprecated each() (fixes #190) * HTTP_REFERER will usually be unset for caldav requests, prevent "Undefined index" warnings diff --git a/VERSION b/VERSION index 61522dda..087270d0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.9.2 +1.1.9.3 diff --git a/debian/changelog b/debian/changelog index e8600d80..4b99b5e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Mon, 13 Apr 2020 22:11:31 +0200 + davical (1.1.9.2-1) unstable; urgency=medium * New upstream release (closes: #934106) diff --git a/debian/control b/debian/control index cd045aeb..4d7be97b 100644 --- a/debian/control +++ b/debian/control @@ -4,13 +4,14 @@ Priority: optional Maintainer: Davical Development Team Uploaders: Andrew McMillan , Florian Schlichting -Standards-Version: 4.4.1 +Standards-Version: 4.5.0 Build-Depends: debhelper-compat (= 12), dh-exec, jdupes, - libawl-php (>= 0.60-1~), libawl-php (<< 0.61), + libawl-php (>= 0.61-1~), libawl-php (<< 0.62), gettext, doxygen, + rst2pdf, php-cli | php5-cli Vcs-Git: https://gitlab.com/davical-project/davical.git Vcs-Browser: https://gitlab.com/davical-project/davical @@ -19,7 +20,7 @@ Homepage: https://www.davical.org/ Package: davical Architecture: all 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, libyaml-perl, php | php5, diff --git a/debian/copyright b/debian/copyright index a51a46bf..594ef903 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Files: * Copyright: 2006 - 2013, Andrew McMillan 2006 - 2008, Catalyst IT Ltd 2008 - 2013, Morphoss Ltd - 2007 - 2019, Davical contributors (see CREDITS for details) + 2007 - 2020, Davical contributors (see CREDITS for details) License: GPL-2+ 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 2006 - 2008, Catalyst IT Ltd 2008 - 2013, Morphoss Ltd - 2007 - 2019, Davical contributors (see CREDITS for details) + 2007 - 2020, Davical contributors (see CREDITS for details) License: GPL-2 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 2006 - 2008, Catalyst IT Ltd 2008 - 2013, Morphoss Ltd - 2007 - 2019, Davical contributors (see CREDITS for details) + 2007 - 2020, Davical contributors (see CREDITS for details) License: GPL-3+ Files: inc/caldav-client-v2.php Copyright: 2006 - 2013, Andrew McMillan 2006 - 2008, Catalyst IT Ltd 2008 - 2013, Morphoss Ltd - 2007 - 2019, Davical contributors (see CREDITS for details) + 2007 - 2020, Davical contributors (see CREDITS for details) License: LGPL-3+ Files: inc/check_UTF8.php @@ -93,7 +93,7 @@ License: 3-clause-bsd Files: debian/* Copyright: 2006-2012, Andrew McMillan - 2014-2019, Florian Schlichting + 2014-2020, Florian Schlichting License: GPL-2+ License: GPL-2+ diff --git a/debian/davical.maintscript b/debian/davical.maintscript new file mode 100644 index 00000000..15409cd6 --- /dev/null +++ b/debian/davical.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical diff --git a/debian/davical.postinst b/debian/davical.postinst index f38a6a51..18215e85 100644 --- a/debian/davical.postinst +++ b/debian/davical.postinst @@ -14,8 +14,6 @@ case $1 in ;; esac -dpkg-maintscript-helper rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical -- "$@" - #DEBHELPER# # remove leftover /etc/davical/.keep directory, if empty (cf. #584185) diff --git a/debian/davical.postrm b/debian/davical.postrm index b2075186..49249379 100644 --- a/debian/davical.postrm +++ b/debian/davical.postrm @@ -7,8 +7,6 @@ PACKAGE=::package:: [ -n "${DEBUG}" ] && echo "PostRM Parameters: $@" -dpkg-maintscript-helper rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical -- "$@" - #DEBHELPER# # remove leftover /etc/davical/.keep directory, if empty (cf. #584185) diff --git a/debian/davical.preinst b/debian/davical.preinst deleted file mode 100644 index 89ab50e2..00000000 --- a/debian/davical.preinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -dpkg-maintscript-helper rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical -- "$@" - -#DEBHELPER# diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 2f85a3b6..8ae1a2c6 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,2 +1,2 @@ -Repository: https://gitlab.com/davical-project/davical.git -Repository-Browse: https://gitlab.com/davical-project/davical +Repository: https://gitlab.com/davical-project/davical +Bug-Database: https://gitlab.com/davical-project/davical/issues diff --git a/htdocs/always.php b/htdocs/always.php index d3e343e1..eeba14dc 100644 --- a/htdocs/always.php +++ b/htdocs/always.php @@ -286,8 +286,8 @@ if ( function_exists('awl_set_locale') ) { * */ $c->code_version = 0; -$c->want_awl_version = '0.60'; -$c->version_string = '1.1.9.2'; // The actual version # is replaced into that during the build /release process +$c->want_awl_version = '0.61'; +$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) ) { $c->code_major = $matches[1]; $c->code_minor = $matches[2];