[r-cran-mapproj] 11/23: Import Debian changes 1.1-8.2-1

Andreas Tille tille at debian.org
Fri Sep 8 08:03:07 UTC 2017


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-mapproj.

commit 1427f1d050d14b1f2f70a1053953723fa136ac9a
Merge: fc70cdf 95b95da
Author: Chris Lawrence <lawrencc at debian.org>
Date:   Tue Nov 3 15:22:41 2009 -0600

    Import Debian changes 1.1-8.2-1
    
    r-cran-mapproj (1.1-8.2-1) unstable; urgency=low
    
      * New upstream release; based on work licensed under the Lucent Public
        License (which is DFSG-free), so moving to main.

 DESCRIPTION                    |   23 +-
 LICENSE                        |   21 +
 debian/changelog               |    7 +
 debian/compat                  |    2 +-
 debian/control                 |    8 +-
 debian/copyright               |  206 ++++++-
 inst/LICENSE                   |   21 +
 man/mapproject.Rd              |   31 +-
 src/aitoff.c                   |   12 +-
 src/albers.c                   |   14 +-
 src/azequalarea.c              |    9 +-
 src/azequidist.c               |    9 +-
 src/bicentric.c                |    9 +-
 src/bonne.c                    |   11 +-
 src/ccubrt.c                   |    9 +-
 src/complex.c                  |   14 +-
 src/conic.c                    |    9 +-
 src/cubrt.c                    |    9 +-
 src/cuts.c                     |   22 +-
 src/cylequalarea.c             |    9 +-
 src/cylindrical.c              |    9 +-
 src/doug/Makefile              |  127 ----
 src/doug/README                |  158 -----
 src/doug/ascii2map             |   25 -
 src/doug/ascii2map1.c          |  192 ------
 src/doug/ascii2map2.c          |  106 ----
 src/doug/ascii2map3.c          |   55 --
 src/doug/doc/Makefile          |   16 -
 src/doug/doc/ascii2map.1       |   60 --
 src/doug/doc/ascii2map.1.ps    |  258 --------
 src/doug/doc/maint_record      |   48 --
 src/doug/doc/map.1             |  720 -----------------------
 src/doug/doc/map.1.ps          |  801 -------------------------
 src/doug/doc/map.3             |  151 -----
 src/doug/doc/map.3.ps          |  396 -------------
 src/doug/doc/map.5             |   89 ---
 src/doug/doc/map.5.ps          |  299 ----------
 src/doug/doc/route.1           |   44 --
 src/doug/doc/route.1.ps        |  255 --------
 src/doug/doc/tmac.anx          |   18 -
 src/doug/index.c               |   96 ---
 src/doug/iplot.h               |   74 ---
 src/doug/libmap/Makefile       |   21 -
 src/doug/libmap/aitoff.c       |   31 -
 src/doug/libmap/albers.c       |  123 ----
 src/doug/libmap/azequalarea.c  |   24 -
 src/doug/libmap/azequidist.c   |   24 -
 src/doug/libmap/bicentric.c    |   30 -
 src/doug/libmap/bonne.c        |   41 --
 src/doug/libmap/ccubrt.c       |   18 -
 src/doug/libmap/complex.c      |   89 ---
 src/doug/libmap/conic.c        |   32 -
 src/doug/libmap/cubrt.c        |   35 --
 src/doug/libmap/cuts.c         |   44 --
 src/doug/libmap/cylequalarea.c |   29 -
 src/doug/libmap/cylindrical.c  |   24 -
 src/doug/libmap/eisenlohr.c    |   24 -
 src/doug/libmap/elco2.c        |  137 -----
 src/doug/libmap/elliptic.c     |   42 --
 src/doug/libmap/fisheye.c      |   31 -
 src/doug/libmap/gall.c         |   34 --
 src/doug/libmap/gilbert.c      |   56 --
 src/doug/libmap/guyou.c        |  106 ----
 src/doug/libmap/harrison.c     |   45 --
 src/doug/libmap/hex.c          |  128 ----
 src/doug/libmap/homing.c       |  120 ----
 src/doug/libmap/lagrange.c     |   35 --
 src/doug/libmap/lambert.c      |   58 --
 src/doug/libmap/laue.c         |   29 -
 src/doug/libmap/lune.c         |   67 ---
 src/doug/libmap/mercator.c     |   41 --
 src/doug/libmap/mollweide.c    |   30 -
 src/doug/libmap/newyorker.c    |   33 --
 src/doug/libmap/orthographic.c |   40 --
 src/doug/libmap/perspective.c  |   89 ---
 src/doug/libmap/polyconic.c    |   33 --
 src/doug/libmap/rectangular.c  |   27 -
 src/doug/libmap/simpleconic.c  |   39 --
 src/doug/libmap/sinusoidal.c   |   22 -
 src/doug/libmap/tetra.c        |  214 -------
 src/doug/libmap/trapezoidal.c  |   35 --
 src/doug/libmap/twocirc.c      |   85 ---
 src/doug/libmap/zcoord.c       |  149 -----
 src/doug/map.c                 | 1265 ----------------------------------------
 src/doug/map.h                 |  156 -----
 src/doug/map.sh                |   71 ---
 src/doug/map.tar               |  Bin 849920 -> 0 bytes
 src/doug/mapdata/counties      |  Bin 268024 -> 0 bytes
 src/doug/mapdata/counties.x    |   16 -
 src/doug/mapdata/states        |  Bin 47340 -> 0 bytes
 src/doug/mapdata/states.x      |   16 -
 src/doug/mapdata/world         |  Bin 246580 -> 0 bytes
 src/doug/mapdata/world.x       |  348 -----------
 src/doug/plot.h                |   53 --
 src/doug/plot0.c               |    8 -
 src/doug/plotPS.c              |  159 -----
 src/doug/plotV.c               |   37 --
 src/doug/route.c               |  107 ----
 src/doug/symbol.c              |  195 -------
 src/doug/test.results          |   86 ---
 src/elco2.c                    |    9 +-
 src/elliptic.c                 |   21 +-
 src/fisheye.c                  |    9 +-
 src/gall.c                     |    9 +-
 src/gilbert.c                  |   12 +-
 src/guyou.c                    |    9 +-
 src/harrison.c                 |    9 +-
 src/hex.c                      |   51 +-
 src/homing.c                   |   21 +-
 src/lagrange.c                 |   11 +-
 src/lambert.c                  |   26 +-
 src/laue.c                     |    9 +-
 src/lune.c                     |    9 +-
 src/map.h                      |   27 +-
 src/mercator.c                 |    9 +-
 src/mollweide.c                |    9 +-
 src/newyorker.c                |    9 +-
 src/orthographic.c             |   11 +-
 src/perspective.c              |   21 +-
 src/polyconic.c                |    9 +-
 src/rectangular.c              |    9 +-
 src/simpleconic.c              |    9 +-
 src/sinusoidal.c               |    9 +-
 src/tetra.c                    |   30 +-
 src/trapezoidal.c              |    9 +-
 src/twocirc.c                  |    9 +-
 src/zcoord.c                   |   36 +-
 127 files changed, 481 insertions(+), 9213 deletions(-)

diff --cc debian/changelog
index a802cef,0000000..cc36bfb
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,0 +1,43 @@@
++r-cran-mapproj (1.1-8.2-1) unstable; urgency=low
++
++  * New upstream release; based on work licensed under the Lucent Public
++    License (which is DFSG-free), so moving to main.
++
++ -- Chris Lawrence <lawrencc at debian.org>  Tue, 03 Nov 2009 15:22:41 -0600
++
 +r-cran-mapproj (1.1-7.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Wed, 13 Aug 2008 18:17:14 -0500
 +
 +r-cran-mapproj (1.1-7.1-2) unstable; urgency=low
 +
 +  * Update for latest Standards-Version.
 +  * Include {shlibs:Depends} to capture libc dependency.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Sat, 16 Feb 2008 20:47:08 -0600
 +
 +r-cran-mapproj (1.1-7.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Fri, 29 Apr 2005 01:44:29 -0500
 +
 +r-cran-mapproj (1.1-7-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Fri, 29 Oct 2004 16:45:48 -0500
 +
 +r-cran-mapproj (1.1-6-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Mon, 19 Apr 2004 19:02:43 -0500
 +
 +r-cran-mapproj (1.1-1) unstable; urgency=low
 +
 +  * Initial Debian Release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Wed, 14 Jan 2004 02:40:32 -0600
diff --cc debian/compat
index b8626c4,0000000..7f8f011
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++7
diff --cc debian/control
index f5d0504,0000000..c4b416f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,17 @@@
 +Source: r-cran-mapproj
- Section: non-free/math
++Section: gnu-r
 +Priority: optional
 +Maintainer: Chris Lawrence <lawrencc at debian.org>
- Build-Depends: debhelper (>> 4.1.0), r-base-dev (>> 2.0.0), cdbs, r-cran-maps (>= 2.0-24)
- Standards-Version: 3.8.0
++Build-Depends: debhelper (>> 7), r-base-dev (>= 2.10.0~1), cdbs, r-cran-maps (>= 2.0-24)
++Standards-Version: 3.8.3
 +
 +Package: r-cran-mapproj
 +Architecture: any
- Depends: r-base-core (>> 2.0.0), r-cran-maps (>= 2.0-24-1), ${shlibs:Depends}
++Depends: r-base-core (>= 2.10.0~1), r-cran-maps (>= 2.0-24-1), ${shlibs:Depends}, ${misc:Depends}
 +Suggests: r-cran-mapdata
 +Description: GNU R support for cartographic projections of map data
 + This package provides facilities for easily producing cartographic
 + projections of maps based on data sets in the GNU R statistical
 + computing environment.  Projections are used by mapmakers to
 + compensate for the inaccuracies inherent in projecting a spheroid's
 + surface onto a two-dimensional plane.
diff --cc debian/copyright
index 9f0eaa8,0000000..c2bf563
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,23 -1,0 +1,221 @@@
 +This is the Debian package of the GNU R package known as "mapproj".  The
 +upstream authors are as follows:
 +
 +Doug McIlroy.  Packaged for R by Ray Brownrigg and Thomas P Minka.
 +
 +This package was created by Chris Lawrence <lawrencc at debian.org>,
 +based on Dirk Eddelbuettel's packaging of r-cran-car.
 +
 +The sources were downloaded from 
 +	http://cran.us.r-project.org/src/contrib/
 +
 +The package was renamed from its upstream name 'mapproj' to
 +'r-cran-mapproj' to fit the pattern of CRAN (and non-CRAN) packages
 +for R.
 +
- Copyright (C) 1998, Lucent Technologies
++1. C code
 +
- This package is copyrighted by Doug McIlroy, Ray Brownrigg, Thomas
- P. Minka, and Lucent Technologies, and is licensed for non-commercial
- use and distribution only.
++Source code for maps and map projections, included in 
++the Plan 9 distribution at: http://plan9.bell-labs.com/plan9/download.html
++(sys/src/cmd/map/), downloaded November 1, 2009 by Roger Bivand.
++
++Copyrighted and licensed by Lucent Technologies Inc., see
++http://plan9.bell-labs.com/plan9dist/license.html. All changes marked to
++satisfy requirement 3 C. The statement:
++
++Copyright (C) 2003, Lucent Technologies Inc. and others. All Rights Reserved.
++
++is included in file map.h to satisfy requirement 3 B.
++
++2. R interface: 
++
++The R interface code has been developed as work based on the Lucent
++Public License Version 1.02 licensed code. It is made available under
++both the Plan 9 license and GPL (>= 2).  The complete text of the GNU
++General Public License, version 2, can be found at
++/usr/share/common-licenses/GPL-2 on Debian systems.
 +
 +The upstream DESCRIPTION file for this package is available in
 +/usr/lib/R/site-library/maps/
++
++LUCENT PUBLIC LICENSE, Version 1.02
++
++THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS PUBLIC LICENSE
++("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
++RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
++**** 1. DEFINITIONS ****
++"Contribution" means:
++   a. in the case of Lucent Technologies Inc. ("LUCENT"), the Original Program,
++      and
++   b. in the case of each Contributor,
++         i. changes to the Program, and
++        ii. additions to the Program;
++      where such changes and/or additions to the Program were added to the
++      Program by such Contributor itself or anyone acting on such Contributor's
++      behalf, and the Contributor explicitly consents, in accordance with
++      Section 3C, to characterization of the changes and/or additions as
++      Contributions.
++"Contributor" means LUCENT and any other entity that has Contributed a
++Contribution to the Program.
++"Distributor" means a Recipient that distributes the Program, modifications to
++the Program, or any part thereof.
++"Licensed Patents" mean patent claims licensable by a Contributor which are
++necessarily infringed by the use or sale of its Contribution alone or when
++combined with the Program.
++"Original Program" means the original version of the software accompanying this
++Agreement as released by LUCENT, including source code, object code and
++documentation, if any.
++"Program" means the Original Program and Contributions or any part thereof
++"Recipient" means anyone who receives the Program under this Agreement,
++including all Contributors.
++**** 2. GRANT OF RIGHTS ****
++   a. Subject to the terms of this Agreement, each Contributor hereby grants
++      Recipient a non-exclusive, worldwide, royalty-free copyright license to
++      reproduce, prepare derivative works of, publicly display, publicly
++      perform, distribute and sublicense the Contribution of such Contributor,
++      if any, and such derivative works, in source code and object code form.
++   b. Subject to the terms of this Agreement, each Contributor hereby grants
++      Recipient a non-exclusive, worldwide, royalty-free patent license under
++      Licensed Patents to make, use, sell, offer to sell, import and otherwise
++      transfer the Contribution of such Contributor, if any, in source code and
++      object code form. The patent license granted by a Contributor shall also
++      apply to the combination of the Contribution of that Contributor and the
++      Program if, at the time the Contribution is added by the Contributor,
++      such addition of the Contribution causes such combination to be covered
++      by the Licensed Patents. The patent license granted by a Contributor
++      shall not apply to (i) any other combinations which include the
++      Contribution, nor to (ii) Contributions of other Contributors. No
++      hardware per se is licensed hereunder.
++   c. Recipient understands that although each Contributor grants the licenses
++      to its Contributions set forth herein, no assurances are provided by any
++      Contributor that the Program does not infringe the patent or other
++      intellectual property rights of any other entity. Each Contributor
++      disclaims any liability to Recipient for claims brought by any other
++      entity based on infringement of intellectual property rights or
++      otherwise. As a condition to exercising the rights and licenses granted
++      hereunder, each Recipient hereby assumes sole responsibility to secure
++      any other intellectual property rights needed, if any. For example, if a
++      third party patent license is required to allow Recipient to distribute
++      the Program, it is Recipient's responsibility to acquire that license
++      before distributing the Program.
++   d. Each Contributor represents that to its knowledge it has sufficient
++      copyright rights in its Contribution, if any, to grant the copyright
++      license set forth in this Agreement.
++**** 3. REQUIREMENTS ****
++A. Distributor may choose to distribute the Program in any form under this
++Agreement or under its own license agreement, provided that:
++   a. it complies with the terms and conditions of this Agreement;
++   b. if the Program is distributed in source code or other tangible form, a
++      copy of this Agreement or Distributor's own license agreement is included
++      with each copy of the Program; and
++   c. if distributed under Distributor's own license agreement, such license
++      agreement:
++         i. effectively disclaims on behalf of all Contributors all warranties
++            and conditions, express and implied, including warranties or
++            conditions of title and non-infringement, and implied warranties or
++            conditions of merchantability and fitness for a particular purpose;
++        ii. effectively excludes on behalf of all Contributors all liability
++            for damages, including direct, indirect, special, incidental and
++            consequential damages, such as lost profits; and
++       iii. states that any provisions which differ from this Agreement are
++            offered by that Contributor alone and not by any other party.
++B. Each Distributor must include the following in a conspicuous location in the
++Program:
++     Copyright (C) 2003, Lucent Technologies Inc. and others. All Rights
++     Reserved.
++C. In addition, each Contributor must identify itself as the originator of its
++Contribution in a manner that reasonably allows subsequent Recipients to
++identify the originator of the Contribution. Also, each Contributor must agree
++that the additions and/or changes are intended to be a Contribution. Once a
++Contribution is contributed, it may not thereafter be revoked.
++**** 4. COMMERCIAL DISTRIBUTION ****
++Commercial distributors of software may accept certain responsibilities with
++respect to end users, business partners and the like. While this license is
++intended to facilitate the commercial use of the Program, the Distributor who
++includes the Program in a commercial product offering should do so in a manner
++which does not create potential liability for Contributors. Therefore, if a
++Distributor includes the Program in a commercial product offering, such
++Distributor ("Commercial Distributor") hereby agrees to defend and indemnify
++every Contributor ("Indemnified Contributor") against any losses, damages and
++costs (collectively "Losses") arising from claims, lawsuits and other legal
++actions brought by a third party against the Indemnified Contributor to the
++extent caused by the acts or omissions of such Commercial Distributor in
++connection with its distribution of the Program in a commercial product
++offering. The obligations in this section do not apply to any claims or Losses
++relating to any actual or alleged intellectual property infringement. In order
++to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
++Distributor in writing of such claim, and b) allow the Commercial Distributor
++to control, and cooperate with the Commercial Distributor in, the defense and
++any related settlement negotiations. The Indemnified Contributor may
++participate in any such claim at its own expense.
++For example, a Distributor might include the Program in a commercial product
++offering, Product X. That Distributor is then a Commercial Distributor. If that
++Commercial Distributor then makes performance claims, or offers warranties
++related to Product X, those performance claims and warranties are such
++Commercial Distributor's responsibility alone. Under this section, the
++Commercial Distributor would have to defend claims against the Contributors
++related to those performance claims and warranties, and if a court requires any
++Contributor to pay any damages as a result, the Commercial Distributor must pay
++those damages.
++**** 5. NO WARRANTY ****
++EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
++"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
++IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
++NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
++Recipient is solely responsible for determining the appropriateness of using
++and distributing the Program and assumes all risks associated with its exercise
++of rights under this Agreement, including but not limited to the risks and
++costs of program errors, compliance with applicable laws, damage to or loss of
++data, programs or equipment, and unavailability or interruption of operations.
++**** 6. DISCLAIMER OF LIABILITY ****
++EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
++CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
++PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
++WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
++GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
++**** 7. EXPORT CONTROL ****
++Recipient agrees that Recipient alone is responsible for compliance with the
++United States export administration regulations (and the export control laws
++and regulation of any other countries).
++**** 8. GENERAL ****
++If any provision of this Agreement is invalid or unenforceable under applicable
++law, it shall not affect the validity or enforceability of the remainder of the
++terms of this Agreement, and without further action by the parties hereto, such
++provision shall be reformed to the minimum extent necessary to make such
++provision valid and enforceable.
++If Recipient institutes patent litigation against a Contributor with respect to
++a patent applicable to software (including a cross-claim or counterclaim in a
++lawsuit), then any patent licenses granted by that Contributor to such
++Recipient under this Agreement shall terminate as of the date such litigation
++is filed. In addition, if Recipient institutes patent litigation against any
++entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
++Program itself (excluding combinations of the Program with other software or
++hardware) infringes such Recipient's patent(s), then such Recipient's rights
++granted under Section 2(b) shall terminate as of the date such litigation is
++filed.
++All Recipient's rights under this Agreement shall terminate if it fails to
++comply with any of the material terms or conditions of this Agreement and does
++not cure such failure in a reasonable period of time after becoming aware of
++such noncompliance. If all Recipient's rights under this Agreement terminate,
++Recipient agrees to cease use and distribution of the Program as soon as
++reasonably practicable. However, Recipient's obligations under this Agreement
++and any licenses granted by Recipient relating to the Program shall continue
++and survive.
++LUCENT may publish new versions (including revisions) of this Agreement from
++time to time. Each new version of the Agreement will be given a distinguishing
++version number. The Program (including Contributions) may always be distributed
++subject to the version of the Agreement under which it was received. In
++addition, after a new version of the Agreement is published, Contributor may
++elect to distribute the Program (including its Contributions) under the new
++version. No one other than LUCENT has the right to modify this Agreement.
++Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives
++no rights or licenses to the intellectual property of any Contributor under
++this Agreement, whether expressly, by implication, estoppel or otherwise. All
++rights in the Program not expressly granted under this Agreement are reserved.
++This Agreement is governed by the laws of the State of New York and the
++intellectual property laws of the United States of America. No party to this
++Agreement will bring a legal action under this Agreement more than one year
++after the cause of action arose. Each party waives its rights to a jury trial
++in any resulting litigation.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-mapproj.git



More information about the debian-science-commits mailing list