[DRE-commits] [SCM] ruby-usb.git branch, master, updated. upstream/0.2.1-10-g4b8d1dc

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 702176948cb68f4490f83987d079d726fe6cda6a
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed May 9 11:54:29 2012 +0200

    update DEP-5 copyright

diff --git a/debian/copyright b/debian/copyright
index cc16aa6..d3ae758 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,45 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ruby-usb
-Source: FIXME <http://example.com/>
+Source: http.a-k-r.org/ruby-usb/
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- 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 Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- 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 Public License for more
- details.
+Copyright: 2006-2007 Tanaka Akira <akr at fsij.org>
+License: LGPL-2.1
+
+Files: extconf.rb
+Copyright: 2006 Tanaka Akira <akr at fsij.org>
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2012 Cédric Boutillier <cedric.boutillier at gmail.com>
+License: LGPL-2.1
+
+License: BSD-2-clause
+ Copyright (C) 2006 Tanaka Akira. All rights reserved.
  .
- 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
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
  .
+ THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+License: LGPL-2.1
  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'.
+ `/usr/share/common-licenses/LGPL-2.1'.
 
-Files: debian/*
-Copyright: 2012 Cédric Boutillier <cedric.boutillier at gmail.com>
-License:
- [LICENSE TEXT]

-- 
ruby-usb.git