r45897 - in /packages/R/r-cran-maptools/trunk/debian: changelog copyright

tille at users.alioth.debian.org tille at users.alioth.debian.org
Thu May 16 15:49:12 UTC 2013 

Author: tille
Date: Thu May 16 15:49:11 2013
New Revision: 45897

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45897
Log:
Use `cme fix dpkg-copyright` to make it DEP5 compatible

Modified:
    packages/R/r-cran-maptools/trunk/debian/changelog
    packages/R/r-cran-maptools/trunk/debian/copyright

Modified: packages/R/r-cran-maptools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-maptools/trunk/debian/changelog?rev=45897&op=diff
==============================================================================
--- packages/R/r-cran-maptools/trunk/debian/changelog (original)
+++ packages/R/r-cran-maptools/trunk/debian/changelog Thu May 16 15:49:11 2013
@@ -8,6 +8,8 @@
      - debhelper 9 (also debian/compat)
      - normalised using `cme fix dpkg-control`
   * Separate information about testing from README.Debian
+  * debian/copyright: Use `cme fix dpkg-copyright` to make it DEP5
+    compatible
 
  -- Andreas Tille <tille at debian.org>  Thu, 16 May 2013 17:35:43 +0200
 

Modified: packages/R/r-cran-maptools/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-maptools/trunk/debian/copyright?rev=45897&op=diff
==============================================================================
--- packages/R/r-cran-maptools/trunk/debian/copyright (original)
+++ packages/R/r-cran-maptools/trunk/debian/copyright Thu May 16 15:49:11 2013
@@ -1,9 +1,7 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: maptools
-Upstream-Maintainer: Nicholas J. Lewin-Koh, Roger Bivand, and others
-Upstream-Source: http://cran.r-project.org/web/packages/maptools/
-X-Debianized-By: Andreas Tille <tille at debian.org>
-X-Packaged-Date: Tue, 13 Jan 2009 11:48:08 +0100
+Upstream-Contact: Nicholas J. Lewin-Koh, Roger Bivand, and others
+Source: http://cran.r-project.org/web/packages/maptools/
 Disclaimer : This package is not part of the Debian operating system.
  The r-cran-maptools source and binary Debian packages are part of the
  "non-free" area in our archive. The packages in this area are not part of the
@@ -21,14 +19,13 @@
  .
  The r-cran-maptools package also contains files of unclear ownership and
  licensing: `data/wrld_simpl.rda' and `inst/shapes/pointZ.*'.
-
 X-Non-Free-Autobuild: yes
   The licence does not forbid Debian from using autobuilders to create binary
   packages.
 
 Files: *
-License: GPL-2+
 Copyright: © 2001-2008 Nicholas J. Lewin-Koh and Roger Bivand
+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
@@ -42,7 +39,8 @@
  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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
-X-Comment: On Debian systems, the complete text of the GNU General Public
+ .
+ On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files:  data/wrld_simpl.rda
@@ -74,7 +72,7 @@
  any warranties. Please make sure to give proper credit when using
  them in any publications. Some of the data sets are purely illustrative
  and should not be used for substantive research."
-X-Comment: Additional quote from an e-mail to debian-science list:
+Comment: Additional quote from an e-mail to debian-science list:
  see http://lists.debian.org/debian-science/2009/03/msg00056.html
  .
  Date: Sun, 15 Mar 2009 19:22:26 -0700
@@ -104,7 +102,7 @@
  .
  Enjoy.
  Julia
-X-Comment: In addition you might like to read
+Comment: In addition you might like to read
  http://www.census.gov/geo/www/tiger/faq.html#38
 
 Files: inst/shapes/pointZ.*
@@ -121,7 +119,7 @@
 Files: R/point.in.polygon.R
 Copyright: © 2004 Edzer Pebesma
 License: GPL-2+
-X-Comment: This file was copied from the R sp package, released under the GNU
+Comment: This file was copied from the R sp package, released under the GNU
  GPL version 2 or any later version.
  See http://downloads.sourceforge.net/r-spatial/sp_0.7-0.tar.gz for confirmation.
 
@@ -135,14 +133,14 @@
 
 Files: src/pip.c
 Copyright: © 2004 Edzer Pebesma, with portion © 1998 by Joseph O'Rourke.
-License: GPL-2+, with portion as follows:
+License: GPL-2+_with_portion
  Written by Joseph O'Rourke, contributions by Min Xu, June 1997.
  Questions to orourke at cs.smith.edu.
  .
  This code is Copyright 1998 by Joseph O'Rourke.  It may be freely 
  redistributed in its entirety provided that this copyright notice is 
  not removed.
-X-Comment: This file was copied from the R sp package, released under the GNU
+Comment: This file was copied from the R sp package, released under the GNU
  GPL version 2 or any later version.
  See http://downloads.sourceforge.net/r-spatial/sp_0.7-0.tar.gz for confirmation.
 
@@ -172,7 +170,7 @@
  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.
-X-Comment: quoting from http://shapelib.maptools.org/license.html :
+Comment: quoting from http://shapelib.maptools.org/license.html :
  I am pleased to receive bug fixes, and improvements for Shapelib. Unless the
  submissions indicate otherwise I will assume that changes submitted to me
  remain under the the above "dual license" terms. If changes are made to the
@@ -192,4 +190,21 @@
 
 Files: debian/*
 Copyright: 2009 Andreas Tille <tille at debian.org>
-License: Same as maptools itself
+License: GPL-2+
+
+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.
+ .
+ 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.
+ .
+ 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 Public
+ License can be found in `/usr/share/common-licenses/GPL'.

More information about the debian-science-commits mailing list