[DRE-commits] [ruby-amazon-ec2] 05/07: Fix debian/copyright syntax
Cédric Boutillier
boutil at moszumanska.debian.org
Wed Jan 15 13:06:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-amazon-ec2.
commit 10dd5d501284f259b9acc5f482c6018ba5468cd0
Author: Cédric Boutillier <boutil at debian.org>
Date: Wed Jan 15 12:52:56 2014 +0100
Fix debian/copyright syntax
---
debian/changelog | 1 +
debian/copyright | 163 ++++++++++++++++++++++++++++++-------------------------
2 files changed, 91 insertions(+), 73 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f4d2432..fc51d30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ruby-amazon-ec2 (0.9.17-3) UNRELEASED; urgency=medium
* Update dependencies: ruby1.8 -> ruby, libxml-simple-ruby -> ruby-
xml-simple
* Drop transitional packages
+ * Fix debian/copyright syntax
-- Cédric Boutillier <boutil at debian.org> Wed, 15 Jan 2014 12:33:48 +0100
diff --git a/debian/copyright b/debian/copyright
index 216c915..c258328 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,76 +1,93 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Amazon Web Services Elastic Compute Cloud (EC2) Ruby Gem
-Maintainer: Glenn Rempe <glenn at rempe.us>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: amazon-ec2
+Upstream-Contact: Glenn Rempe <glenn at rempe.us>
Source: http://github.com/grempe/amazon-ec2
Files: *
-Copyright: Copyright (c) 2007-2010 Glenn Rempe
-Copyright: Copyright (c) 2008 Yann Klis
-License: other
- This software is distributed under the Ruby License. A copy of which is
- provided below.
-
- RUBY LICENSE
-
- http://www.ruby-lang.org/en/LICENSE.txt
-
- Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
- You can redistribute it and/or modify it under either the terms of the GPL
- (see COPYING.txt file), or the conditions below:
-
- On Debian systems, the complete text of the GNU General Public
- License can be found in the file `/usr/share/common-licenses/GPL'.
-
- 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.
+Copyright: 2007-2010 Glenn Rempe
+ 2008 Yann Klis
+License: Ruby or GPL-2
+
+Files: debian/*
+Copyright: Damien Raude-Morvan <drazzib at debian.org>
+License: Ruby or 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, 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 package; 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'.
+
+License: Ruby
+ Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
+ You can redistribute it and/or modify it under either the terms of the GPL
+ (see COPYING.txt file), 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.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-amazon-ec2.git
More information about the Pkg-ruby-extras-commits
mailing list