From 1f8a4a93bef6ab64f66ee046459af5e08e07eb39 Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Sun, 14 Sep 2014 21:33:37 +0200 Subject: [PATCH] Switch d/copyright to copyright-format 1.0, amend CREDITS from git log --- CREDITS | 45 +++++++++++++++- Makefile | 4 +- debian/copyright | 132 ++++++++++++++++++++++++++++++++++------------- 3 files changed, 141 insertions(+), 40 deletions(-) diff --git a/CREDITS b/CREDITS index d8d9bb67..a1dd165b 100644 --- a/CREDITS +++ b/CREDITS @@ -18,4 +18,47 @@ And a big thank you to the translators: Many other people have contributed bug reports, fixes and in many small ways. These are acknowledged in the changelog -and version control history. +and version control history: + +Aiko Barz +Andrew McMillan +Andrew Ruthven +Aurelien Requiem +Christian Kier +Christoph Anton Mitterer +Cyril Giraud +Daniel Aleksandersen +DAViCal Administrator +Dávid Takács +Emmanuel Seyman +fbiete@gmail.com +Felix Möller +Florian Schlichting +Francois Marier +Francois Perichon +Frank Steinberg +Henri Sivonen +Ján Máté +Jason Alavaliant +Jens Zahner +Jeppe Bob Dyrby +Jeroen van Disseldorp +Jim Fenton +Jim Hague +lebarjack +Leho Kraav +Masahiro Mikami +Matthias Althaus +Matthias Beyer +Matthias Mohr +Maxime Delorme +Michael Trausch +Milan Medlik +Patrick Näf Moser +Paul Willoughby +Peter Schaefer-Hutter +Philipp Matthias Hahn +Raphael Hertzog +Rob Ostensen +Vincent Van Houtte +Wolfgang Herget diff --git a/Makefile b/Makefile index 56002fc7..21952e67 100755 --- a/Makefile +++ b/Makefile @@ -55,8 +55,8 @@ snapshot: release clean: rm -f built-docs built-po -find . -name "*~" -delete - -rm docs/translation.pdf - -rm davical.spec + rm -f docs/translation.pdf + rm -f davical.spec .PHONY: clean-all clean-all: clean diff --git a/debian/copyright b/debian/copyright index 5e9e0932..b7f165fa 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,47 +1,105 @@ -This package was debianized by Andrew McMillan +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://gitlab.com/davical-project/davical +Upstream-Name: davical +Upstream-Contact: davical-devel@lists.sourceforge.net -It was downloaded from http://debian.mcmillan.net.nz/packages/davical/ +Files: * +Copyright: 2006 - 2013, Andrew McMillan + 2006 - 2008, Catalyst IT Ltd + 2008 - 2013, Morphoss Ltd + 2007 - 2014, Davical contributors (see CREDITS for details) +License: GPL-2+ -Upstream Author: Andrew McMillan +Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php + inc/pubsub.php inc/caldav-MKCOL.php inc/log_caldav_action.php + inc/caldav-ACL.php inc/caldav-PROPPATCH.php inc/RRule.php + inc/HTTPAuthSession.php inc/caldav-client.php inc/DAViCalSession.php + inc/caldav-REPORT.php inc/caldav-MOVE.php +Copyright: 2006 - 2013, Andrew McMillan + 2006 - 2008, Catalyst IT Ltd + 2008 - 2013, Morphoss Ltd + 2007 - 2014, Davical contributors (see CREDITS for details) +License: GPL-2 -Copyright: 2006-2011 Andrew McMillan +Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php + inc/DAVResource.php inc/external-fetch.php inc/DAVTicket.php + inc/iSchedule.php inc/tz/* scripts/tz-update.php scripts/refresh-alarms.php + scripts/archive-old-events.php +Copyright: 2006 - 2013, Andrew McMillan + 2006 - 2008, Catalyst IT Ltd + 2008 - 2013, Morphoss Ltd + 2007 - 2014, Davical contributors (see CREDITS for details) +License: GPL-3+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. +Files: inc/caldav-client-v2.php +Copyright: 2006 - 2013, Andrew McMillan + 2006 - 2008, Catalyst IT Ltd + 2008 - 2013, Morphoss Ltd + 2007 - 2014, Davical contributors (see CREDITS for details) +License: LGPL-3+ - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +Files: inc/check_UTF8.php +Copyright: 1998, Netscape Communications Corporation + 2003, Henri Sivonen, hsivonen@iki.fi +License: NPL-1.1_or_GPL-2+_or_LGPL-2.1+ + The contents of this file are subject to the Netscape Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/NPL/ + . + Software distributed under the License is distributed on an "AS IS" basis, + WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + for the specific language governing rights and limitations under the + License. + . + Alternatively, the contents of this file may be used under the terms of + either the GNU General Public License Version 2 or later (the "GPL"), or + the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + in which case the provisions of the GPL or the LGPL are applicable instead + of those above. If you wish to allow use of your version of this file only + under the terms of either the GPL or the LGPL, and not to allow others to + use your version of this file under the terms of the NPL, indicate your + decision by deleting the provisions above and replace them with the notice + and other provisions required by the GPL or the LGPL. If you do not delete + the provisions above, a recipient may use your version of this file under + the terms of any one of the NPL, the GPL or the LGPL. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA +Files: debian/* +Copyright: 2006-2012, Andrew McMillan + 2014, Florian Schlichting +License: GPL-2+ -You are free to distribute this software under the terms of the GNU General -Public License. On Debian systems, the complete text of the GNU General -Public License can be found in /usr/share/common-licenses/GPL file. +License: GPL-2+ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. +License: GPL-2 + This program is free software; you can redistribute it and/or modify it + under the terms of version 2 of the GNU General Public License as + published by the Free Software Foundation. + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. -License for Translation Building code -===================================== -The following files inherit their license separately: - scripts/po/extract.pl - scripts/po/rebuild-translations.sh +License: GPL-3+ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 3, or (at your option) any + later version. + . + On Debian systems, the complete text of version 3 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-3'. -The process used for building the translations for DAViCal is based on -prior code originally from the Horde project and subsequently from the -Gallery project. It has also been somewhat further modified here. - -The applicable Horde license is the LGPL, as identified here: - http://cvs.horde.org/co.php/horde/COPYING?r=2.1 - -Authors: - Copyright 2000-2002 Joris Braakman - Copyright 2001-2002 Chuck Hagenbuch - Copyright 2001-2002 Jan Schneider - Copyright 2002-2003 Bharat Mediratta - Copyright 2006-2008 Andrew McMillan +License: LGPL-3+ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 3, or (at your option) + any later version. + . + On Debian systems, the complete text of version 3 of the GNU Lesser + General Public License can be found in `/usr/share/common-licenses/LGPL-3'.