The following commit has been merged in the master branch:
commit 4cf97a41372fef01fb4f6ea7975e5fe5accf79cb
Author: Ralf Treinen <trei...@free.fr>
Date: Sun May 13 20:16:57 2012 +0200
standrds-version 3.9.3. debian copyright in machine-readable format
diff --git a/debian/changelog b/debian/changelog
index e9a4c52..6ed62e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ ocamlweb (1.38-1) unstable; urgency=low
- bump version number in name of documentation file in
debian/ocamlweb.doc{s,-base}
* debian/rules: use absolute path names in options to ./configure
+ * Standards-version 3.9.3.
+ - debian/copyright: machine-readable format 1.0
- -- Ralf Treinen <trei...@debian.org> Wed, 09 May 2012 20:24:28 +0200
+ -- Ralf Treinen <trei...@debian.org> Sun, 13 May 2012 20:15:23 +0200
ocamlweb (1.37-15) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1511767..ff47d18 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Remi Vanicat <vani...@debian.org>,
Samuel Mimram <smim...@debian.org>,
Sylvain Le Gall <gil...@debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Build-Depends-Indep: ocaml-nox (>= 3.07)
Build-Depends: debhelper (>= 7.0.50~),
tex-common,
diff --git a/debian/copyright b/debian/copyright
index a110a43..f199295 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,127 +1,135 @@
-This package was debianized by Georges MARIANO <georges.mari...@inrets.fr>
-on Mon, 17 Apr 2000 14:52:22 +0200.
-
-It was downloaded from http://www.lri.fr/~filliatr/ftp/ocamlweb
-
-Upstream Authors: Jean-Christophe Filliâtre <filli...@lri.fr> and
- Claude Marché <mar...@lri.fr>
-
-Copyright:
-
-This program, with exception of the files in the directory ocaml-parser,
-is distributed under the GNU Library General Public License version 2.
-On a Debian system the GNU LGPL can be found in the file
-/usr/share/common-licenses/LGPL-2.
-
-All files in the directory ocaml-parser are
-Copyright (C) 1996 "Institut National de Recherche en Informatique et
-en Automatique" and distributed under the terms of the
-Q Public License version 1.0 (included below).
-
-
-
-----------------------------------------------------------------------
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ocamlweb
+Upstream-Contact: Jean-Christophe Filliâtre <filli...@lri.fr>
+ Claude Marché <mar...@lri.fr>
+Source: http://www.lri.fr/~filliatr/ftp/ocamlweb/
+
+Files: deb/*
+Copyright: © 2000-2012 Ralf Treinen, 2000 Georges Mariano
+License: GPL-2
+
+Files: ocaml-parser/*
+Copyright: (C) 1996 Institut National de Recherche en Informatique et
+ en Automatique
+License: QPL
+
+Files: *
+Copyright: (C) 1999-2012 Jean-Christophe Filliâtre and Claude Marché
+License: GPL-2
+
+License: QPL
THE Q PUBLIC LICENSE version 1.0
-
+ .
Copyright (C) 1999 Troll Tech AS, Norway.
Everyone is permitted to copy and
distribute this license document.
-
-The intent of this license is to establish freedom to share and change
-the software regulated by this license under the open source model.
-
-This license applies to any software containing a notice placed by the
-copyright holder saying that it may be distributed under the terms of
-the Q Public License version 1.0. Such software is herein referred to
-as the Software. This license covers modification and distribution of
-the Software, use of third-party application programs based on the
-Software, and development of free software which uses the Software.
-
+ .
+ The intent of this license is to establish freedom to share and change
+ the software regulated by this license under the open source model.
+ .
+ This license applies to any software containing a notice placed by the
+ copyright holder saying that it may be distributed under the terms of
+ the Q Public License version 1.0. Such software is herein referred to
+ as the Software. This license covers modification and distribution of
+ the Software, use of third-party application programs based on the
+ Software, and development of free software which uses the Software.
+ .
Granted Rights
-
-1. You are granted the non-exclusive rights set forth in this license
-provided you agree to and comply with any and all conditions in this
-license. Whole or partial distribution of the Software, or software
-items that link with the Software, in any form signifies acceptance of
-this license.
-
-2. You may copy and distribute the Software in unmodified form
-provided that the entire package, including - but not restricted to -
-copyright, trademark notices and disclaimers, as released by the
-initial developer of the Software, is distributed.
-
-3. You may make modifications to the Software and distribute your
-modifications, in a form that is separate from the Software, such as
-patches. The following restrictions apply to modifications:
-
- a. Modifications must not alter or remove any copyright notices
- in the Software.
-
+ .
+ 1. You are granted the non-exclusive rights set forth in this license
+ provided you agree to and comply with any and all conditions in this
+ license. Whole or partial distribution of the Software, or software
+ items that link with the Software, in any form signifies acceptance of
+ this license.
+ .
+ 2. You may copy and distribute the Software in unmodified form
+ provided that the entire package, including - but not restricted to -
+ copyright, trademark notices and disclaimers, as released by the
+ initial developer of the Software, is distributed.
+ .
+ 3. You may make modifications to the Software and distribute your
+ modifications, in a form that is separate from the Software, such as
+ patches. The following restrictions apply to modifications:
+ .
+ a. Modifications must not alter or remove any copyright notices
+ in the Software.
+ .
b. When modifications to the Software are released under this
license, a non-exclusive royalty-free right is granted to the
initial developer of the Software to distribute your
modification in future versions of the Software provided such
versions remain available under these terms in addition to any
other license(s) of the initial developer.
-
-4. You may distribute machine-executable forms of the Software or
-machine-executable forms of modified versions of the Software,
-provided that you meet these restrictions:
-
+ .
+ 4. You may distribute machine-executable forms of the Software or
+ machine-executable forms of modified versions of the Software,
+ provided that you meet these restrictions:
+ .
a. You must include this license document in the distribution.
-
+ .
b. You must ensure that all recipients of the machine-executable
forms are also able to receive the complete machine-readable
source code to the distributed Software, including all
modifications, without any charge beyond the costs of data
transfer, and place prominent notices in the distribution
explaining this.
-
+ .
c. You must ensure that all modifications included in the
machine-executable forms are available under the terms of this
license.
-
-5. You may use the original or modified versions of the Software to
-compile, link and run application programs legally developed by you or
-by others.
-
-6. You may develop application programs, reusable components and other
-software items that link with the original or modified versions of the
-Software. These items, when distributed, are subject to the following
-requirements:
-
+ .
+ 5. You may use the original or modified versions of the Software to
+ compile, link and run application programs legally developed by you or
+ by others.
+ .
+ 6. You may develop application programs, reusable components and other
+ software items that link with the original or modified versions of the
+ Software. These items, when distributed, are subject to the following
+ requirements:
+ .
a. You must ensure that all recipients of machine-executable
forms of these items are also able to receive and use the
complete machine-readable source code to the items without any
charge beyond the costs of data transfer.
-
+ .
b. You must explicitly license all recipients of your items to
use and re-distribute original and modified versions of the
items in both machine-executable and source code forms. The
recipients must be able to do so without any charges whatsoever,
and they must be able to re-distribute to anyone they choose.
-
+ .
c. If the items are not available to the general public, and the
initial developer of the Software requests a copy of the items,
then you must supply one.
-
+ .
Limitations of Liability
-
-In no event shall the initial developers or copyright holders be
-liable for any damages whatsoever, including - but not restricted to -
-lost revenue or profits or other direct, indirect, special, incidental
-or consequential damages, even if they have been advised of the
-possibility of such damages, except to the extent invariable law, if
-any, provides otherwise.
-
+ .
+ In no event shall the initial developers or copyright holders be
+ liable for any damages whatsoever, including - but not restricted to -
+ lost revenue or profits or other direct, indirect, special, incidental
+ or consequential damages, even if they have been advised of the
+ possibility of such damages, except to the extent invariable law, if
+ any, provides otherwise.
+ .
No Warranty
-
-The Software and this license document are provided AS IS with NO
-WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN,
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
+ .
+ The Software and this license document are provided AS IS with NO
+ WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN,
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ .
Choice of Law
-
-This license is governed by the Laws of France. Disputes shall be
-settled by the Court of Versailles.
+ .
+ This license is governed by the Laws of France. Disputes shall be
+ settled by the Court of Versailles.
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License version 2, as
+ published by the Free Software Foundation.
+ .
+ This program 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.
+ .
+ On Debian systems, the complete text of the latest GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
--
ocamlweb packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
