The following commit has been merged in the master branch:
commit fc0fa55bb0e583e40ce39b582ff05dc7e19ddbe1
Author: Stephane Glondu <st...@glondu.net>
Date:   Tue Feb 28 10:12:50 2012 +0100

    Switch d/copyright to format 1.0

diff --git a/debian/copyright b/debian/copyright
index baf7284..e182e03 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,20 @@
-Packaged-By: Stéphane Glondu <glo...@debian.org>
-Packaged-Date: Tue, 21 Jun 2011 16:21:45 +0200
-Original-Source-Location: http://ocsigen.org/install/tyxml
-Upstream-Maintainer: The Ocsigen Team <d...@ocsigen.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: The Ocsigen Team <d...@ocsigen.org>
 
 Files: *
-Copyright: © 2004 Thorsten Ohl
-           © 2007-2011 Vincent Balat, and many others
-License: LGPL-2.1+ | other
+Copyright: 2004, Thorsten Ohl
+           2007-2011, Vincent Balat and many others
+License: LGPL-2.1+ and other
+
+Files: lib/Makefile
+Copyright: 2004, Thorsten Ohl
+License: GPL-2+
+
+Files: debian/*
+Copyright: © 2011 Stéphane Glondu <st...@glondu.net>
+License: LGPL-2.1+ and other
+
+License: LGPL-2.1+ and other
  This program is released under the LGPL version 2.1 with the
  additional exemption that compiling, linking, and/or using OpenSSL
  is allowed.
@@ -38,8 +46,6 @@ License: LGPL-2.1+ | other
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
-Files: lib/Makefile
-Copyright: © 2004 Thorsten Ohl
 License: GPL-2+
  XHTML is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
@@ -53,7 +59,3 @@ License: GPL-2+
  .
  The complete text of the GNU General Public License can be found in
  `/usr/share/common-licenses/GPL-2'.
-
-Files: debian/*
-Copyright: © 2011 Stéphane Glondu <st...@glondu.net>
-License: LGPL-2.1+

-- 
tyxml 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

Reply via email to