Update gpl license from V2 and V3, and remove dual license provision

README

@@ -2,6 +2,10 @@ This is the github repository for the Gaggle Android application for glider proj
 
 Includes XC server integration.
 
+This software is Copyright 2010, 2011, and 2012 by Kevin Hester of Geeksville Industries LLC and 
+is distributed under the terms of the GNU General Public License. The GPL v3 license is included 
+in this distribution in the /assets/manual/ folder or can be found at <http://www.gnu.org/licenses/> 
+or at <http://gplv3.fsf.org>.
 
 Developers should start here: https://github.com/geeksville/Gaggle/wiki/Developers-page
 

assets/manual/geeksville_license_release.txt

@@ -0,0 +1,10 @@
+Hi ya'll,
+
+hereby authorizing changing the license to a standard GPL license.   Please
+leave the copyright in my name though (if only for historical karma ;-)).
+ If someone radically changes some file, of course I'm fine with them
+adding their name to the copyright.
+
+Kevin
+
+(taken from https://github.com/geeksville/Gaggle/pull/81)

assets/manual/index.html

@@ -9,17 +9,19 @@
 <img alt="Paraglider" src="paraglider.jpg" width="100%"/>
 <p>&nbsp;</p>
 <h1>What is Gaggle?</h1>
-<p>Gaggle is a GPS & Vario for hang-glider, paraglider and  
-sailplane pilots.</p>
-<p>The ambition is to turn this into a fully-fledged flight GPS. As a beta tester of this application, 
+<p>Gaggle is a GPS & Vario for hang-glider, paraglider and sailplane pilots.</p>
+<p>This software is copyright Copyright 2010, 2011, and 2012 by Kevin Hester of Geeksville Industries LLC and 
+is distributed under terms of the GNU General Public License. The GPL v3 license is included in this distribution 
+in the /assets/manual/ folder. More information can be found online at http://www.gnu.org/licenses/gpl-3.txt</p>
+<p>The ambition is to turn this into a fully-fledged flight GPS. As a user of this application, 
 your feedback is especially valuable - please visit the support forum and post your requests/feedback.</p>
 <div class="warning_box"><p><b>Warning</b>: You should not make potentially life threatening decisions based on the information provided by this application</p></div>
 <p>As the pilot, you are responsible for your safety. This application
 can help you guide that decision but you should always treat the information provided with care.</p>
 <ul>
 <li><a href="usage.html">How to use this application</a></li>
 <li><a href="features.html">Features</a></li>
-<li><a href="support.html">Support</li>
+<li><a href="support.html">Support</a></li>
 <li><a href="recommended.html">Recommended devices</a> (devices with Barometer hardware)</li>
 <li><a href="credits.html">Credits</a> and copyright information</br></li>
 <li><a href="releasenotes.html">Release notes</a></li>

assets/manual/usage/basic_flight_recording.html

@@ -23,7 +23,7 @@ <h1>Detecting a launch</h1>
 <h1>Customizing the fields you see</h1>
 <p>There are many fields available in the flight tab, including Vertical and Horizontal Speed, Glide Ration, Altitude, heading, Lat, Long and many more.</p>
 <p>Some fields only have a value if you are using a flight plan including Waypoints and a Landing Zone.</p> 
-<p>You can customise the fields that are shown during a flight, hiding any that you don't find useful, by select Menu -> Customize Fields and deselecting
+<p>You can customise the fields that are shown during a flight, hiding any that you don't find useful, by choosing Menu -> Customize Fields and deselecting
 any that you don't want to show.</p>
 <div class="nav_button left"><a href="../usage.html">Back</a></div><div class="nav_button right"><a href="exporting_flight_data.html">Next</a></div>
 </body>

src/com/geeksville/android/DBListActivity.java

@@ -1,23 +1,19 @@
-/*******************************************************************************
- * Gaggle is Copyright 2010 by Geeksville Industries LLC, a California limited liability corporation. 
+/****************************************************************************************
+ * Gaggle is Copyright 2010, 2011, and 2012 by Kevin Hester of Geeksville Industries LLC,
+ * a California limited liability corporation. 
  * 
- * Gaggle is distributed under a dual license.  We've chosen this approach because within Gaggle we've used a number
- * of components that Geeksville Industries LLC might reuse for commercial products.  Gaggle can be distributed under
- * either of the two licenses listed below.
+ * Gaggle 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 3 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. 
+ * Gaggle 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. 
  * 
- * Commercial Distribution License
- * If you would like to distribute Gaggle (or portions thereof) under a license other than 
- * the "GNU General Public License, version 2", contact Geeksville Industries.  Geeksville Industries reserves
- * the right to release Gaggle source code under a commercial license of its choice.
- * 
- * GNU Public License, version 2
- * All other distribution of Gaggle must conform to the terms of the GNU Public License, version 2.  The full
- * text of this license is included in the Gaggle source, see assets/manual/gpl-2.0.txt.
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License along with Gaggle 
+ * included in this distribution in the manual (assets/manual/gpl-v3.txt). If not, see  
+ * <http://www.gnu.org/licenses/> or at <http://gplv3.fsf.org>.
+ ****************************************************************************************/
 package com.geeksville.android;
 
 import android.app.AlertDialog;

src/com/geeksville/android/TonePlayer.java

@@ -1,23 +1,19 @@
-/*******************************************************************************
- * Gaggle is Copyright 2010 by Geeksville Industries LLC, a California limited liability corporation. 
+/****************************************************************************************
+ * Gaggle is Copyright 2010, 2011, and 2012 by Kevin Hester of Geeksville Industries LLC,
+ * a California limited liability corporation. 
  * 
- * Gaggle is distributed under a dual license.  We've chosen this approach because within Gaggle we've used a number
- * of components that Geeksville Industries LLC might reuse for commercial products.  Gaggle can be distributed under
- * either of the two licenses listed below.
+ * Gaggle 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 3 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. 
+ * Gaggle 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. 
  * 
- * Commercial Distribution License
- * If you would like to distribute Gaggle (or portions thereof) under a license other than 
- * the "GNU General Public License, version 2", contact Geeksville Industries.  Geeksville Industries reserves
- * the right to release Gaggle source code under a commercial license of its choice.
- * 
- * GNU Public License, version 2
- * All other distribution of Gaggle must conform to the terms of the GNU Public License, version 2.  The full
- * text of this license is included in the Gaggle source, see assets/manual/gpl-2.0.txt.
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License along with Gaggle 
+ * included in this distribution in the manual (assets/manual/gpl-v3.txt). If not, see  
+ * <http://www.gnu.org/licenses/> or at <http://gplv3.fsf.org>.
+ ****************************************************************************************/
 package com.geeksville.android;
 
 import android.media.AudioFormat;

src/com/geeksville/gaggle/AboutActivity.java

@@ -1,23 +1,19 @@
-/*******************************************************************************
- * Gaggle is Copyright 2010 by Geeksville Industries LLC, a California limited liability corporation. 
+/****************************************************************************************
+ * Gaggle is Copyright 2010, 2011, and 2012 by Kevin Hester of Geeksville Industries LLC,
+ * a California limited liability corporation. 
  * 
- * Gaggle is distributed under a dual license.  We've chosen this approach because within Gaggle we've used a number
- * of components that Geeksville Industries LLC might reuse for commercial products.  Gaggle can be distributed under
- * either of the two licenses listed below.
+ * Gaggle 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 3 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. 
+ * Gaggle 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. 
  * 
- * Commercial Distribution License
- * If you would like to distribute Gaggle (or portions thereof) under a license other than 
- * the "GNU General Public License, version 2", contact Geeksville Industries.  Geeksville Industries reserves
- * the right to release Gaggle source code under a commercial license of its choice.
- * 
- * GNU Public License, version 2
- * All other distribution of Gaggle must conform to the terms of the GNU Public License, version 2.  The full
- * text of this license is included in the Gaggle source, see assets/manual/gpl-2.0.txt.
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License along with Gaggle 
+ * included in this distribution in the manual (assets/manual/gpl-v3.txt). If not, see  
+ * <http://www.gnu.org/licenses/> or at <http://gplv3.fsf.org>.
+ ****************************************************************************************/
 package com.geeksville.gaggle;
 
 import android.app.Activity;

src/com/geeksville/gaggle/Account.java

@@ -1,23 +1,19 @@
-/*******************************************************************************
- * Gaggle is Copyright 2010 by Geeksville Industries LLC, a California limited liability corporation. 
+/****************************************************************************************
+ * Gaggle is Copyright 2010, 2011, and 2012 by Kevin Hester of Geeksville Industries LLC,
+ * a California limited liability corporation. 
  * 
- * Gaggle is distributed under a dual license.  We've chosen this approach because within Gaggle we've used a number
- * of components that Geeksville Industries LLC might reuse for commercial products.  Gaggle can be distributed under
- * either of the two licenses listed below.
+ * Gaggle 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 3 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. 
+ * Gaggle 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. 
  * 
- * Commercial Distribution License
- * If you would like to distribute Gaggle (or portions thereof) under a license other than 
- * the "GNU General Public License, version 2", contact Geeksville Industries.  Geeksville Industries reserves
- * the right to release Gaggle source code under a commercial license of its choice.
- * 
- * GNU Public License, version 2
- * All other distribution of Gaggle must conform to the terms of the GNU Public License, version 2.  The full
- * text of this license is included in the Gaggle source, see assets/manual/gpl-2.0.txt.
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License along with Gaggle 
+ * included in this distribution in the manual (assets/manual/gpl-v3.txt). If not, see  
+ * <http://www.gnu.org/licenses/> or at <http://gplv3.fsf.org>.
+ ****************************************************************************************/
 package com.geeksville.gaggle;
 
 import android.content.Context;

src/com/geeksville/gaggle/AltitudeView.java

@@ -1,23 +1,19 @@
-/*******************************************************************************
- * Gaggle is Copyright 2010 by Geeksville Industries LLC, a California limited liability corporation. 
+/****************************************************************************************
+ * Gaggle is Copyright 2010, 2011, and 2012 by Kevin Hester of Geeksville Industries LLC,
+ * a California limited liability corporation. 
  * 
- * Gaggle is distributed under a dual license.  We've chosen this approach because within Gaggle we've used a number
- * of components that Geeksville Industries LLC might reuse for commercial products.  Gaggle can be distributed under
- * either of the two licenses listed below.
+ * Gaggle 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 3 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. 
+ * Gaggle 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. 
  * 
- * Commercial Distribution License
- * If you would like to distribute Gaggle (or portions thereof) under a license other than 
- * the "GNU General Public License, version 2", contact Geeksville Industries.  Geeksville Industries reserves
- * the right to release Gaggle source code under a commercial license of its choice.
- * 
- * GNU Public License, version 2
- * All other distribution of Gaggle must conform to the terms of the GNU Public License, version 2.  The full
- * text of this license is included in the Gaggle source, see assets/manual/gpl-2.0.txt.
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License along with Gaggle 
+ * included in this distribution in the manual (assets/manual/gpl-v3.txt). If not, see  
+ * <http://www.gnu.org/licenses/> or at <http://gplv3.fsf.org>.
+ ****************************************************************************************/
 package com.geeksville.gaggle;
 
 import android.content.Context;

src/com/geeksville/gaggle/AudioVario.java

@@ -1,23 +1,19 @@
-/*******************************************************************************
- * Gaggle is Copyright 2010 by Geeksville Industries LLC, a California limited liability corporation. 
+/****************************************************************************************
+ * Gaggle is Copyright 2010, 2011, and 2012 by Kevin Hester of Geeksville Industries LLC,
+ * a California limited liability corporation. 
  * 
- * Gaggle is distributed under a dual license.  We've chosen this approach because within Gaggle we've used a number
- * of components that Geeksville Industries LLC might reuse for commercial products.  Gaggle can be distributed under
- * either of the two licenses listed below.
+ * Gaggle 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 3 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. 
+ * Gaggle 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. 
  * 
- * Commercial Distribution License
- * If you would like to distribute Gaggle (or portions thereof) under a license other than 
- * the "GNU General Public License, version 2", contact Geeksville Industries.  Geeksville Industries reserves
- * the right to release Gaggle source code under a commercial license of its choice.
- * 
- * GNU Public License, version 2
- * All other distribution of Gaggle must conform to the terms of the GNU Public License, version 2.  The full
- * text of this license is included in the Gaggle source, see assets/manual/gpl-2.0.txt.
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License along with Gaggle 
+ * included in this distribution in the manual (assets/manual/gpl-v3.txt). If not, see  
+ * <http://www.gnu.org/licenses/> or at <http://gplv3.fsf.org>.
+ ****************************************************************************************/
 package com.geeksville.gaggle;
 
 import java.util.Observable;