Fix copyright format problems

2 files changed, 13 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 8dcf7feb..9fd7bdbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libunistring (0.9.10-5) UNRELEASED; urgency=medium
 
   * New debian/patches/0005-fix_build_musl.patch (Closes: #987609):
     - Fix build on musl (Thanks to Helmut Grohne <helmut@subdivi.de>).
+  * Fix copyright format problems (Closes: #972501):
+    - Thanks to Bastian Germann <bage@linutronix.de>.
   * Declare compliance with Debian Policy 4.5.1 (No changes needed).
 
  -- Jörg Frings-Fürst <debian@jff.email>  Mon, 26 Apr 2021 18:41:51 +0200
diff --git a/debian/copyright b/debian/copyright
index 78320b6f..a67f5c28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=202
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libunistring
 Upstream-Contact: Bruno Haible <bruno@clisp.org>
 Source: http://ftp.gnu.org/gnu/libunistring/
@@ -14,16 +14,6 @@ License: FreeSoftware
  gives unlimited permission to copy and/or distribute it,
  with or without modifications, as long as this notice is preserved.
 
-Files: m4/init-package-version.m4
-       build-aux/ltmain.sh
-Copyright: 1992-2009, Free Software Foundation, Inc.
-License: GPL-2+ with distribution exception
- This file is free software, distributed under the terms of the GNU
- General Public License.  As a special exception to the GNU General
- Public License, this file may be distributed as part of a program
- that contains a configuration script generated by Autoconf, under
- the same distribution terms as the rest of that program.
-
 Files: doc/*
 Copyright: 2001-2017 Free Software Foundation, Inc.
 License: GPL-3+ or GFDL-1.2+
@@ -36,6 +26,16 @@ Files: build-aux/*
 Copyright: 1995-2017 Free Software Foundation, Inc.
 License: GPL-2+
 
+Files: m4/init-package-version.m4
+       build-aux/ltmain.sh
+Copyright: 1992-2009, Free Software Foundation, Inc.
+License: GPL-2+ with distribution exception
+ This file is free software, distributed under the terms of the GNU
+ General Public License.  As a special exception to the GNU General
+ Public License, this file may be distributed as part of a program
+ that contains a configuration script generated by Autoconf, under
+ the same distribution terms as the rest of that program.
+
 Files: build-aux/texi2html
 Copyright: 1999-2005 Patrice Dumas <dumas@centre-cired.fr>,
            1999-2005 Derek Price <derek@ximbiot.com>,