[DRE-commits] r4105 - in trunk: chef/debian merb/debian
Joshua Timberman
jtimberman-guest at alioth.debian.org
Wed Sep 9 19:02:55 UTC 2009
Author: jtimberman-guest
Date: 2009-09-09 19:02:55 +0000 (Wed, 09 Sep 2009)
New Revision: 4105
Removed:
trunk/chef/debian/chef-server.lintian-overrides
trunk/chef/debian/stamp-patched
Modified:
trunk/chef/debian/FIXME
trunk/chef/debian/changelog
trunk/chef/debian/control
trunk/chef/debian/copyright
trunk/merb/debian/README.source
trunk/merb/debian/copyright
Log:
fixed issues in previous revision of FIXME
Modified: trunk/chef/debian/FIXME
===================================================================
--- trunk/chef/debian/FIXME 2009-09-09 18:13:51 UTC (rev 4104)
+++ trunk/chef/debian/FIXME 2009-09-09 19:02:55 UTC (rev 4105)
@@ -1,12 +1,4 @@
-control:
-
-- fix maintainer. remove original-maintainer. that's a debian package, not an ubuntu one.
-
-- you might want to hardcode that chef uses ruby1.8. Do that by depending on ruby1.8, and on the -ruby1.8 packages, instead of ruby and *-ruby. It doesn't change anything for now, but would break when ruby becomes ruby1.9 in Debian.
-
-copyright:
-- include the full text of the Apache 2.0 license. the URL might change.
-
-stamp-patched is probably a left-over from a previous build
-
-I don't think that you should hide the embedded-javascript-library lintian warning. It's not a false positive.
+Fixed issues pointed out by Lucas.
+jquery.js will stay in the package pending upstream ticket CHEF-510.
+Maintainer will manage it as well as packaged libjs-jquery is not tested
+with chef-server at this time.
Modified: trunk/chef/debian/changelog
===================================================================
--- trunk/chef/debian/changelog 2009-09-09 18:13:51 UTC (rev 4104)
+++ trunk/chef/debian/changelog 2009-09-09 19:02:55 UTC (rev 4105)
@@ -6,6 +6,9 @@
* Fix config log_location settings (CHEF-500)
* Requires libmixlib-config-ruby (>= 1.0.12)
* Suggest, not recommend, rubygems (LP: #424131)
+ * Remove lintian override for jquery.js warning,
+ + evaluating removal of jquery.js in upstream ticket
+ http://tickets.opscode.com/browse/CHEF-510
-- Joshua Timberman <joshua at opscode.com> Fri, 04 Sep 2009 09:31:46 -0600
Deleted: trunk/chef/debian/chef-server.lintian-overrides
===================================================================
--- trunk/chef/debian/chef-server.lintian-overrides 2009-09-09 18:13:51 UTC (rev 4104)
+++ trunk/chef/debian/chef-server.lintian-overrides 2009-09-09 19:02:55 UTC (rev 4105)
@@ -1,2 +0,0 @@
-# jquery package from Karmic is untested with chef-server and is pending upstream review.
-chef-server: embedded-javascript-library
Modified: trunk/chef/debian/control
===================================================================
--- trunk/chef/debian/control 2009-09-09 18:13:51 UTC (rev 4104)
+++ trunk/chef/debian/control 2009-09-09 19:02:55 UTC (rev 4105)
@@ -1,17 +1,16 @@
Source: chef
Section: ruby
Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Joshua Timberman <joshua at opscode.com>
+Maintainer: Joshua Timberman <joshua at opscode.com>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14), quilt
-Build-Depends-Indep: ruby, rake
+Build-Depends-Indep: ruby1.8, rake
Standards-Version: 3.8.3
Homepage: http://wiki.opscode.com/display/chef/Home
Package: chef
Architecture: all
-Depends: ${misc:Depends}, ruby1.8, libopenid-ruby, liberubis-ruby, libjson-ruby, libextlib-ruby, libstomp-ruby, libohai-ruby, libchef-ruby, libopenssl-ruby
+Depends: ${misc:Depends}, ruby1.8, libopenid-ruby1.8, liberubis-ruby1.8, libjson-ruby1.8, libextlib-ruby1.8, libstomp-ruby1.8, libohai-ruby1.8, libchef-ruby1.8, libopenssl-ruby1.8
Suggests: rake
Description: configuration management system written in Ruby
Chef is a systems integration framework and configuration management system
@@ -26,7 +25,7 @@
Package: chef-indexer
Architecture: all
-Depends: ${misc:Depends}, ruby, stompserver, libferret-ruby, libjson-ruby, libchef-ruby
+Depends: ${misc:Depends}, ruby1.8, stompserver, libferret-ruby1.8, libjson-ruby1.8, libchef-ruby1.8
Description: Creates search indexes of Chef node attributes
The chef indexer listens to a message queue via stomp for changes to search
indexes. It then either creates or deletes entries in the index according
@@ -34,7 +33,7 @@
Package: chef-server
Architecture: all
-Depends: ${misc:Depends}, ruby, merb-slices, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, chef-server-slice, stompserver, libstomp-ruby, couchdb, libferret-ruby, mongrel, libopenid-ruby, libjson-ruby, libcoderay-ruby, chef-indexer, libchef-ruby
+Depends: ${misc:Depends}, ruby1.8, merb-slices, libmerb-assets-ruby1.8, libmerb-haml-ruby1.8, libmerb-helpers-ruby1.8, chef-server-slice, stompserver, libstomp-ruby1.8, couchdb, libferret-ruby1.8, mongrel, libopenid-ruby1.8, libjson-ruby1.8, libcoderay-ruby1.8, chef-indexer, libchef-ruby1.8
Suggests: thin, nginx, apache2, rake
Description: Merb application providing centralized management for Chef
Chef is a systems integration framework and configuration management system
@@ -52,7 +51,7 @@
Package: chef-server-slice
Architecture: all
-Depends: ${misc:Depends}, ruby, merb-slices, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, stompserver, couchdb, libferret-ruby, mongrel, libopenid-ruby, libjson-ruby, libcoderay-ruby, libchef-ruby
+Depends: ${misc:Depends}, ruby1.8, merb-slices, libmerb-assets-ruby1.8, libmerb-haml-ruby1.8, libmerb-helpers-ruby1.8, stompserver, couchdb, libferret-ruby1.8, mongrel, libopenid-ruby1.8, libjson-ruby1.8, libcoderay-ruby1.8, libchef-ruby1.8
Description: Merb app slice providing centralized management for Chef
Chef is a systems integration framework and configuration management system
written in Ruby. Chef provides a Ruby library and API that can be used to
@@ -69,7 +68,7 @@
Package: libchef-ruby
Architecture: all
-Depends: ${misc:Depends}, ruby, libchef-ruby1.8
+Depends: ${misc:Depends}, ruby1.8, libchef-ruby1.8
Description: Ruby libraries for Chef configuration management system
Chef is a systems integration framework and configuration management system
written in Ruby. Chef provides a Ruby library and API that can be used to
@@ -84,7 +83,7 @@
Package: libchef-ruby1.8
Architecture: all
-Depends: ${misc:Depends}, ruby1.8, libopenssl-ruby, libmixlib-cli-ruby, libmixlib-config-ruby (>= 1.0.12), libmixlib-log-ruby, libohai-ruby
+Depends: ${misc:Depends}, ruby1.8, libopenssl-ruby1.8, libmixlib-cli-ruby1.8, libmixlib-config-ruby1.8 (>= 1.0.12), libmixlib-log-ruby1.8, libohai-ruby1.8
Suggests: rake, rubygems
Description: Ruby 1.8 libraries for Chef configuration management system
Chef is a systems integration framework and configuration management system
Modified: trunk/chef/debian/copyright
===================================================================
--- trunk/chef/debian/copyright 2009-09-09 18:13:51 UTC (rev 4104)
+++ trunk/chef/debian/copyright 2009-09-09 19:02:55 UTC (rev 4105)
@@ -17,18 +17,209 @@
* Copyright 2009, Thom May <thom at clearairturbulence.org>
* Copyright 2009, Joe Williams <joe at joetify.com>
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0:
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
chef/lib/chef/mixin/command.rb:
Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/),
which was written by Ara T. Howard <ara.t.howard at gmail.com>
Modified: trunk/merb/debian/README.source
===================================================================
--- trunk/merb/debian/README.source 2009-09-09 18:13:51 UTC (rev 4104)
+++ trunk/merb/debian/README.source 2009-09-09 19:02:55 UTC (rev 4105)
@@ -4,6 +4,11 @@
See /usr/share/doc/quilt/README.source for a detailed explanation.
+The upstream source has been modified to remove a generated PDF file
+with no distinguishable source:
+
+./merb-core/docs/merb-core-call-stack-diagram.pdf
+
The upstream source has also been modified to remove gems from the
specs, as the distributability is not confirmed for the gems. As
a result, the spec tests for Merb will not work straight from the source
Modified: trunk/merb/debian/copyright
===================================================================
--- trunk/merb/debian/copyright 2009-09-09 18:13:51 UTC (rev 4104)
+++ trunk/merb/debian/copyright 2009-09-09 19:02:55 UTC (rev 4105)
@@ -229,40 +229,52 @@
Full text of the GPL is available in /usr/share/common-licenses/GPL-2
See above for the MIT license, as it is also used by Merb.
-./merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/generator/unicode.c
- and other files
+./merb-param-protection/*
+ Copyright (c) 2008 Lance Carlson
+ Licensed under MIT License
- Copyright 2001-2004 Unicode, Inc.
+./merb-haml/*
+ Copyright (c) 2008 Yehuda Katz
+ Licensed under MIT License
+
+./merb_datamapper/*
+ Copyright (c) 2007 Jason Toy
+ Licensed under MIT License
+
+./merb-exceptions/*
+ Copyright (c) 2008 New Bamboo
+ Licensed under MIT License
+
+./merb-auth/*
+ Copyright (c) 2008 Adam French, Daniel Neighman
+ Licensed under MIT License
+
+./merb-auth/merb-auth-core/*
+ Copyright (c) 2008 Adam French, Daniel Neighman
+ Licensed under MIT License
- Disclaimer
+./merb-auth/merb-auth-more/*
+ Copyright (c) 2008 Daniel Neighman
- This source code is provided as is by Unicode, Inc. No claims are
- made as to fitness for any particular purpose. No warranties of any
- kind are expressed or implied. The recipient agrees to determine
- applicability of information provided. If this file has been
- purchased on magnetic or optical media from Unicode, Inc., the
- sole remedy for any claim will be exchange of defective media
- within 90 days of receipt.
-
- Limitations on Rights to Redistribute This Code
-
- Unicode, Inc. hereby grants the right to freely use the information
- supplied in this file in the creation of products supporting the
- Unicode Standard, and to make copies of this file in any form
- for internal or external distribution as long as this notice
- remains attached.
+ Some of the code in this plugin is based on Restful Merb::Authentication by Rick Olsen.
+ Copyright (c) 2005 Rick Olson
+ Licensed under MIT License
-./merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/README
- json_pure is written by Florian Frank <flori at ping.de> and
- is licensed under the Ruby license:
+./merb-core/tools/annotation_extract.rb
+./merb-core/tools/code_statistics.rb
+ Copyright (c) 2004-2008 David Heinemeier Hansson
+ Licensed under MIT License
- Ruby License, see the RUBY file included in the source distribution. The Ruby
- License includes the GNU General Public License (GPL), Version 2, so see the
- file GPL as well.
+./merb-core/experimentation/simple_benches/hash_assoc.rb
+ Copyright (c) 2005 Jan Molic, Thomas Sawyer
+ Originally ported from OrderHash 2.0, Copyright (c) 2005 jan molic
- Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
+ Licensed under Ruby License, full text: http://www.ruby-lang.org/en/LICENSE.txt
+ Copying terms under the GPL: http://www.ruby-lang.org/en/COPYING.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 the file GPL), or the conditions below:
+ (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
@@ -273,38 +285,39 @@
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.
+ 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) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
+ 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 binary form,
- provided that you do at least ONE of the following:
+ 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 binaries and library files of the software,
- together with instructions (in the manual page or equivalent)
- on where to get the original distribution.
+ 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.
+ the software.
- c) give non-standard binaries non-standard names, with
+ 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 these terms.
+ are not written by the author, so that they are not under this terms.
- For the list of those files and their copying conditions, see the
- file LEGAL.
+ 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
@@ -317,232 +330,12 @@
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.
-./merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json.rb
- json_pure is written by Florian Frank <flori at ping.de> and
- is licensed under the Ruby license:
-
- This software is distributed under the same license as Ruby itself, see
- above for the full text of the Ruby license.
-
-./merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/benchmarks/benchmark.txt
- Copyright (c) 2001-2006 by Adrian Thurston
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/erubis-2.6.2/setup.rb
- Copyright (c) 2000-2004 Minero Aoki
- You can distribute/modify this program under the terms of
- the GNU Lesser General Public License version 2.1.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/extlib-0.9.8/
- Copyright (c) 2008 Sam Smoot.
- Licensed under the MIT License. See above for full text (same as Merb).
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/extlib-0.9.8/lib/extlib/dictionary.rb
- Copyright (c) 2005 Jan Molic, Thomas Sawyer
- Licensed under the Ruby License.
- See above for the full text of the Ruby License.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/rack-0.4.0/lib/rack/showstatus.rb
- and other files
- Copyright (c) 2005, the Lawrence Journal-World
- Used under the modified BSD license. The BSD license is located in
- /usr/share/common-licenses/BSD on Debian systems.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/fastthread-1.0.1/ext/fastthread/fastthread.c
- Copyright 2006-2007 MenTaLguY <mental at rydia.net>
- This file is made available under the same terms as Ruby.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/cgi_multipart_eof_fix-2.5.0/LICENSE
- copyrighted free software by Zed A. Shaw
- <zedshaw at zedshaw dot com> You can redistribute it and/or modify it under
- either the terms of the GPL or the conditions below.
- See /usr/share/common-licenses for the full text of the GPL on Debian systems.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/mongrel-1.1.5/ext/http11_java/org/jruby/mongrel/Http11.java
- Version: CPL 1.0/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Common Public
- License Version 1.0 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.eclipse.org/legal/cpl-v10.html
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
- Copyright (C) 2007 Ola Bini <ola at ologix.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the CPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the CPL, the GPL or the LGPL.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/fastthread-1.0.1/ext/fastthread/fastthread.c
- and other files
-
- Optimized Ruby Mutex implementation, loosely based on thread.rb by
- Yukihiro Matsumoto <matz at ruby-lang.org>
-
- Copyright 2006-2007 MenTaLguY <mental at rydia.net>
-
- This file is made available under the same terms as Ruby.
-
-./merb-param-protection/LICENSE
- Copyright (c) 2008 Lance Carlson
- Licensed under MIT License
-
-./merb-haml/LICENSE and other files
- Copyright (c) 2008 Yehuda Katz
- Licensed under MIT License
-
-./merb_datamapper/LICENSE
- Copyright (c) 2007 Jason Toy
- Licensed under MIT License
-
-./merb-exceptions/LICENSE and other files
- Copyright (c) 2008 New Bamboo
- Licensed under MIT License
-
-./merb-auth/LICENSE and other files
- Copyright (c) 2008 Adam French, Daniel Neighman
- Licensed under MIT License
-
-parts of merb-auth/merb-auth-more/LICENSE
- Copyright (c) 2008 Daniel Neighman
- Copyright (c) 2005 Rick Olson
- Licensed under MIT License
-
-./merb-core/tools/annotation_extract.rb and other files
- Copyright (c) 2004-2008 David Heinemeier Hansson
- Licensed under MIT License
-
-./merb-core/experimentation/simple_benches/hash_assoc.rb
- Copyright (c) 2005 Jan Molic, Thomas Sawyer
- Originally ported from OrderHash 2.0, Copyright (c) 2005 jan molic
- Ruby License
-
./merb-core/spec/public/webrat/test_app/doc/rdoc/generators/template/merb/prototype.js
-and other files
Copyright (c) 2005-2007 Sam Stephenson
Licensed under MIT License
-./merb-core/spec10/public/webrat/test_app/gems/gems/rspec-1.1.11
-/story_server/prototype/javascripts/unittest.js
- and other files
- Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
- (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
- (c) 2005-2007 Michael Schuerig (http://www.schuerig.de/michael/)
- Licensed under MIT License
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/rspec-1.1.11/License.txt
- Copyright (c) 2005-2008 The RSpec Development Team
- Licensed under MIT License
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/abstract-1.0.0/
- copyright(c) 2006 kuwata-lab.com all rights reserved.
- Ruby License
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/abstract-1.0.0/setup.rb
- Copyright (c) 2000-2004 Minero Aoki
- Licensed under the GPL v 2.1.
-
- Full text of the GPL can be found in /usr/share/common-licenses/GPL-2.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/erubis-2.6.2/contrib/erubis-run.rb
- Copyright (C) 2007 Andrew R Jackson <arjackson at acm dot org>
-
- Built from original by Shugo Maeda:
- Copyright (C) 2001 Shugo Maeda <shugo at modruby.net>
-
- All rights reserved.
-
- 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 THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WAreqANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WAreqANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS 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 INTEreqUPTION)
- 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.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/extlib-0.9.8/LICENSE
- Copyright (c) 2008 Sam Smoot.
- Licensed under the MIT License
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/rack-0.4.0/lib/rack.rb
- Copyright (C) 2007, 2008 Christian Neukirchen <purl.org/net/chneukirchen>
- Licensed under the MIT License
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/daemons-1.0.10/LICENSE
- Copyright (c) 2005-2007 Thomas Uehlinger
- MIT License with exception:
-
- 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.
-
- This license does not apply to daemonize.rb, which is was written by
- Travis Whitton und published under the following license:
-
- The Daemonize extension module is copywrited free software by Travis Whitton
- <whitton at atlantic.net>. You can redistribute it under the terms specified in
- the COPYING file of the Ruby distribution.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/rake-0.8.3/lib/rake/contrib/publisher.rb
-and other files
- Copyright 2003, 2004 by Jim Weirich (jim at weirichhouse.org)
- All rights reserved.
-
- Permission is granted for use, copying, modification, distribution,
- and distribution of modified versions of this work as long as the
- above copyright notice is included.
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/mime-types-1.15/tests/testall.rb
- Copyright 2003 - 2005 Austin Ziegler.
- Licensed under MIT License
-
-./merb-core/spec10/public/webrat/test_app/gems/gems/gem_plugin-0.2.3/COPYING
- GemPlugin is copyrighted free software by Zed A. Shaw
- <zedshaw at zedshaw dot com> You can redistribute it and/or modify it under
- either the terms of the GPL v2.1.
-
- Full text of the GPL v2.1 can be found in /usr/share/common-licenses/GPL-2 on
- Debian systems.
-
-
+./merb-core/spec/public/core_ext/fixtures/gems/gems
+./merb-core/spec10/public/core_ext/fixtures/gems/gems
+./merb-core/spec10/public/webrat/test_app/gems/gems
+ Files in these directories were removed as the distributability is not
+ confirmed for these gems. See README.source.
More information about the Pkg-ruby-extras-commits
mailing list