debian/copyright: Fix uniqueness of license names.

diff --git a/debian/changelog b/debian/changelog
index 20195e1e8a199c79ea0addebc3ef7c64b81ecbcd..416f7767116b76ae5dbb2668592b8632b2ea9adc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ talloc (2.1.3-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Remove patch revert-ldflags-atend: applied upstream.
   * Remove patch reproducible-build: applied upstream.
+  * debian/copyright: Fix uniqueness of license names.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sat, 19 Sep 2015 02:46:57 +0000
 

diff --git a/debian/copyright b/debian/copyright
index 96e8ef7a4f441088861675518a73ed2f7196e592..906dc335b9af3abe8ff56fe14659fd0f7af75c62 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,6 @@ Upstream-Name: talloc
 Upstream-Contact: Samba Developers <samba-technical@samba.org>
 Source: http://talloc.samba.org/
 
-Files: *
-Copyright:
-  2004 Andrew Tridgell <tridge@samba.org>
-  2006 Stefan Metzmacher <metze@samba.org>
 License: LGPL-3+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -25,25 +21,15 @@ License: LGPL-3+
  On Debian GNU/Linux systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL'.
 
+Files: *
+Copyright:
+  2004 Andrew Tridgell <tridge@samba.org>
+  2006 Stefan Metzmacher <metze@samba.org>
+License: LGPL-3+
+
 Files: debian/*
 Copyright: 2007-2012 Jelmer Vernooij <jelmer@samba.org>
 License: LGPL-3+
- This library 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.
- .
- This library 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; 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 Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-3'.
 
 Files: lib/replace/*.c
 Comment: This file is not used when building the Debian package.
@@ -57,9 +43,6 @@ Copyright:
   Copyright (c) Free Software Foundation, Inc. 1991-2001
   Copyright (c) Jelmer Vernooij                2006-2009
 License: LGPL-3+
- Libreplace is licensed under the GNU Lesser General Public License,
- version 3 or later. The text of the license is available on Debian
- systems in the /usr/share/common-licenses/LGPL-3 file.
 
 Files: lib/replace/inet_ntop.c lib/replace/inet_pton.c
 Comment: This file is not used when building the Debian package.