[DRE-commits] [chef] 08/17: Update and simplify debian/copyright. Group copyright holders by license.
Stefano Rivera
stefano at rivera.za.net
Wed Jan 15 15:55:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
stefanor pushed a commit to branch master
in repository chef.
commit 1b8aa0210839a36a19247ed10f8731c0755adcb6
Author: Stefano Rivera <stefanor at debian.org>
Date: Fri Jan 10 00:02:26 2014 +0200
Update and simplify debian/copyright. Group copyright holders by license.
---
debian/changelog | 1 +
debian/copyright | 203 ++++++++++++++++---------------------------------------
2 files changed, 60 insertions(+), 144 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9703464..05600ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ chef (11.8.2-1) UNRELEASED; urgency=medium
* Drop transitional libchef-ruby packages. They were only needed in wheezy.
* Update dependencies from metadata.yml.
- Except mime-types, puma, and pry that don't appear to be used.
+ * Update and simplify debian/copyright. Group copyright holders by license.
-- Stefano Rivera <stefanor at debian.org> Thu, 09 Jan 2014 15:19:11 +0200
diff --git a/debian/copyright b/debian/copyright
index c2ce550..cc8977d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,25 +2,46 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: chef
Source: http://www.opscode.com/chef/
-License: MIT
- 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.
+Files: *
+Copyright: 2008-2013, Opscode, Inc <legal at opscode.com>
+ 2004-2013, Austin Ziegler
+ 2008-2010, Bryan McLellan <btm at loftninjas.org>
+ 2012, Bryan W. Berry <bryan.berry at gmail.com>
+ 2009, CleanOffer, Inc.
+ 2009-2012, Daniel DeLeo <dan at kallistec.com>
+ 2009, David Balatero <dbalatero at gmail.com>
+ 2008, HJK Solutions, LLC
+ 2010, Ian Meyer <ianmmeyer at gmail.com>
+ 2011, Igor Afonov <afonov at gmail.com>
+ 2010, Jan Zimmek <jan.zimmek at web.de>
+ 2009, Jason K. Jackson <jasonjackson at gmail.com>
+ 2013, Jesse Campbell <hikeit at gmail.com>
+ 2009, Joe Williams <joe at joetify.com>
+ 2013, Lamont Granquist <lamont at opscode.com>
+ 2009-2011, Matthew Kent <mkent at magoazul.com>
+ 2009, Matthew Landauer <matthew at openaustralia.org>
+ 2009, Mathieu Sauve-Frankel <msf at kisoku.net>
+ 2010, Michael Leinartas <mleinartas at gmail.com>
+ 2013, Mike Fiedler <miketheman at gmail.com>
+ 2010, Michael Leinartas <mleinartas at gmail.com>
+ 2013, North County Tech Center, LLC
+ 2013, Onddo Labs, SL.
+ 2009, Phusion
+ 2011, Ryan Davis <ryand-ruby at zenspider.com>
+ 2005, Sam Ruby
+ 2008, Steve Midgley
+ 2013, SUSE Linux GmbH
+ 2010-2012, Thomas Bishop <bishop.thomas at gmail.com>
+ 2010, Toomas Pelberg <toomasp at gmx.net>
+ 2010, VMware, Inc.
+License: Apache-2.0
+
+Files: lib/chef/mash.rb
+ lib/chef/monkey_patches/regexp.rb
+Copyright: 2009, Dan Kubb
+ 2005-2008, David Heinemeier Hansson
+ 2009, Marc-Andre Lafortune
+License: Expat
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,128 +59,22 @@ License: Apache-2.0
On Debian systems, the full text of the Apache licence can be found
in /usr/share/common-licenses/Apache-2.0
-Files: *
-Copyright: Copyright (c) 2008-2011 Opscode, Inc <legal at opscode.com>
-License: Apache-2.0
-
-Files: lib/chef/util/windows.rb
- lib/chef/util/windows/*
- lib/chef/mixin/command/windows.rb
- lib/chef/provider/group/windows.rb
- lib/chef/resource/env.rb
- lib/chef/provider/mount/windows.rb
- lib/chef/provider/user/windows.rb
- lib/chef/provider/env/windows.rb
- lib/chef/provider/env.rb
- lib/chef/provider/group/aix.rb
-Copyright: Copyright (c) 2010 VMware, Inc.
-License: Apache-2.0
-
-Files: lib/chef/resource/route.rb
- lib/chef/resource/cron.rb
- lib/chef/provider/route.rb
- lib/chef/provider/package/dpkg.rb
- lib/chef/provider/cron/solaris.rb
- lib/chef/provider/service/upstart.rb
- lib/chef/provider/service/freebsd.rb
- lib/chef/provider/cron.rb
-Copyright: Copyright (c) 2009-2010 Bryan McLellan
-License: Apache-2.0
-
-Files: lib/chef/resource/easy_install_package.rb
- lib/chef/resource/erl_call.rb
- lib/chef/resource/mdadm.rb
- lib/chef/provider/package/easy_install.rb
- lib/chef/provider/erl_call.rb
- lib/chef/provider/mdadm.rb
-Copyright: Copyright (c) 2009 Joe Williams
-License: Apache-2.0
-
-Files: lib/chef/resource/pacman_package.rb
- lib/chef/provider/package/pacman.rb
- lib/chef/provider/service/arch.rb
-Copyright: Copyright (c) 2010 Jan Zimmek
-License: Apache-2.0
-
-Files: lib/chef/resource/pacman_package.rb
- lib/chef/provider/package/pacman.rb
- lib/chef/provider/service/arch.rb
-Copyright: Copyright (c) 2010 Jan Zimmek
-License: Apache-2.0
-
-Files: lib/chef/resource/rpm_package.rb
-Copyright: Copyright (c) 2010 Thomas Bishop
-License: Apache-2.0
-
-Files: lib/chef/resource/ohai.rb
- lib/chef/provider/ohai.rb
-Copyright: Copyright (c) 2010 Michael Leinartas
-License: Apache-2.0
-
-Files: lib/chef/resource/ifconfig.rb
- lib/chef/provider/ifconfig.rb
-Copyright: Copyright (c) 2009 Jason K. Jackson
-License: Apache-2.0
-
-Files: lib/chef/resource/deploy_revision.rb
- lib/chef/resource/timestamped_deploy.rb
- lib/chef/provider/deploy/revision.rb
- lib/chef/provider/deploy/timestamped.rb
- lib/chef/index_queue.rb
- lib/chef/shef.rb
- lib/chef/shef/ext.rb
- lib/chef/shef/shef_session.rb
- lib/chef/index_queue/amqp_client.rb
- lib/chef/index_queue/indexable.rb
- lib/chef/index_queue/consumer.rb
- lib/chef/knife/index_rebuild.rb
- lib/chef/resource_collection/stepable_iterator.rb
- lib/chef/checksum_cache.rb
- lib/chef/cookbook_loader.rb
-Copyright: Copyright (c) 2009 Daniel DeLeo
-License: Apache-2.0
-
-Files: lib/chef/provider/package/yum-dump.py
- lib/chef/knife/cookbook_test.rb
- lib/chef/knife/cookbook_metadata_from_file.rb
-Copyright: Copyright (c) 2009-2011 Matthew Kent
-License: Apache-2.0
-
-Files: lib/chef/provider/package/smartos.rb
- lib/chef/provider/package/freebsd.rb
-Copyright: Copyright (c) 2009 Bryan McLellan, Matthew Landauer
-License: Apache-2.0
-
-Files: lib/chef/provider/cron/solaris.rb
-Copyright: Copyright (c) 2010 Toomas Pelberg
-License: Apache-2.0
-
-Files: lib/chef/provider/service/simple.rb
-Copyright: Copyright (c) 2009 Mathieu Sauve-Frankel
-License: Apache-2.0
-
-Files: lib/chef/provider/service/macosx.rb
-Copyright: Copyright (c) 2011 Igor Afonov
-License: Apache-2.0
-
-Files: lib/chef/mixin/xml_escape.rb
-Copyright: Copyright (c) 2009 Opscode, Inc.
- Copyright (c) 2005 Sam Ruby
-License: Apache-2.0
-
-Files: lib/chef/mixin/deep_merge.rb
-Copyright: Copyright (c) 2008 Steve Midgley
-License: Apache-2.0
-
-Files: lib/chef/monkey_patches/regexp.rb
-Copyright: Copyright (c) 2009 Marc-Andre Lafortune
-License: MIT
-
-Files: lib/chef/mash.rb
-Copyright: Copyright (c) 2009 Dan Kubb
- Copyright (c) 2005-2008 David Heinemeier Hansson
-License: MIT
-
-Files: lib/chef/knife/status.rb
-Copyright: Copyright (c) 2010 Ian Meyer
-License: Apache-2.0
+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 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.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/chef.git
More information about the Pkg-ruby-extras-commits
mailing list