[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. 331f9e541422ca17ab4d67f367e2b6a23cc579c3

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 572b9f1d381169fcbbc7864d341ceea4d750b0cb
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Aug 7 16:01:19 2008 -0300

    bump copyright info and adapt to GPL-3

diff --git a/policy/legal.xml b/policy/legal.xml
index 7b51cb8..61ba4d2 100644
--- a/policy/legal.xml
+++ b/policy/legal.xml
@@ -1,30 +1,32 @@
 <copyright>
-    <year>2002</year><year>2003</year><year>2004</year><year>2005</year><year>2006</year><year>2007</year>
-    <holder>Sylvain LE GALL, Sven LUTHER, Samuel MIMRAM, Ralf TREINEN,
-            and Stefano ZACCHIROLI</holder>
+  <year>2002</year>
+  <year>2003</year>
+  <year>2004</year>
+  <year>2005</year>
+  <year>2006</year>
+  <year>2007</year>
+  <year>2008</year>
+  <holder>Sylvain LE GALL, Sven LUTHER, Samuel MIMRAM, Ralf TREINEN, and
+    Stefano ZACCHIROLI</holder>
 </copyright>
 <legalnotice>
-    <para>
-        This manual is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version
-        2 of the License, or (at your option) any later version.
-    </para>
-    <para>
-        This 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 General Public License for more details.
-    </para>
-    <para>
-        A copy of the GNU General Public License is available as
-        <filename>/usr/share/common-licenses/GPL</filename> in the Debian GNU/Linux
-        distribution or on the World Wide Web at 
-        <ulink url="http://www.gnu.org/copyleft/gpl.html">The GNU Public Licence</ulink>.
-    </para>
-    <para>
-        You can also obtain it by writing to the
-        Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-        Boston, MA 02111-1307, USA.
-    </para>
+  <para>
+    This manual is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation, either version
+    3 of the License, or (at your option) any later version.
+  </para>
+  <para>
+    This 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 General Public License for more details.
+  </para>
+  <para>
+    A copy of the GNU General Public License is available as
+    <filename>/usr/share/common-licenses/GPL</filename> on Debian GNU/Linux
+    systems or on the World Wide Web at <ulink
+      url="http://www.gnu.org/copyleft/gpl.html">The GNU Public
+      Licence</ulink>.
+  </para>
 </legalnotice>

-- 
dh-ocaml packaging