[DRE-commits] r4038 - trunk/passenger/debian
Micah Anderson
micah at alioth.debian.org
Sat Aug 29 19:16:20 UTC 2009
Author: micah
Date: 2009-08-29 19:16:20 +0000 (Sat, 29 Aug 2009)
New Revision: 4038
Modified:
trunk/passenger/debian/changelog
trunk/passenger/debian/copyright
Log:
add missing copyright information that cause the package to be rejected by NEW
Modified: trunk/passenger/debian/changelog
===================================================================
--- trunk/passenger/debian/changelog 2009-08-29 13:58:10 UTC (rev 4037)
+++ trunk/passenger/debian/changelog 2009-08-29 19:16:20 UTC (rev 4038)
@@ -1,5 +1,16 @@
passenger (2.2.4debian-1) unstable; urgency=low
+ * Updated debian/copyright information with information for:
+ . test/support/tut.h and tut_reporter.h
+ . test/stub/rails_apps/mycookbook/public/javascripts/prototype.js
+ . test/stub/rails_apps/mycookbook/public/javascripts/effects.js
+ . test/stub/rails_apps/mycookbook/public/javascripts/dragdrop.js
+ . test/stub/rails_apps/mycookbook/public/javascripts/controls.js
+ . ext/nginx/StaticContentHandler.c
+ . ext/nginx/Configuration.[c,h], ContentHandler.[c,h],
+ . ext/nginx/ngx_http_passenger_module.[c,h] and StaticContentHandler.h
+ . ext/apache2/Hooks.cpp
+ . ext/common/Base65.[cpp,h]
* Update Standards-Version to 3.8.2 (no changes)
* Also remove passenger-install-nginx-module, same as the apache piece
* Add myself and damog to Uploaders
Modified: trunk/passenger/debian/copyright
===================================================================
--- trunk/passenger/debian/copyright 2009-08-29 13:58:10 UTC (rev 4037)
+++ trunk/passenger/debian/copyright 2009-08-29 19:16:20 UTC (rev 4038)
@@ -92,9 +92,9 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-All files under ext/oxt are licensed under the MIT license:
+All files under ext/oxt are licensed under the MIT license and are
+Copyright (c) 2008 Phusion:
- * Copyright (c) 2008 Phusion
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -135,9 +135,251 @@
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.
-Debian package:
+All files located under ext/common hold the same Copyright and license
+as the main Passenger source (Copyright (C) 2008 Hongli Lai & Ninh Bui
+and GPLv2 only), except where noted below:
-The Debian packaging is (C) 2008, Leandro Nunes dos Santos <leandronunes at safernet.org.br> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'. Other packagers' work is
-also under the GPL license.
+ext/common/Base65.[cpp,h] is Copyright (C) 2004-2008 René Nyffenegger:
+ * Modified by Phusion for inclusion in Phusion Passenger.
+ *
+ * This source code is provided 'as-is', without any express or implied
+ * warranty. In no event will the author be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this source code must not be misrepresented; you must not
+ * claim that you wrote the original source code. If you use this source code
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original source code.
+ *
+ * 3. This notice may not be removed or altered from any source distribution.
+ *
+ * René Nyffenegger rene.nyffenegger at adp-gmbh.ch
+ *
+ */
+---------------------------------------------------------------------------
+All files located under ext/apache2 hold the same Copyright and license
+as the main Passenger source (Copyright (C) 2008 Hongli Lai & Ninh Bui
+and GPLv2 only), except where noted below:
+
+A few functions in ext/apache2/Hooks.cpp are based on the source code of
+mod_scgi version 1.9. Its license is included in this file.
+Please note that these licensing terms *only* encompass those few
+functions, and not Passenger as a whole.
+
+The functions which are based on mod_scgi's code are as follows:
+- Hooks::prepareRequest(). Although our version looks nothing like the
+ original, the idea of checking for the file's existance from the
+ map_to_storage/fixups hook is inspired by mod_scgi's code.
+- Hooks::handleRequest(). Although our version looks nothing like the original,
+ the idea of passing the backend process's socket file descriptor up to the
+ bucket brigade chain is inspired by mod_scgi's code.
+- Hooks::http2env(), Hooks::lookupName(), Hooks::lookupHeader(),
+ Hooks::lookupEnv(), Hooks::addHeader(): Copied from mod_scgi's functions that
+ are named similarly. Slightly modified to make the coding style consistent
+ with the rest of Phusion Passenger.
+- Hooks::sendHeaders(): Based for the most part on mod_scgi's send_headers()
+ function.
+
+------------------------------------------------------------------------
+CNRI OPEN SOURCE LICENSE AGREEMENT
+
+IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY. BY
+COPYING, INSTALLING OR OTHERWISE USING SCGI-1.9 SOFTWARE, YOU ARE
+DEEMED TO HAVE AGREED TO THE TERMS AND CONDITIONS OF THIS LICENSE
+AGREEMENT.
+
+1. This LICENSE AGREEMENT is between Corporation for National
+ Research Initiatives, having an office at 1895 Preston White
+ Drive, Reston, VA 20191 ("CNRI"), and the Individual or
+ Organization ("Licensee") copying, installing or otherwise using
+ scgi-1.9 software in source or binary form and its associated
+ documentation ("scgi-1.9").
+
+2. Subject to the terms and conditions of this License Agreement,
+ CNRI hereby grants Licensee a nonexclusive, royalty-free, world-
+ wide license to reproduce, analyze, test, perform and/or display
+ publicly, prepare derivative works, distribute, and otherwise use
+ scgi-1.9 alone or in any derivative version, provided, however,
+ that CNRI's License Agreement and CNRI's notice of copyright,
+ i.e., "Copyright (c) 2004 Corporation for National Research
+ Initiatives; All Rights Reserved" are retained in scgi-1.9 alone
+ or in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+ or incorporates scgi-1.9 or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief
+ summary of the changes made to scgi-1.9.
+
+4. CNRI is making scgi-1.9 available to Licensee on an "AS IS"
+ basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO
+ AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY
+ OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SCGI-1.9
+ WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF SCGI-
+ 1.9 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+ AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SCGI-
+ 1.9, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
+ POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a
+ material breach of its terms and conditions.
+
+7. This License Agreement shall be governed by and interpreted in
+ all respects by the law of the State of Virginia, excluding
+ Virginia's conflict of law provisions. Nothing in this License
+ Agreement shall be deemed to create any relationship of agency,
+ partnership, or joint venture between CNRI and Licensee. This
+ License Agreement does not grant permission to use CNRI
+ trademarks or trade name in a trademark sense to endorse or
+ promote products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using scgi-1.9, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+
+---------------------------------------------------------------------------
+All files located under ext/nginx hold the same Copyright and license
+as the main Passenger source (Copyright (C) 2008 Hongli Lai & Ninh Bui
+and GPLv2 only), except where noted below:
+
+ext/nginx/Configuration.[c,h], ContentHandler.[c,h],
+ngx_http_passenger_module.[c,h] and StaticContentHandler.h is:
+
+/* Copyright (C) Igor Sysoev
+ * Copyright (C) 2007 Manlio Perillo (manlio.perillo at gmail.com)
+ * Copyright (C) 2008, 2009 Phusion
+ *
+ * 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR 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 INTERRUPTION)
+ * 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.
+ */
+
+ext/nginx/StaticContentHandler.c is:
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) 2009 Phusion
+ *
+ * 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR 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 INTERRUPTION)
+ * 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.
+ */
+
+-----------------------------------------------------------------------------
+
+All files located under test hold the same Copyright and license
+as the main Passenger source (Copyright (C) 2008 Hongli Lai & Ninh Bui
+and GPLv2 only), except where noted below:
+
+test/stub/rails_apps/mycookbook/public/javascripts/controls.js is:
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+// (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
+// Contributors:
+// Richard Livsey
+// Rahul Bhargava
+// Rob Wills
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+test/stub/rails_apps/mycookbook/public/javascripts/dragdrop.js is:
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi at oriontransfer.co.nz)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+test/stub/rails_apps/mycookbook/public/javascripts/effects.js is:
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Contributors:
+// Justin Palmer (http://encytemedia.com/)
+// Mark Pilgrim (http://diveintomark.org/)
+// Martin Bialasinki
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+test/stub/rails_apps/mycookbook/public/javascripts/prototype.js is:
+
+/* Prototype JavaScript framework, version 1.6.0.1
+ * (c) 2005-2007 Sam Stephenson
+ *
+ * Prototype is freely distributable under the terms of an MIT-style license.
+ * For details, see the Prototype web site: http://www.prototypejs.org/
+*/
+
+test/support/tut.h and tut_reporter.h is Copyright 2002-2006 Vladimir Dyuzhev:
+
+ * http://tut-framework.sourceforge.net/
+ *
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 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 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR 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 INTERRUPTION) 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.
+ */
+
+
More information about the Pkg-ruby-extras-commits
mailing list