[med-svn] r21627 - trunk/packages/R/r-cran-xml2/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-03-31 06:30:31 +0000 (Thu, 31 Mar 2016)
New Revision: 21627

Modified:
   trunk/packages/R/r-cran-xml2/trunk/debian/copyright
Log:
Fix licensing issues


Modified: trunk/packages/R/r-cran-xml2/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-xml2/trunk/debian/copyright	2016-03-30 16:58:37 UTC (rev 21626)
+++ trunk/packages/R/r-cran-xml2/trunk/debian/copyright	2016-03-31 06:30:31 UTC (rev 21627)
@@ -1,31 +1,29 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Contact: Hadley Wickham <hadley at rstudio.com>
+Upstream-Contact: Hadley Wickham <hadley at rstudio.com>
 Source: https://cran.r-project.org/web/packages/xml2/
 
 Files: *
-Copyright: 2013-2016 Hadley Wickham <hadley at rstudio.com>, RStudio
-License: MIT
+Copyright: 2013-2016 Hadley Wickham <hadley at rstudio.com>, RStudio
+License: GPL-2+
 
 Files: debian/*
 Copyright: 2016 Andreas Tille <tille at debian.org>
-License: MIT
+License: GPL-2+
 
-License: MIT
- 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:
+License: GPL-2+
+    This program 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.
  .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
+    This program 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.
  .
- 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.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.