[Pkg-ocaml-maint-commits] r5840 - in /trunk/packages/ocsigen/trunk/debian: changelog copyright

glondu-guest at users.alioth.debian.org glondu-guest at users.alioth.debian.org
Mon Jul 7 20:43:11 UTC 2008


Author: glondu-guest
Date: Mon Jul  7 20:43:11 2008
New Revision: 5840

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5840
Log:
Update debian/copyright to
http://wiki.debian.org/Proposals/CopyrightFormat

Modified:
    trunk/packages/ocsigen/trunk/debian/changelog
    trunk/packages/ocsigen/trunk/debian/copyright

Modified: trunk/packages/ocsigen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/changelog?rev=5840&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/changelog (original)
+++ trunk/packages/ocsigen/trunk/debian/changelog Mon Jul  7 20:43:11 2008
@@ -11,8 +11,10 @@
   * Remove dependency to dpatch.
   * Bump Standards-Version to 3.8.0 and debhelper compatibility level
     to 7 (no changes).
-
- -- Stephane Glondu <steph at glondu.net>  Mon, 07 Jul 2008 16:14:56 +0200
+  * Update debian/copyright to
+    http://wiki.debian.org/Proposals/CopyrightFormat
+
+ -- Stephane Glondu <steph at glondu.net>  Mon, 07 Jul 2008 22:36:09 +0200
 
 ocsigen (1.0.0-1) unstable; urgency=low
 

Modified: trunk/packages/ocsigen/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/copyright?rev=5840&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/copyright (original)
+++ trunk/packages/ocsigen/trunk/debian/copyright Mon Jul  7 20:43:11 2008
@@ -1,92 +1,95 @@
-This package was debianized by Samuel Mimram <smimram at debian.org> on
-Thu, 14 Sep 2006 13:41:04 +0000.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=179
+Packaged-By: Samuel Mimram <smimram at debian.org>
+Packaged-Date: Thu, 14 Sep 2006 13:41:04 +0000
+Upstream-Source: http://ocsigen.org/install/ocsigen
+Upstream-Maintainer: The Ocsigen Team <dev at ocsigen.org>
 
-It was downloaded from http://ocsigen.org/install/ocsigen
+Files: *
+Copyright: © 2005-2008 Vincent Balat
+           © 2005-2008 Jérôme Vouillon
+           © 2005 Denis Berthod
+           © 2005 Nataliya Guts
+           © 2007-2008 Gabriel Kerneis
+           © 2007-2008 Stéphane Glondu
+License: LGPL-2.2+ | other
+
+  This library is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+
+  This library 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
+  Lesser General Public License for more details.
+
+  The complete text of the GNU Lesser General Public License can be
+  found in `/usr/share/common-licenses/LGPL'.
+
+  This program is released under the LGPL version 2.1 (see the text
+  below) with the additional exemption that compiling, linking, and/or
+  using OpenSSL is allowed.
+
+  As a special exception to the GNU Library General Public License,
+  you may also link, statically or dynamically, a "work that uses the
+  Library" with a publicly distributed version of the Library to
+  produce an executable file containing portions of the Library, and
+  distribute that executable file under terms of your choice, without
+  any of the additional requirements listed in clause 6 of the GNU
+  Library General Public License.  By "a publicly distributed version
+  of the Library", we mean either the unmodified Library, or a
+  modified version of the Library that is distributed under the
+  conditions defined in clause 3 of the GNU Library General Public
+  License.  This exception does not however invalidate any other
+  reasons why the executable file might be covered by the GNU Library
+  General Public License.
 
 
-Upstream Authors and Contributors:
+Files: eliom/*duce*
+Copyright: © 2005-2007 Vincent Balat, Alain Frisch
 
-    Vincent Balat <vincent.balat at pps.jussieu.fr>
-      (project leader, Web server, Ocsigenmod, Eliom, Staticmod, xhtml
-      syntax extension, documentation, Ocsimore, extension mechanism,
-      Ocsidbm, Ocsipersist with DBM ...)
+Files: xmlp4/*
+Copyright: © 2005-2008 Vincent Balat
+           © 2005 Julien Mineraud
+           © 2002-2006 INRIA Rocquencourt
+           © 2007 Gabriel Kerneis
 
-    Jerome Vouillon
-      (lwt library, Web server)
+Files: xmlp4/ohl-xhtml/*
+Copyright: © 2004 Thorsten Ohl
+           © 2007 Vincent Balat, Gabriel Kerneis
 
-    Gabriel Kerneis
-      (Xhtml syntax extension for OCaml 3.10, Ocsipersist with SQLite,
-      CGI module, forms in Eliom, deflatemod, ...)
+Files: extensions/cgimod.ml
+Copyright: © 2007 Jérôme Velleine, Gabriel Kerneis
 
-    Denis Berthod
-      (http protocol, Web server)
-
-    Stephane Glondu
-      (Access control, configuration file, ...)
-
-    Thorsten Ohl
-      (most of the functions generating xhtml (xML and xHTML modules))
-
-    Nataliya Guts
-      (Web server, HTTPS)
-
-    Jerome Velleine
-      (CGI module)
-
-    Pierre Clairambault
-      (Lwt_lib, Gentoo package, configure script, ...)
-
-    Alain Frisch
-      (OCamlDuce version, Xhtml typing, natdynlink, ...)
-
-    Janne Hellsten
-      (Miniwiki example)
+Files: examples/miniwiki/miniwiki.ml
+Copyright: © 2007 Janne Hellsten
 
 
-Copyright:
+Files: http/multipart.ml
+Copyright: © 2001 Patrick Doane, Gerd Stolpmann
+License: ZLIB
 
-    Most of the code is Copyright (C) 2005-2008 Vincent Balat.
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any
+  damages arising from the use of this software.
 
-    However, many contributions are copyrighted by their author. See
-    each source file for proper copyright information.
+  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 software must not be misrepresented; you must
+     not claim that you wrote the original software. If you use this
+     software 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 software.
+
+  3. This notice may not be removed or altered from any source
+     distribution.
 
 
-License:
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-This program is released under the LGPL version 2.1 (see the text below) with
-the additional exemption that compiling, linking, and/or using OpenSSL is
-allowed.
-
-As a special exception to the GNU Library General Public License, you
-may also link, statically or dynamically, a "work that uses the Library"
-with a publicly distributed version of the Library to produce an
-executable file containing portions of the Library, and distribute
-that executable file under terms of your choice, without any of the
-additional requirements listed in clause 6 of the GNU Library General
-Public License.  By "a publicly distributed version of the Library",
-we mean either the unmodified Library, or a
-modified version of the Library that is distributed under the
-conditions defined in clause 3 of the GNU Library General Public
-License.  This exception does not however invalidate any other reasons
-why the executable file might be covered by the GNU Library General
-Public License.
-
-The Debian packaging is (C) 2006, Samuel Mimram <smimram at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Files: debian/*
+Copyright: © 2006-2007 Samuel Mimram <smimram at debian.org>
+           © 2007-2008 Stéphane Glondu <steph at glondu.net>
+License: GPL-3+




More information about the Pkg-ocaml-maint-commits mailing list