d/copyright: Drop stanzas for files no longer shipped

diff --git a/debian/changelog b/debian/changelog
index e59260586eea44d11ff2e1d1b18ed1205c38dfbe..d12e748a7b3546f8e4292d4b499ff06afc598a85 100644 (file)
--- 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 <smcv@debian.org>  Sat, 06 Jan 2018 15:14:29 +0000
 

diff --git a/debian/copyright b/debian/copyright
index be971e18a3fb96719ee41e36284ad35e0dc725f8..a25660adfa17e54b58cc98e115b98a87969c3800 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright: © 2006-2011 Joey Hess <joey@ikiwiki.info>
 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 <joey@ikiwiki.info>
 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 <http://www.gnu.org/licenses/>.
- .
- 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
  .