added MIA license information

snowsunny · Oct 25, 2012 · abf8c9c · abf8c9c
1 parent c3d4bb7
commit abf8c9c
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 15 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -51,11 +51,11 @@ GEM
       activerecord (~> 3.0)
       audited (= 3.0.0)
     awesome_print (1.1.0)
-    backbone-on-rails (0.9.2.1)
-      eco (~> 1.0.0)
-      ejs (~> 1.0.0)
+    backbone-on-rails (0.9.2.2)
+      eco
+      ejs
       jquery-rails
-      railties (>= 3.1)
+      rails (>= 3.1)
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
     cancan (1.6.8)
@@ -72,14 +72,15 @@ GEM
     chosen-rails (0.9.8.3)
       railties (~> 3.0)
       thor (~> 0.14)
-    cocaine (0.4.0)
+    cocaine (0.4.2)
+    coderay (1.0.8)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.4.0)
     columnize (0.3.6)
     commonjs (0.2.6)
     database_cleaner (0.7.2)
@@ -88,14 +89,14 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
-    devise-i18n (0.5.8)
+    devise-i18n (0.5.9)
     diff-lcs (1.1.3)
     eco (1.0.0)
       coffee-script
       eco-source
       execjs
     eco-source (1.1.0.rc.1)
-    ejs (1.0.0)
+    ejs (1.1.1)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -114,8 +115,10 @@ GEM
       nokogiri (>= 1.4.4, != 1.5.2, != 1.5.1)
       oauth (>= 0.3.6)
       oauth2 (>= 0.5.0)
-    guard (1.4.0)
+    guard (1.5.0)
       listen (>= 0.4.2)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
       thor (>= 0.14.6)
     guard-bundler (1.0.0)
       bundler (~> 1.0)
@@ -162,10 +165,12 @@ GEM
       ruby_core_source (>= 0.1.4)
     listen (0.5.3)
     log4r (1.1.10)
+    lumberjack (1.0.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    method_source (0.8.1)
     mime-types (1.19)
     multi_json (1.3.6)
     multipart-post (1.1.5)
@@ -188,6 +193,10 @@ GEM
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -208,7 +217,7 @@ GEM
       activesupport (>= 3.0)
       choice (~> 0.1.6)
       ruby-graphviz (~> 1.0.4)
-    rails-i18n (0.6.6)
+    rails-i18n (0.7.0)
       i18n (~> 0.5)
     railties (3.2.8)
       actionpack (= 3.2.8)
@@ -291,6 +300,7 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       slim (~> 1.0)
+    slop (3.3.3)
     spork (1.0.0rc3)
     spreadsheet (0.7.4)
       ruby-ole (>= 1.0)

diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,14 @@
+GAKU Engine is Copyright 2012 Genshin Souzou Kabushiki Kaisha of Aichi Japan
+All rights reserved.
+
+This software is dual licensed under the GNU GPL version 3 and the AGPL version 3.
+The full text of these licenses can be found here:
+https://gnu.org/licenses/gpl.html
+https://gnu.org/licenses/agpl.html
+
+Alternative licenses can be granted upon consultation. Please contact [email protected] for details.
+
+Some of the included sources were derived from the Spree project.
+These portions are Copyright Spree Commerce Inc as per the following statement:
+# Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
+# All rights reserved.
diff --git a/README.md b/README.md
@@ -11,6 +11,10 @@ The kanji for "learning" is 学[gaku]. So literally GAKU Engine alone means "Lea
 
 For the English we also chose to treat GAKU as an acronym, which can be seen above. You know, because confusing acronyms are radical to the max.
 
+License
+-------
+This software is dual licensed under the GNU GPL version 3 and the AGPL version 3. Separate licenses are available upon consultation. Please contact [email protected] for details.
+
 What does it do?
 ----------------
 It allows for full student management, grading etc. It's bascally what all student grading tools are but it's unique in that:
@@ -27,11 +31,8 @@ Notes
 1. Schools can use it for free - though ideally we want schools to hire developers on maintenance contracts so the software can be improved and schools don't need to worry about the system being poorly maintained by untrained internal staff.
 2. Part of the reason GAKU Engine was created was to eliminate dependence on commercial licenses from certain companies.
 	- These licenses are expensive, and many school management systems are built on and rely on them. 
-	- The problem is some companies have created organizations (specifically the BSA) that actively go after schools for license infringement.
-	- Schools are particularly easy targets as they often have a lot of computers and very rarely have license management schemes. 
-	- Don't take this lightly - a school we spoke to was strong armed into paying the equivilent of 6 teachers simply because they hadn't kept complete records.
-	- The school we spoke to appears to have made it off lightly. Other accounts from schools reveal much worse. Reguardless of weather or not you choose to use GAKU Engine we recommend you take these factors into consideration and avoid all vendors associated with organizations like the BSA.
-	- Far more than that just your back end systems we recommend switching to OSS software on your workstations, such as LibreOffice, GIMP, InkScape, GNU/Linux (we love Ubuntu and Debian), etc.
+	- The problem is some companies have created organizations that actively go after schools for license infringement.
+	- Though unrelated to GAKU Engine core, we recommend switching to OSS software on school workstations as well, such as LibreOffice, GIMP, InkScape, GNU/Linux (we love Ubuntu and Debian), etc. This will reduce cost and eliminate the risk of having bad licenses.
 
 Development Status
 ------------------