Skip to content

Commit 7e3930d

Browse files
13rac113rac1
committed
Adding/updating GPL licensing per Halsey
1 parent be664d9 commit 7e3930d

39 files changed

+849
-517
lines changed

‎AUTHORS.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Roundware Android authors ordered by first contribution.
22

3-
Rob Knapen <http://www.wageningenur.nl>
43
Dan Latham
4+
Rob Knapen <http://www.shuffledbits.com>
55
Halsey Burgund <http://halseyburgund.com>
6+
Rob Dietrick
67
Brad Erickson <http://eosrei.net>
78
Joel Schnall
89
Matt Adler <http://hillsandfog.com>
9-

‎COPYRIGHT.txt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Roundware Android
2+
A participatory, location-aware media platform.
3+
4+
Copyright (C) 2008-2015 Halsey Solutions, LLC
5+
http://roundware.org | contact@roundware.org
6+
7+
This program is free software: you can redistribute it and/or modify
8+
it under the terms of the GNU General Public License as published by
9+
the Free Software Foundation, either version 3 of the License, or
10+
(at your option) any later version.
11+
12+
This program is distributed in the hope that it will be useful,
13+
but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
GNU General Public License for more details.
16+
17+
You should have received a copy of the GNU General Public License
18+
along with this program. If not, see http://www.gnu.org/licenses/.
19+
20+
Roundware is a registered trademark of Halsey Burgund.
21+
22+
Roundware includes works under other copyright notices and distributed
23+
according to the terms of the GNU General Public License or a compatible
24+
license, including:
25+
26+
NPR Android App - Copyright 2012 NPR.
27+
https://code.google.com/p/npr-android-app/
28+
29+
Android - Copyright 2009 Google Inc.
30+
http://source.android.com/

‎LICENSE.txt‎

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

‎NOTICE.txt‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎rwapp/src/main/java/org/roundware/rwapp/RwApplication.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Roundware Android code is released under the terms of the GNU General Public License.
3+
* See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
4+
*/
5+
16
package org.roundware.rwapp;
27

38
import android.app.Application;

‎rwapp/src/main/java/org/roundware/rwapp/RwExploreActivity.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Roundware Android code is released under the terms of the GNU General Public License.
3+
* See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
4+
*/
15
package org.roundware.rwapp;
26

37
import android.app.Activity;

‎rwapp/src/main/java/org/roundware/rwapp/RwListenActivity.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
/*
2-
STORIES FROM MAIN STREET
3-
Android client application
4-
Copyright (C) 2008-2013 Halsey Solutions, LLC
5-
with contributions by Rob Knapen
6-
ALL RIGHTS RESERVED
7-
*/
1+
/**
2+
* Roundware Android code is released under the terms of the GNU General Public License.
3+
* See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
4+
*/
85
package org.roundware.rwapp;
96

107
import android.annotation.SuppressLint;

‎rwapp/src/main/java/org/roundware/rwapp/RwMainActivity.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
/*
2-
STORIES FROM MAIN STREET
3-
Android client application
4-
Copyright (C) 2008-2013 Halsey Solutions, LLC
5-
with contributions by Rob Knapen
6-
ALL RIGHTS RESERVED
7-
*/
1+
/**
2+
* Roundware Android code is released under the terms of the GNU General Public License.
3+
* See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
4+
*/
85
package org.roundware.rwapp;
96

107
import android.annotation.SuppressLint;

‎rwapp/src/main/java/org/roundware/rwapp/RwPrefsActivity.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
/*
2-
STORIES FROM MAIN STREET
3-
Android client application
4-
Copyright (C) 2008-2013 Halsey Solutions, LLC
5-
with contributions by Rob Knapen
6-
ALL RIGHTS RESERVED
7-
*/
1+
/**
2+
* Roundware Android code is released under the terms of the GNU General Public License.
3+
* See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
4+
*/
85
package org.roundware.rwapp;
96

107
import android.content.SharedPreferences;

‎rwapp/src/main/java/org/roundware/rwapp/RwSpeakActivity.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
/*
2-
STORIES FROM MAIN STREET
3-
Android client application
4-
Copyright (C) 2008-2013 Halsey Solutions, LLC
5-
with contributions by Rob Knapen
6-
ALL RIGHTS RESERVED
7-
*/
1+
/**
2+
* Roundware Android code is released under the terms of the GNU General Public License.
3+
* See COPYRIGHT.txt, AUTHORS.txt, and LICENSE.txt in the project root directory for details.
4+
*/
85
package org.roundware.rwapp;
96

107
import android.annotation.SuppressLint;

0 commit comments

Comments
 (0)