This is an automated email from the git hooks/post-receive script.
benjamin-guest pushed a commit to branch master
in repository r-cran-scales.
commit 6ae36f5d9b1e595f1e03c2df19a573191a392fca
Author: Benjamin Eikel <deb...@eikel.org>
Date: Tue Jun 17 20:25:19 2014 +0200
Merge upstream license file into copyright
and improve copyright file. This fixes two lintian warnings.
---
LICENSE | 2 --
debian/copyright | 14 ++++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 0b0b02e..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,2 +0,0 @@
-YEAR: 2010-2014
-COPYRIGHT HOLDER: Hadley Wickham
diff --git a/debian/copyright b/debian/copyright
index d7fd993..1ddbc10 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: scales
-Source: http://cran.r-project.org/src/contrib/scales_0.2.3.tar.gz
+Source: http://cran.r-project.org/src/contrib/scales_0.2.4.tar.gz
Files: *
-Copyright: Hadley Wickham <h.wick...@gmail.com>
+Copyright: Copyright 2010-2014 Hadley Wickham <h.wick...@gmail.com>
+License: MIT
+
+Files: debian/*
+Copyright: Copyright 2013-2014 Benjamin Eikel <deb...@eikel.org>
+License: MIT
+
License: MIT
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files
@@ -23,7 +29,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: Copyright 2013 Benjamin Eikel <deb...@eikel.org>
-License: MIT
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/debian-med/r-cran-scales.git
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
