[med-svn] [SCM] r-bioc-cummerbund branch, master, updated. a050452aa2a724debe3121feeb2bfea2e5234d1a

[Carlos Borroto]

The following commit has been merged in the master branch:
commit 0a18f3aaca5c38cdce9211f301f1eb478873848c
Author: Carlos Borroto <carlos.borroto at gmail.com>
Date:   Tue Feb 21 11:19:55 2012 -0500

    fix license on debian/copyright

diff --git a/debian/changelog b/debian/changelog
index c94b603..e5d8ea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,4 @@ r-bioc-cummerbund (1.1.3-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #657997)
 
-  TODO:
-  * Add Artistic-2.0 license to debian/copyright
-
  -- Carlos Borroto <carlos.borroto at gmail.com>  Tue, 24 Jan 2012 12:08:29 -0500
diff --git a/debian/copyright b/debian/copyright
index df0913b..b7effd5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,27 +6,13 @@ Files: *
 Copyright: Loyal A. Goff <lgoff at csail.mit.edu>
            Cole Trapnell <cole at broadinstitute.org>
 License: Artistic-2.0
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the "Artistic License".
  .
- <Including paragraphs>
+ On Debian GNU/Linux systems, the complete text of Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'.
 
 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: Artistic-2.0
+ Same as cummeRbund

-- 
Packaging for R/Bioconductor/cummeRbund in Debian