Fix changelog, fix ordering of paragraphs in copyright.

2 files changed, 17 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index 66a0f4a..e60fd50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,8 @@
-tdb (1.3.4-3) UNRELEASED; urgency=medium
+tdb (1.3.4-2) UNRELEASED; urgency=medium
 
   * debian/rules: Pass CPPFLAGS from dpkg-buildflags onto configure,
     enabling hardening.
   * Make libtdb2-dbg Multi-Arch: same.
-
- -- Jelmer Vernooij <jelmer@debian.org>  Sun, 26 Apr 2015 10:56:55 +0000
-
-tdb (1.3.4-2) unstable; urgency=medium
-
   * Add patch 01_reproducible_builds.diff: Make build reproducible by
     adding set dates to manpages.
   * debian/copyright: Fix paths for lib/replace.
diff --git a/debian/copyright b/debian/copyright
index 40c3c60..1aab4a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,22 +51,6 @@ 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-3'.
 
-Files: lib/replace/inet_ntop.c lib/replace/inet_pton.c
-Copyright: Internet Software Consortium. 1996-2001
-License: ISC
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
 Files: lib/replace/*.c
 Copyright:
   Copyright (c) Andrew Tridgell                1999-2006
@@ -95,6 +79,22 @@ 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-3'.
 
+Files: lib/replace/inet_ntop.c lib/replace/inet_pton.c
+Copyright: Internet Software Consortium. 1996-2001
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 Files: common/*.c
 Copyright:
   Copyright (c) Andrew Tridgell                1999-2006