[plexus-utils2] 04/05: debian/copyright: Merged the duplicate Copyright fields

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository plexus-utils2.

commit 6f5d11fced00bac3190f155e05775e3e7f0f50b3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Oct 5 22:44:40 2014 +0200

    debian/copyright: Merged the duplicate Copyright fields
---
 debian/changelog | 1 +
 debian/copyright | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d132c64..ba97622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ plexus-utils2 (2.0.5-2) UNRELEASED; urgency=medium
     - Standards-Version updated to 3.9.6 (no changes)
     - Use canonical URLs for the Vcs-* fields
   * Switch to debhelper level 9
+  * debian/copyright: Merged the duplicate Copyright fields
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 05 Oct 2014 22:38:31 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 2523070..6580aab 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,13 +31,13 @@ License: BSD-Indiana
 
 Files: src/main/java/org/codehaus/plexus/util/cli/*
 Copyright: 2001-2003, ThoughtWorks, Inc
-Copyright: 2003-2004, The Apache Software Foundation.
-Copyright: 2001-2010, Codehaus
+           2003-2004, The Apache Software Foundation.
+           2001-2010, Codehaus
 License: Apache-2.0 and BSD-Cruisecontrol
 
 Files: debian/*
 Copyright: 2010, Ludovic Claude <ludovic.claude at laposte.net>
-Copyright: 2011, Damien Raude-Morvan <drazzib at debian.org>
+           2011, Damien Raude-Morvan <drazzib at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-utils2.git