From da379611b8ec50ea0aecdd53239a638c81fd2ed2 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 6 Jan 2018 21:47:01 +0000 Subject: [PATCH] d/copyright: Drop stanzas for files no longer shipped --- debian/changelog | 1 + debian/copyright | 26 +------------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index e59260586..d12e748a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.20180105-1) UNRELEASED; urgency=medium - d/source/format: set to 3.0 (quilt) - d/watch: Look for new releases in upstream git * New upstream release + - d/copyright: Drop stanzas for files no longer shipped -- Simon McVittie Sat, 06 Jan 2018 15:14:29 +0000 diff --git a/debian/copyright b/debian/copyright index be971e18a..a25660adf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ Copyright: © 2006-2011 Joey Hess License: GPL-2+ Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/* - ikiwiki.setup po/underlays/* underlays/javascript/* + po/underlays/* underlays/javascript/* Copyright: © 2006-2010 Joey Hess License: permissive @@ -203,13 +203,6 @@ Comment: Based on https://code.google.com/archive/p/openid-selector/ License: BSD-2-clause -Files: underlays/login-selector/ikiwiki/login-selector/goa-* -Copyright: - © 2011 Red Hat, Inc. -License: LGPL-2.1+ -Comment: - taken from data/icons/16x16/ in gnome-online-accounts git - Files: underlays/jquery/* Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer © 2011 The Dojo Foundation @@ -314,23 +307,6 @@ License: Expat OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -License: LGPL-2.1+ - This library 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 2.1 of the License, or (at your option) any later version. - . - This library 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 - Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU Lesser General - Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. - License: public-domain Public Domain Dedication . -- 2.39.2