debian/copyright: Fix license name uniqueness.

2 files changed, 12 insertions, 87 deletions

diff --git a/debian/changelog b/debian/changelog
index ad297ab..10e1ade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 tdb (1.3.7-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/copyright: Fix license name uniqueness.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sat, 19 Sep 2015 02:57:15 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 1aab4a9..c432c3d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,14 +3,6 @@ Upstream-Name: tdb
 Upstream-Contact: Rusty Russell <rusty@samba.org>
 Source: http://tdb.samba.org/
 
-Files: *
-Copyright:
-  1999-2005 Andrew Tridgell <tridge@samba.org>
-  2000-2012 Rusty Russell <rusty@samba.org>
-  2000-2003 Jeremy Allison <jra@samba.org>
-  2012-2013 Volker Lendecke <vl@samba.org>
-  2013-2014 Stefan Metzmacher <metze@samba.org>
-  2014 Michael Adam <obnox@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
@@ -28,28 +20,23 @@ 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'.
+License: LGPL-3+
+
+Files: *
+Copyright:
+  1999-2005 Andrew Tridgell <tridge@samba.org>
+  2000-2012 Rusty Russell <rusty@samba.org>
+  2000-2003 Jeremy Allison <jra@samba.org>
+  2012-2013 Volker Lendecke <vl@samba.org>
+  2013-2014 Stefan Metzmacher <metze@samba.org>
+  2014 Michael Adam <obnox@samba.org>
+License: LGPL-3+
 
 Files: debian/*
 Copyright:
   2001-2005 Marek Habersack <grendel@debian.org> on
   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
 Copyright:
@@ -62,22 +49,6 @@ Copyright:
   Copyright (c) Free Software Foundation, Inc. 1991-2001
   Copyright (c) Jelmer Vernooij                2006-2009
 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/inet_ntop.c lib/replace/inet_pton.c
 Copyright: Internet Software Consortium. 1996-2001
@@ -101,22 +72,6 @@ Copyright:
   Copyright (c) Paul `Rusty' Russell           2000
   Copyright (c) Jeremy Allison	               2000-2003,2007
 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: tools/*.c
 Copyright:
@@ -125,43 +80,12 @@ Copyright:
   Copyright (c) Jeremy Allison	               2000-2003,2007
   Copyright (c) Andrew Esh                     2001
 License: GPL-3+
- 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 3 of the License, or
- (at your option) any later version.
- .
- This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/GPL'.
 
 Files: pytdb.c
 Copyright:
   Copyright (c) Tim Potter <tpot@samba.org>    2004-2006
   Copyright (c) Jelmer Vernooij                2006-2008
 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/timegm.c
 Copyright: