[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-4-12-gf60911f

[Ralf Treinen]

The following commit has been merged in the master branch:
commit f60911f69b1bd752833f0719963c1ad1c81a3946
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Jun 6 22:00:43 2012 +0200

    debian/copyright: no more ocamlspot.el

diff --git a/debian/changelog b/debian/changelog
index 8282d20..f1acad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ tuareg-mode (1:2.0.6-1) unstable; urgency=low
   * installation: do not compile for xemacs.
   * debian/emacsen-install: create in ELC directory symbolic links for the
     corresponding .el files (closes: #671573)
+  * debian/copyright: remove mention of ocamlspot.el which is no longer part
+    of the upstream distribution.
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 06 Jun 2012 21:47:22 +0200
+ -- Ralf Treinen <treinen at debian.org>  Wed, 06 Jun 2012 22:00:20 +0200
 
 tuareg-mode (1:2.0.4-4) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 8af7e2d..b41e656 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,40 +3,16 @@ Upstream-Name: tuareg
 Upstream-Contact: tuareg at janestreet.com
 Source: https://forge.ocamlcore.org/projects/tuareg/
 
-Files: ocamlspot.el
-Copyright: © 2008-2009 Jun Furuse
-License: LGPL-2 | other
- This file is distributed under the terms of the GNU Library General
- Public License, with the special exception on linking described in
- file LICENSE.
- .
- As a special exception to the GNU Library General Public License,
- you may 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 as
- distributed by INRIA, 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.
- .
- On Debian systems, the full text of the GNU Library General Public
- License can be found in /usr/share/common-licenses/LGPL-2.
+Files: *
+Copyright: © 1997-2006 Albert Cohen <Albert.Cohen at inria.fr>
+           © 2009-2010 Jane Street Holding, LLC
+License: GPL-2
 
 Files: debian/*
 Copyright: © 2001-2012 Ralf Treinen <treinen at debian.org>
            © 2010 Stéphane Glondu <glondu at debian.org>
 License: GPL-2
 
-Files: *
-Copyright: © 1997-2006 Albert Cohen <Albert.Cohen at inria.fr>
-           © 2009-2010 Jane Street Holding, LLC
-License: GPL-2
-
 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

-- 
tuareg-mode packaging