[Pkg-ocaml-maint-commits] [SCM] ocaml-dbus packaging branch, master, updated. debian/0.29-1-2-g6ef1861

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 6ef1861e34332c5de89daa4bc53c4e87d1ad676d
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Mon Jan 24 22:17:55 2011 +0100

    Fix debian/copyright: license is LGPL 2.1 + OCaml linking exception

diff --git a/debian/changelog b/debian/changelog
index b74799a..bb4bf87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-ocaml-dbus (0.29-2) UNRELEASED; urgency=low
+ocaml-dbus (0.29-3) UNRELEASED; urgency=low
 
+  [ Stéphane Glondu ]
   * Bump build-dependency to libdbus-1-dev
 
- -- Stéphane Glondu <glondu at debian.org>  Wed, 21 Jul 2010 11:05:55 +0200
+  [ Sylvain Le Gall ]
+  * Fix debian/copyright: license is LGPL 2.1 + OCaml linking exception
+
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 24 Jan 2011 22:17:34 +0100
 
 ocaml-dbus (0.29-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 4ff48d4..7cc25d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,8 +17,22 @@ License: LGPL-2.1
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  
-On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+ 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, 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.
 
 Files: debian/*
 Copyright: (C) 2008-2009 Sylvain Le Gall

-- 
ocaml-dbus packaging