[DRE-commits] [ruby-wikicloth] 03/13: Update debian/copyright

[Per Andersson]

This is an automated email from the git hooks/post-receive script.

avtobiff-guest pushed a commit to branch master
in repository ruby-wikicloth.

commit 7e49a4194b17ff33e8caa73e08383873b4af465f
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu Feb 27 01:12:39 2014 +0100

    Update debian/copyright
    
    * Full copyright for sample documents
    * Update copyright years
---
 debian/copyright | 51 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index f1f476d..d5386a0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,7 @@ Upstream-Name: wikicloth
 Source: http://github.com/nricciar/wikicloth
 
 Files: *
- sample_documents/elements.wiki
- sample_documents/lua.wiki
- sample_documents/random.wiki
-Copyright: 2010-2013 David Ricciardi <nricciar at gmail.com>
+Copyright: 2010-2014 David Ricciardi <nricciar at gmail.com>
 License: Expat
 
 Files: lib/wikicloth/extensions/lua/*
@@ -28,12 +25,48 @@ License: Zlib
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 
-Files: sample_documents/*
-Copyright: 2001-2013 Wikipedia
-License: CC-BY-SA
+Files:
+ sample_documents/air_force_one.wiki
+ sample_documents/cheatsheet.wiki
+ sample_documents/george_washington.wiki
+ sample_documents/klaus_schulze.wiki
+ sample_documents/lists.wiki
+ sample_documents/pipe_trick.wiki
+ sample_documents/tv.wiki
+ sample_documents/wiki_tables.wiki
+Copyright:
+ https://en.wikipedia.org/w/index.php?title=Air_Force_One&action=history
+ https://en.wikipedia.org/w/index.php?title=Help:Cheatsheet&action=history
+ https://en.wikipedia.org/w/index.php?title=Talk:George_Washington&action=history
+ https://de.wikipedia.org/w/index.php?title=Klaus_Schulze&action=history
+ http://en.wikipedia.org/w/index.php?title=Help:List&action=history
+ http://en.wikipedia.org/w/index.php?title=Help:Pipe_trick&action=history
+ http://en.wikipedia.org/w/index.php?title=Television&action=history
+ http://en.wikipedia.org/w/index.php?title=Help:Wikitable&action=history
+License: CC-BY-SA-3.0
+
+Files: sample_documents/default.css
+Copyright: 2003-2014 Mediawiki Development Team
+License: GPL-2+
+ This package 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; version 2 or later.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: 2013 Per Andersson <avtobiff at gmail.com>
+Copyright: 2013-2014 Per Andersson <avtobiff at gmail.com>
 License: Expat
 
 License: Expat
@@ -56,7 +89,7 @@ License: Expat
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-License: CC-BY-SA
+License: CC-BY-SA-3.0
  THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
  COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
  COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-wikicloth.git