debian: fix some wrong paths in the copyright file

diff --git a/debian/changelog b/debian/changelog
index 7f3589dbecfab690e5fd4e2cb437e2821c450d62..eb1be58803e4930709262e1f0caba0b961dbfc7c 100644 (file)
--- 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: 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 <smcv@debian.org>  Tue, 16 Sep 2014 11:21:16 +0100
 
 
  -- Simon McVittie <smcv@debian.org>  Tue, 16 Sep 2014 11:21:16 +0100
 

diff --git a/debian/copyright b/debian/copyright
index f3ea9e740d4ad50d46008ea5890360996596f9f8..09febb6e5e298900c9663eee108013948048c197 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/*
 License: GPL-2+
 
 Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*

- ikiwiki.setup po/underlay/*
+ ikiwiki.setup po/underlays/*

 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 License: other
  Redistribution and use in source and compiled forms, with or without
 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 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 <cm@tahina.priv.at>
 License: GPL-2+
 
 Copyright: © 2006 Christian Mock <cm@tahina.priv.at>
 License: GPL-2+
 

-Files: IkiWiki/Plugin/topography.pm
-Copyright: © 2006 Recai Oktaş <roktas@debian.org>
-License: GPL-2+
-

 Files: IkiWiki/Plugin/map.pm
 Copyright: © 2006 Alessandro Dotti Contra
 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
  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.
 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
 
            © 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
 
 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
 
 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
 
 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:
 Copyright: © 2009,2010 Bernd Zeimetz
            © 2008 Yahoo! Inc.
 Comment:


@@ -268,15 +264,15 @@ Comment:
  http://developer.yahoo.com/yui/license.html
 License: GPL-2+
 
  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+
 
 Copyright: © 2009,2010 Bernd Zeimetz
 License: GPL-2+
 

-Files: underlays/themes/goldtype/*
+Files: themes/goldtype/*

 Copyright: © Lars Wirzenius
 License: GPL-2+
 
 Copyright: © Lars Wirzenius
 License: GPL-2+
 

-Files: underlays/themes/monochrome/*
+Files: themes/monochrome/*

 Copyright: © 2012 Jon Dowland
 License: GPL-2+
 
 Copyright: © 2012 Jon Dowland
 License: GPL-2+