[med-svn] [r-cran-reshape2] 06/08: DEP5

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-reshape2.

commit dafb802380ac1be680948e8d55a963c6cb0abda7
Author: Andreas Tille <tille at debian.org>
Date:   Mon Nov 7 19:19:57 2016 +0100

    DEP5
---
 debian/changelog |  1 +
 debian/copyright | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd6a23e..a1c1562 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ r-cran-reshape2 (1.4.2-1) UNRELEASED; urgency=medium
   * Removed Carlos Borroto from Uploaders
   * Convert to dh-r
   * Canonical homepage for CRAN
+  * DEP5
 
  -- Andreas Tille <tille at debian.org>  Mon, 07 Nov 2016 18:57:44 +0100
 
diff --git a/debian/copyright b/debian/copyright
index e1d290c..8052827 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,17 @@
-Format: http://dep.debian.net/deps/dep5
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: reshape2
 Source: https://cran.r-project.org/package=reshape2
 
 Files: *
-Copyright: Hadley Wickham <h.wickham at gmail.com>
-License: MIT
+Copyright: 2010-2016 Hadley Wickham <h.wickham at gmail.com>
+License: Expat
+
+Files: debian/*
+Copyright: 2012 Carlos Borroto <carlos.borroto at gmail.com>
+           2014-2016 Andreas Tille <tille at debian.org>
+License: Expat
+
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files
  (the "Software"), to deal in the Software without restriction,
@@ -23,9 +30,3 @@ License: MIT
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  IN THE SOFTWARE.
-
-Files: debian/*
-Copyright: 2012 Carlos Borroto <carlos.borroto at gmail.com>
-License: MIT
- Same as reshape2
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-reshape2.git