[DRE-commits] [SCM] ruby-openid.git branch, master, updated. upstream/2.1.8-7-g953522f

Sat May 12 22:46:17 UTC 2012

The following commit has been merged in the master branch:
commit 953522f9d917c12e628b9335398ced41014fde09
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sun May 13 00:43:08 2012 +0200

    Convert debian/copyright to DEP-5

diff --git a/debian/changelog b/debian/changelog
index 1ce3da5..b09ed71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ruby-openid (2.1.8debian-2) UNRELEASED; urgency=low
 
+  [ Paul van Tilburg ]
   * Source packages adapted according to the new Ruby policy:
     - Build for both ruby1.8 and ruby1.9.1.
     - Migrated to pkg-ruby-extras git repos. Changed the Vcs-* fields in
@@ -16,6 +17,9 @@ ruby-openid (2.1.8debian-2) UNRELEASED; urgency=low
     - Added libopenid-ruby and libopenid-ruby1.8 as transitional packages.
   * TODO: debian/copyright: reworked to fit the copyright format version 1.0.
 
+  [ Cédric Boutillier ]
+  * Convert debian/copyright to DEP-5
+
  -- Paul van Tilburg <paulvt at debian.org>  Sat, 12 May 2012 00:27:14 +0200
 
 libopenid-ruby (2.1.8debian-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 4165d90..7e89cbd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,101 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ruby-openid
-Source: FIXME <http://example.com/>
+Source: http://www.openidenabled.com/ruby-openid/
+Comment: the source has been repacked to remove the convienence copy of the
+ hmac Ruby library under lib/hmac, which can be provided on Debian systems by
+ the ruby-hmac package.
 
 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.
- .
- 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
+Copyright: 2006-2008 by JanRain, Inc.
+License: Apache-2.0
+
+Files: lib/openid/yadis/htmltokenizer.rb
+Copyright: 2004 Ben Giddings
+License: Ruby or GPL-2
+
+Files: debian/*
+Copyright: 2007 Antonio Terceiro <terceiro at softwarelivre.org>
+           2012 Cédric Boutillier <cedric.boutillier at gmail.com>
+           2012 Paul van Tilburg <paulvt at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache License 2.0 can be found at
+ /usr/share/common-licenses/Apache-2.0.
+
+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 Version 2 as published
+ by the Free Software Foundation.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  .
  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'.
 
-Files: debian/*
-Copyright: 2012 Cédric Boutillier <cedric.boutillier at gmail.com>
-License:
- [LICENSE TEXT]
+License: Ruby
+ You can redistribute it and/or modify it under either the terms of the GPL,
+ or the conditions below:
+ .
+   1. You may make and give away verbatim copies of the source form of the
+      software without restriction, provided that you duplicate all of the
+      original copyright notices and associated disclaimers.
+ .
+   2. You may modify your copy of the software in any way, provided that
+      you do at least ONE of the following:
+ .
+        a) place your modifications in the Public Domain or otherwise
+           make them Freely Available, such as by posting said
+ 	  modifications to Usenet or an equivalent medium, or by allowing
+ 	  the author to include your modifications in the software.
+ .
+        b) use the modified software only within your corporation or
+           organization.
+ .
+        c) rename any non-standard executables so the names do not conflict
+ 	  with standard executables, which must also be provided.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   3. You may distribute the software in object code or executable
+      form, provided that you do at least ONE of the following:
+ .
+        a) distribute the executables and library files of the software,
+ 	  together with instructions (in the manual page or equivalent)
+ 	  on where to get the original distribution.
+ .
+        b) accompany the distribution with the machine-readable source of
+ 	  the software.
+ .
+        c) give non-standard executables non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   4. You may modify and include the part of the software into any other
+      software (possibly commercial).  But some files in the distribution
+      are not written by the author, so that they are not under this terms.
+ .
+      They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+      files under the ./missing directory.  See each file for the copying
+      condition.
+ .
+   5. The scripts and library files supplied as input to or produced as 
+      output from the software do not automatically fall under the
+      copyright of the software, but belong to whomever generated them, 
+      and may be sold commercially, and may be aggregated with this
+      software.
+ .
+   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+      PURPOSE.
+

-- 
ruby-openid.git

