From 44e05edaf47ed6fc7ec844cdfbd213958a095a9c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 16 Oct 2014 23:28:23 +0100 Subject: [PATCH 1/1] debian: fix some wrong paths in the copyright file --- debian/changelog | 1 + debian/copyright | 22 +++++++++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f3589dbe..eb1be5880 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ ikiwiki (3.20141016) UNRELEASED; urgency=medium * debian: explicitly depend and build-depend on libcgi-pm-perl * debian: drop unused python-support dependency * debian: rename debian/link to debian/links so the intended symlinks appear + * debian: fix some wrong paths in the copyright file -- Simon McVittie Tue, 16 Sep 2014 11:21:16 +0100 diff --git a/debian/copyright b/debian/copyright index f3ea9e740..09febb6e5 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/underlay/* + ikiwiki.setup po/underlays/* Copyright: © 2006-2010 Joey Hess License: other Redistribution and use in source and compiled forms, with or without @@ -71,10 +71,6 @@ Files: IkiWiki/Plugin/img.pm Copyright: © 2006 Christian Mock License: GPL-2+ -Files: IkiWiki/Plugin/topography.pm -Copyright: © 2006 Recai Oktaş -License: GPL-2+ - Files: IkiWiki/Plugin/map.pm Copyright: © 2006 Alessandro Dotti Contra License: GPL-2+ @@ -191,7 +187,7 @@ License: GPL-2+ Smileys were copied from Moin Moin. Files: doc/smileys/neutral.png - doc/smileys/question.pn + doc/smileys/question.png Copyright: (c) 2002 phpBB Group License: GPL-2 These smileys were copied from phpBB. @@ -244,23 +240,23 @@ Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer © 2011 The Dojo Foundation License: GPL-2 -Files: underlays/attachments/ikiwiki/jquery-ui* +Files: underlays/attachment/ikiwiki/jquery-ui* Copyright: © 2008 Paul Bakaus © 2011 the jQuery UI Authors (http://jqueryui.com/about) License: GPL-2 -Files: underlays/attachments/ikiwiki/jquery.tmpl* +Files: underlays/attachment/ikiwiki/jquery.tmpl* Copyright: © Boris Moore License: GPL-2 -Files: underlays/attachments/ikiwiki/ +Files: underlays/attachment/ikiwiki/* Copyright: 2010, 2011 Sebastian Tschan Comment: blueimp / jQuery-File-Upload widget, from https://github.com/blueimp/jQuery-File-Upload License: Expat -Files: underlays/themes/blueview/style.css +Files: themes/blueview/style.css Copyright: © 2009,2010 Bernd Zeimetz © 2008 Yahoo! Inc. Comment: @@ -268,15 +264,15 @@ Comment: http://developer.yahoo.com/yui/license.html License: GPL-2+ -Files: underlays/themes/blueview/* +Files: themes/blueview/* Copyright: © 2009,2010 Bernd Zeimetz License: GPL-2+ -Files: underlays/themes/goldtype/* +Files: themes/goldtype/* Copyright: © Lars Wirzenius License: GPL-2+ -Files: underlays/themes/monochrome/* +Files: themes/monochrome/* Copyright: © 2012 Jon Dowland License: GPL-2+ -- 2.44.0