summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--licenses/PIZZA-WARE7
-rw-r--r--licenses/googleearth161
-rw-r--r--profiles/license_groups4
3 files changed, 2 insertions, 170 deletions
diff --git a/licenses/PIZZA-WARE b/licenses/PIZZA-WARE
deleted file mode 100644
index 292bf9727aa..00000000000
--- a/licenses/PIZZA-WARE
+++ /dev/null
@@ -1,7 +0,0 @@
-------------------------------------------------------------------
-"THE PIZZA-WARE LICENSE" (Revision 42):
-Peter Hofmann <pcode@uninformativ.de> wrote these files. As long as you
-retain this notice you can do whatever you want with this stuff. If we
-meet some day, and you think this stuff is worth it, you can buy me a
-pizza in return.
-------------------------------------------------------------------
diff --git a/licenses/googleearth b/licenses/googleearth
deleted file mode 100644
index f2a8911bd51..00000000000
--- a/licenses/googleearth
+++ /dev/null
@@ -1,161 +0,0 @@
-# file generated using the following command (open the link in browser for up-to-date version with html links)
-# lynx -dump http://www.google.com/intl/en/help/terms_maps_earth.html
-
- Google Maps/Earth Terms of Service
-
- By downloading, installing, or using the Google Earth software,
- accessing or using the Google Maps service (together, the "Products" or
- "Services"), or accessing or using any of the content available within
- the Products, you agree to be bound by the following: (1) the [1]Google
- Terms of Service (the "Universal Terms"); (2) the terms found on our
- [2]Legal Notices page (the "Legal Notices"); and (3) the additional
- terms and conditions set forth below (the "Additional Terms"). Before
- you continue, you should read each of these three documents, as
- together they form a binding agreement between you and Google regarding
- your use of the Products. Collectively, the Universal Terms, the Legal
- Notices, and the Additional Terms are referred to as the "Terms".
- As a condition of downloading, accessing, or using the Products, you
- also agree to the terms of the [3]Google Privacy Policy.
- 1. Use of the Products. Google grants you a non-exclusive,
- non-transferable license to access the Google Maps service, to download
- and use the Google Earth software and service, and to access the
- Content (as defined below) within the Products and according to the
- Terms.
- 2. Restrictions on Use. Unless you have received prior written
- authorization from Google (or, as applicable, from the provider of
- particular Content), you must not:
- (a) access or use the Products or any Content through any technology or
- means other than those provided in the Products, or through other
- explicitly authorized means Google may designate (such as through the
- [4]Google Maps/Google Earth APIs);
- (b) copy, translate, modify, or make derivative works of the Content or
- any part thereof;
- (c) redistribute, sublicense, rent, publish, sell, assign, lease,
- market, transfer, or otherwise make the Products or Content available
- to third parties;
- (d) reverse engineer, decompile or otherwise attempt to extract the
- source code of the Service or any part thereof, unless this is
- expressly permitted or required by applicable law;
- (e) use the Products in a manner that gives you or any other person
- access to mass downloads or bulk feeds of any Content, including but
- not limited to numerical latitude or longitude coordinates, imagery,
- and visible map data;
- (f) delete, obscure, or in any manner alter any warning, notice
- (including but not limited to any copyright or other proprietary rights
- notice), or link that appears in the Products or the Content; or
- (g) use the Service or Content with any products, systems, or
- applications for or in connection with (i) real time navigation or
- route guidance, including but not limited to turn-by-turn route
- guidance that is synchronized to the position of a user's
- sensor-enabled device; or (ii) any systems or functions for automatic
- or autonomous control of vehicle behavior.
- 3. Appropriate Conduct; Compliance with Law and Google Policies. You
- agree that you are responsible for your own conduct and content while
- using the Products, and for any consequences thereof. You agree to use
- the Products only for purposes that are legal, proper and in accordance
- with the Terms and any applicable policies or guidelines Google may
- make available. By way of example, and not as a limitation, you agree
- that when using the Products or the Content, you will not:
- (a) defame, abuse, harass, stalk, threaten or otherwise violate the
- legal rights (such as rights of privacy and publicity) of others;
- (b) upload, post, email, transmit or otherwise make available any
- inappropriate, defamatory, obscene, or unlawful content;
- (c) upload, post, transmit or otherwise make available any content that
- infringes any patent, trademark, copyright, trade secret or other
- proprietary right of any party, unless you are the owner of the rights,
- or have the permission of the owner or other legal justification to use
- such content;
- (d) upload, post, email, transmit or otherwise make available messages
- that promote pyramid schemes, chain letters, or disruptive commercial
- messages or advertisements;
- (e) upload, post, email, transmit or otherwise make available any other
- content, message, or communication prohibited by applicable law, the
- Terms or any applicable Product policies or guidelines;
- (f) download any file posted by another that you know, or reasonably
- should know, cannot be legally distributed in such manner;
- (g) impersonate another person or entity, or falsify or delete any
- author attributions or proprietary designations or labels of the origin
- or source of Content, software or other material;
- (h) restrict or inhibit any other user from using and enjoying the
- Products or Google services;
- (i) interfere with or disrupt Google services or servers or networks
- connected to Google services, or disobey any requirements, procedures,
- policies or regulations of networks connected to Google services;
- (j) use any robot, spider, site search/retrieval application, or other
- device to retrieve or index any portion of the Google services or
- Content, or collect information about users for any unauthorized
- purpose;
- (k) submit content that falsely expresses or implies that such content
- is sponsored or endorsed by Google;
- (l) create user accounts by automated means or under false or
- fraudulent pretenses;
- (m) promote or provide instructional information about illegal
- activities;
- (n) promote physical harm or injury against any group or individual; or
- (o) transmit any viruses, worms, defects, Trojan horses, or any items
- of a destructive nature.
- 4. Content in the Products. Google Maps and Google Earth allow you to
- access and view a variety of content, including but not limited to
- photographic imagery, map and terrain data, business listings, reviews,
- traffic, and other related information provided by Google, its
- licensors, and its users (the "Content"). Additionally, you may choose
- to access other third party content made available in the Products
- through Google services such as Google Gadgets. You understand and
- agree to the following:
- (a) Map data, traffic, directions, and related Content are provided for
- planning purposes only. You may find that weather conditions,
- construction projects, closures, or other events may cause road
- conditions or directions to differ from the map results. You should
- exercise judgment in your use of this Content.
- (b) By using the Products, you do not receive any, and Google and/or
- its licensors and users retain all ownership rights in the Content. You
- may not use, access or allow others to use or access the Content in any
- manner not permitted under the Terms, unless you have been specifically
- permitted to do so by Google or by the owner of that Content, in a
- separate agreement.
- (c) Certain Content is provided under [5]license from third parties,
- including but not limited to Tele Atlas B.V. ("Tele Atlas"), and is
- subject to copyright and other intellectual property rights owned by or
- licensed to Tele Atlas and/or such third parties. You may be held
- liable for any unauthorized copying or disclosure of this Content. Your
- use of Tele Atlas Content, including but not limited to printing or use
- in marketing or promotional materials, is subject to additional
- restrictions located in the [6]Legal Notices page.
- 5. Additional Terms for Google Earth.
- (a) Export Restrictions. The Google Earth software is subject to United
- States export controls. By using the Google Earth software, you agree
- to use the software only for purposes that are legal, proper and in
- accordance with these Terms. Specifically, you agree to comply with all
- applicable export and reexport control laws and regulations, including
- the Export Administration Regulations ("EAR") maintained by the U.S.
- Department of Commerce, and trade and economic sanctions maintained by
- the Treasury Department's Office of Foreign Assets Control.
- (b) Automatic Updates. The Google Earth software may communicate with
- Google servers from time to time to check for available updates to the
- software, such as bug fixes, patches, enhanced functions, missing
- plug-ins and new versions (collectively, "Updates"). By installing the
- Google Earth software, you agree to automatically request and receive
- Updates.
- 6. DISCLAIMER OF WARRANTIES AND LIMITATIONS ON LIABILITY.
- (a) GOOGLE AND ITS LICENSORS (INCLUDING BUT NOT LIMITED TO TELE ATLAS
- AND ITS SUPPLIERS) MAKE NO REPRESENTATIONS OR WARRANTIES REGARDING THE
- ACCURACY OR COMPLETENESS OF ANY CONTENT OR THE PRODUCTS.
- (b) SUBJECT TO SECTION 14.1 OF THE GOOGLE UNIVERSAL TERMS, GOOGLE AND
- ITS LICENSORS (INCLUDING BUT NOT LIMITED TO TELE ATLAS AND ITS
- SUPPLIERS) DISCLAIM ALL WARRANTIES IN CONNECTION WITH THE CONTENT AND
- THE PRODUCTS, AND WILL NOT BE LIABLE FOR ANY DAMAGE OR LOSS RESULTING
- FROM YOUR USE OF THE CONTENT OR THE PRODUCTS.
- 7. U.S. Government Restricted Rights. If the Products are being used or
- accessed by or on behalf of the United States government, such use is
- subject to additional terms located in the "Government End Users"
- section of our [7]Legal Notices page.
-
-References
-
- 1. http://www.google.com/terms_of_service.html
- 2. http://www.google.com/intl/en-us/help/legalnotices_maps.html
- 3. http://www.google.com/privacypolicy.html
- 4. http://code.google.com/apis/maps/terms.html
- 5. http://www.google.com/intl/en-us/help/legalnotices_maps.html
- 6. http://www.google.com/intl/en-us/help/legalnotices_maps.html
- 7. http://www.google.com/intl/en-us/help/legalnotices_maps.html
diff --git a/profiles/license_groups b/profiles/license_groups
index 2ccf5f12b73..32cfceb8d1f 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
# Licenses in this list should NOT appear directly or indirectly in
# @FSF-APPROVED or @OSI-APPROVED.
# Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 PIZZA-WARE pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
# Metaset for all free software
FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
# License agreements that try to take away your rights. These are more
# restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 dotnet-eula ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome googleearth Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant Xerox yangcli-pro zi-labone
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 dotnet-eula ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant Xerox yangcli-pro zi-labone
# Local Variables:
# mode: conf-space