[jruby-joni] 69/279: Correct the copyright file.

[Hideki Yamane]

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

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 91d3fcd845bf8c2a18e22b3558786496bd29f26f
Author: Torsten Werner <twerner at debian.org>
Date:   Sun Aug 1 22:17:01 2010 +0200

    Correct the copyright file.
---
 debian/changelog |  3 ++-
 debian/copyright | 67 ++++++++++++++++++++++++++------------------------------
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c22db6..7d1f43e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ jruby-joni (1.1.4-1) unstable; urgency=low
   * Push package to git and add Vcs headers.
   * Set Maintainer to Debian Java Maintainers.
   * Improve long description.
+  * Correct the copyright file.
 
- -- Torsten Werner <twerner at debian.org>  Sun, 01 Aug 2010 22:10:57 +0200
+ -- Torsten Werner <twerner at debian.org>  Sun, 01 Aug 2010 22:16:34 +0200
 
 jruby-joni (1.1.3-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 7f8fa79..ec1d669 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,32 @@
-This work was packaged for Debian by:
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: jony
+Maintainer: Thomas E. Enebo
+Source: http://github.com/jruby/joni/
+
+Copyright: 2008-2010 Marcin Mielżyński
+           2008-2010 Thomas E. Enebo
+License: other (MIT/X11)
+
+Files: debian/*
+Copyright: 2010 Torsten Werner <twerner at debian.org>
+License: other (MIT/X11)
+
+License: other (MIT/X11)
+ 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 OR COPYRIGHT HOLDERS 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.
 
-    Hideki Yamane (Debian-JP) <henrich at debian.or.jp> on Fri, 19 Mar 2010 10:32:00 +0900
-
-It was downloaded from:
-
-    <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Firstname Lastname>
-    <likewise for another author>
-
-License:
-
-    <Put the license of the package here indented by 4 spaces>
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Hideki Yamane (Debian-JP) <henrich at debian.or.jp>
-
-# Please chose a license for your packaging work. If the program you package
-# uses a mainstream license, using the same license is the safest choice.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-# If you just want it to be GPL version 3, leave the following lines in.
-
-and is licensed under the GPL version 3,
-see "/usr/share/common-licenses/GPL-3".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git