[DRE-commits] [camping] 06/08: d/copyright: added missing parameter for jquery

[Jonas Genannt]

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

hggh-guest pushed a commit to branch master
in repository camping.

commit 5106ffa1b5fbb4ad2b8b5e0807863a71c07371c6
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Sat Aug 2 16:24:28 2014 +0200

    d/copyright: added missing parameter for jquery
---
 debian/copyright | 48 ++++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9435480..1f6413c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,20 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: camping
 Upstream-Conact: camping-list at rubyforge.org
-Source: http://camping.rubyforge.org/
+Source: http://camping.io/
 
 Files: *
-Copyright: 2006, Why the lucky stiff <why at whytheluckystiff.net>
+Copyright: 2006 Why the lucky stiff <why at whytheluckystiff.net>
 License: Expat
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to
-  deal in the Software without restriction, including without limitation the
-  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-  sell copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  .
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-  THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Files: extras/rdoc/generator/template/flipbook/js/jquery.js
+Copyright: 2008 John Resig (jquery.com)
+License: GPL-2+ and Expat
 
 Files: debian/*
-Copyright: 2011, Paul van Tilburg <paulvt at debian.org>
+Copyright: 2011 Paul van Tilburg <paulvt at debian.org>
+License: GPL-2+
+
 License: GPL-2+
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
@@ -33,7 +23,7 @@ License: GPL-2+
   .
   This program 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
+  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
@@ -42,3 +32,21 @@ License: GPL-2+
   .
   On Debian systems, the full text of the GNU General Public License
   version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+License: Expat
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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