[med-svn] [SCM] r-cran-ggplot2 branch, master, updated. upstream/0.8.9-8-ge973814

Carlos Borroto carlos.borroto at gmail.com
Tue Feb 14 15:48:21 UTC 2012


The following commit has been merged in the master branch:
commit f07d685925dab22d37a26c40539027dbe1c198b2
Author: Carlos Borroto <carlos.borroto at gmail.com>
Date:   Tue Feb 14 10:43:40 2012 -0500

    adds MIT license to debian/copyright

diff --git a/debian/changelog b/debian/changelog
index c2909e6..a491cf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,4 @@ r-cran-ggplot2 (0.8.9-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #657989)
 
-  TODO:
-  * Add MIT license to debian/copyright
-
  -- Carlos Borroto <carlos.borroto at gmail.com>  Tue, 24 Jan 2012 14:50:41 -0500
diff --git a/debian/copyright b/debian/copyright
index c52925d..0139022 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,27 +5,26 @@ Source: http://cran.r-project.org/src/contrib/ggplot2_0.8.9.tar.gz
 Files: *
 Copyright: Hadley Wickham <h.wickham at gmail.com>
 License: MIT
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
+ 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,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so, subject
+ to the following conditions:
  .
- <Including paragraphs>
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ 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: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
+License: MIT
+ Same as ggplot2

-- 
Packaging for R/CRAN/ggplot2 in Debian



More information about the debian-med-commit mailing list