Fix license mentioned in manual page. Closes: #623879

diff --git a/debian/changelog b/debian/changelog
index 54ba8d926f0ec61b9abc40e2ea559c5ea041dcf8..9ba9842592aad115b36df37fd307fe053201beff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ talloc (2.0.5-2) UNRELEASED; urgency=low
   * Add multi-arch support to libtalloc1.
   * Add debug packages libtalloc2-dbg and python-talloc-dbg.
   * Bump standards version to 3.9.2 (no changes).
+  * Fix license mentioned in manual page. Closes: #623879
 
- -- Jelmer Vernooij <jelmer@debian.org>  Tue, 26 Jul 2011 20:29:11 +0200
+ -- Jelmer Vernooij <jelmer@debian.org>  Tue, 26 Jul 2011 20:35:13 +0200
 
 talloc (2.0.5-1) unstable; urgency=low
 

diff --git a/debian/patches/02_manpage_license b/debian/patches/02_manpage_license
new file mode 100644 (file)
index 0000000..3219ef1
--- /dev/null
+++ b/debian/patches/02_manpage_license
@@ -0,0 +1,20 @@
+Description: The manual page incorrectly mentions that talloc is GPL, while it is LGPL
+Author: Jelmer Vernooij <jelmer@samba.org>
+Status: Cherry-picked from upstream
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623879
+
+--- a/talloc.3.xml     2011-07-25 13:30:22.301571046 +0200
++++ b/talloc.3.xml     2011-01-24 04:28:28.334518000 +0100
+@@ -783,9 +783,9 @@
+     </para>
+     <para>
+       This program is free software; you can redistribute it and/or modify
+-      it under the terms of the GNU Lesser General Public License as 
+-      published by the Free Software Foundation; either version 3 of the
+-      License, or (at your option) any later version.
++      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 program is distributed in the hope that it will be useful, but