[debhelper-devel] [debhelper] 05/10: d/copyright: Reorder two paragraphs

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 9b35148af6151c591ab0432a744f057f43ac7d1b
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Jan 1 17:41:55 2015 +0100

    d/copyright: Reorder two paragraphs
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 debian/copyright | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51d1e31..2aa9abe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ debhelper (9.20150101.1) UNRELEASED; urgency=medium
     to Paul Tagliamonte for the report.  (Closes: #668851)
   * Convert package to the 3.0 (native) format, so dpkg-source
     strips the .git directory by default during build.
+  * Reorder two paragraphs in d/copyright to avoid one of them
+    being completely overwritten by the other.
 
  -- Niels Thykier <niels at thykier.net>  Thu, 01 Jan 2015 17:24:38 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 0e79f07..4b0693b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -65,14 +65,14 @@ Files: dh_ucf
 Copyright: 2011 Jeroen Schot <schot at A-Eskwadraat.nl>
 License: GPL-2+
 
-Files: Debian/Debhelper/Buildsystem/qmake.pm
-Copyright: 2010 Kel Modderman
-License: GPL-2+
-
 Files: Debian/Debhelper/Buildsystem* Debian/Debhelper/Dh_Buildsystems.pm
 Copyright: 2008-2009 Modestas Vainius
 License: GPL-2+
 
+Files: Debian/Debhelper/Buildsystem/qmake.pm
+Copyright: 2010 Kel Modderman
+License: GPL-2+
+
 Files: man/po4a/po/fr.po
 Copyright: 2005-2011 Valery Perrin <valery.perrin.debian at free.fr>
 License: GPL-2+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git