[Pkg-cli-libs-commits] [SCM] ironruby branch, master, updated. debian/20090805+git.e6b28d27+dfsg-1-3-gc5e7df0

[C.J. Adams-Collier]

The following commit has been merged in the master branch:
commit c5e7df055febece9b78ae2545f3aea5a19414d10
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Mon Jan 4 09:12:11 2010 -0800

    corrected some licensing issues

diff --git a/debian/changelog b/debian/changelog
index cacb79a..2141260 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dlr-languages (20090805+git.e6b28d27+dfsg-1) unstable; urgency=low
 
   [ C.J. Adams-Collier ]
+  * added missing license references as per Barry deFreese's recommendations
   * Initial release. (Closes: #481431)
 
   [ Mirco Bauer ]
diff --git a/debian/copyright b/debian/copyright
index 8ecf23d..f80d4af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -197,7 +197,43 @@ Merlin/Main/Languages/Ruby/Scripts/bin/irake
 Merlin/Main/Languages/Ruby/Scripts/bin/irdoc
 Merlin/Main/Languages/Ruby/Scripts/bin/iri
 
-Ruby License (referred to as LICENSE.txt)
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_specification.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_package_tar_writer.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/bogussources.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_dependency.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_indexer.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_package_tar_input.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_config.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_source_info_cache.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_requirement.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_remote_fetcher.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_package_tar_header.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_dependency_list.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_command_manager.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/mockgemui.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/simple_gem.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_source_index.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_package_tar_reader.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_package_tar_output.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_commands_check_command.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_kernel.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/functional.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_format.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/fake_certlib/openssl.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/gemutilities.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/insure_session.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_digest.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_command.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_doc_manager.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_version.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_package_tar_reader_entry.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_validator.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_builder.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_config_file.rb
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RubyGems-1_3_1-test/test_gem_installer.rb
+
+
+Ruby License (referred to as LICENSE.txt):
 
 Copyright (c) 2003 Dave Thomas
 Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich, and others.
@@ -264,8 +300,39 @@ You can redistribute it and/or modify it under either the terms of the GPL
 
 -------------------------------------------------------------------------------
 
+Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/lib/eggs/lib/bacon/lib/bacon.rb
+Copyright (C) 2007, 2008 Christian Neukirchen <purl.org/net/chneukirchen>
+
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/RakeTests/*
+Copyright 2003, 2004, 2005 by Jim Weirich (jim at weirichhouse.org)
+
+Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/mspec/*
+Copyright (c) 2008 Engine Yard, Inc. All rights reserved.
+
+MIT License
+
+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.
+
+-------------------------------------------------------------------------------
+
 The Debian packaging is
 (C) 2004, Matthias Klose <doko at debian.org>
-(C) 2009, C.J. Adams-Collier <cjac at colliertech.org>
+(C) 2009, 2010, C.J. Adams-Collier <cjac at colliertech.org>
 (C) 2009, Mirco Bauer <meebey at debian.org>
 and is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'.

-- 
ironruby