[Pkg-ocaml-maint-commits] [SCM] headache packaging branch, master, updated. debian/1.03-22-5-g0b46a1b

[Ralf Treinen]

The following commit has been merged in the master branch:
commit aaa5681c6a837be80e0a658b5bf36455b63f3f69
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon May 20 14:22:15 2013 +0200

    update debian/copyright

diff --git a/debian/changelog b/debian/changelog
index e81bdc3..d463d91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-headache (1.03-23) UNRELEASED; urgency=low
+headache (1.03-23) unstable; urgency=low
 
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
@@ -6,8 +6,10 @@ headache (1.03-23) UNRELEASED; urgency=low
   [ Ralf Treinen ]
   * Update debian/watch (ocamlforge)
   * Standards-Version 3.9.4 (no change)
+  * debian/copyright: finalise migration to format 1.0. Fix licence, copyright
+    holder (INRIA) and year.
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 20 May 2013 14:08:38 +0200
+ -- Ralf Treinen <treinen at debian.org>  Mon, 20 May 2013 14:21:51 +0200
 
 headache (1.03-22) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 7da96a8..a20c5ea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,39 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Author: Vincent Simonet <Vincent.Simonet at vtst.fr>
-Packaged-By: Sylvain Le Gall <gildor at debian.org>
-Packaged-Date: Sun, 15 Feb 2004 21:54:24 +0100.
-Original-Source-Location: http://pauillac.inria.fr/~simonet/soft/headache/
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: headache
+Upstream-Contact: Vincent Simonet <Vincent.Simonet at vtst.fr>
+Source: http://forge.ocamlcore.org/frs/?group_id=51
 
 Files: *
-Copyright: (C) 2002-2003 Vincent Simonet
-License: LGPL-2+
+Copyright: (C) 2002 Institut National de Recherche en Informatique et en Automatique.
+License: LGPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this package; if not, write to the Free Software Foundation, Inc., 51
+ Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2'
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU Library General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
+Files: debian/*
+Copyright: (C) 2006-2009 Sylvain Le Gall
+License: GPL-2+
+ This program 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.  On Debian systems, the complete text
+ of the GNU General Public License can be found in the file
+ `/usr/share/common-licenses/GPL'.
 
-   This package 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.
+ 
 
-   You should have received a copy of the GNU General Public License along with
-   this package; if not, write to the Free Software Foundation, Inc., 51
-   Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/LGPL-2'
 
-Files: debian/*
-Copyright: (C) 2006-2009 Sylvain Le Gall
-License: GPL-2+
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'

-- 
headache packaging