Merge pull request neocotic#24 from neocotic/wip-1.1.3

1.1.3 WIP

.gitignore

@@ -1,4 +1,4 @@
-node_modules/
+node_modules
 npm-debug.log
 
 .DS_Store?

.npmignore

@@ -0,0 +1,11 @@
+docs
+.jshintrc
+AUTHORS.md
+CHANGES.md
+CONTRIBUTING.md
+Gruntfile.js
+INSTALL.md
+README.md
+bower.json
+qr.min.js
+qr.min.map

CHANGES.md

@@ -1,3 +1,7 @@
+## Version 1.1.3, 2014.09.01
+
+* [#23](https://github.com/neocotic/qr.js/issues/23): Revert back to [GPL License][]
+
 ## Version 1.1.2, 2014.04.27
 
 * [#20](https://github.com/neocotic/qr.js/issues/20): Fix "too many open files" bug
@@ -44,6 +48,7 @@
 [bower]: http://bower.io
 [commonjs]: http://commonjs.org
 [ender]: http://ender.no.de
+[gpl license]: http://www.gnu.org/licenses/
 [grunt]: http://gruntjs.com
 [mit license]: http://en.wikipedia.org/wiki/MIT_License
 [node.js]: http://nodejs.org

Gruntfile.js

@@ -36,12 +36,13 @@ module.exports = function(grunt) {
         options: {
           banner: (
             '/*! <%= pkg.name %> v<%= pkg.version %> | (c) <%= grunt.template.today("yyyy") %>' +
-            ' <%= pkg.author.name %> | <%= pkg.licenses[0].type %> License \n' +
+            ' <%= pkg.author.name %> | GPL v3 License\n' +
             'jsqrencode | (c) 2010 [email protected] | GPL v3 License\n' +
             '*/'
           ),
           report: 'min',
-          sourceMap: 'qr.min.map'
+          sourceMap: true,
+          sourceMapName: 'qr.min.map'
         }
       }
     }
@@ -56,7 +57,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-docco');
 
   grunt.registerTask('default', [ 'test' ]);
-  grunt.registerTask('dist', [ 'uglify', 'docco' ]);
+  grunt.registerTask('dist', [ 'test', 'uglify', 'docco' ]);
   grunt.registerTask('test', [ 'jshint' ]);
 
 };

LICENSE.md

@@ -1,19 +1,14 @@
 Copyright (C) 2014 Alasdair Mercer, http://neocotic.com
 
-Permission is hereby granted, free of charge, to any person obtaining a copy  
-of this software and associated documentation files (the "Software"), to deal  
-in the Software without restriction, including without limitation the rights  
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell  
-copies of the Software, and to permit persons to whom the Software is  
-furnished to do so, subject to the following conditions:
+This program 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.
 
-The above copyright notice and this permission notice shall be included in all  
-copies or substantial portions of the Software.
+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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE  
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER  
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,  
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE  
-SOFTWARE.
+You should have received a copy of the GNU General Public License  
+along with this program. If not, see <http://www.gnu.org/licenses/>.

README.md

@@ -247,7 +247,7 @@ This is really just intended for use within a browser.
 The current version of `qr`.
 
 ``` javascript
-console.log(qr.VERSION); // "1.1.2"
+console.log(qr.VERSION); // "1.1.3"
 ```
 
 ## Canvas Support

bower.json

@@ -1,12 +1,37 @@
 {
   "name": "qr-js",
-  "version": "1.1.2",
+  "version": "1.1.3",
+  "description": "Library for QR code generation using canvas",
+  "homepage": "http://neocotic.com/qr.js",
+  "authors": [
+    {
+      "name": "Alasdair Mercer",
+      "email": "[email protected]",
+      "homepage": "http://neocotic.com"
+    }
+  ],
+  "license": "GPL-3.0",
+  "keywords": [
+    "qr",
+    "code",
+    "encode",
+    "canvas",
+    "image"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/neocotic/qr.js.git"
+  },
   "main": "qr.min.js",
   "ignore": [
     "**/.*",
-    "*.md",
     "docs",
+    "AUTHORS.md",
+    "CHANGES.md",
+    "CONTRIBUTING.md",
     "Gruntfile.js",
+    "INSTALL.md",
+    "README.md",
     "bower.json",
     "package.json"
   ]

docs/qr.html

@@ -27,7 +27,7 @@ <h1>qr.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-1">&#182;</a>
               </div>
-              <p><a href="http://neocotic.com/qr.js">qr.js</a><br>(c) 2014 Alasdair Mercer<br>Freely distributable under the MIT license.<br>Based on <a href="http://code.google.com/p/jsqrencode/">jsqrencode</a><br>(c) 2010 [email protected]<br>Licensed under the GPL Version 3 license.<br>For all details and documentation:<br><a href="http://neocotic.com/qr.js">http://neocotic.com/qr.js</a></p>
+              <p><a href="http://neocotic.com/qr.js">qr.js</a><br>(c) 2014 Alasdair Mercer<br>Licensed under the GPL Version 3 license.<br>Based on <a href="http://code.google.com/p/jsqrencode/">jsqrencode</a><br>(c) 2010 [email protected]<br>Licensed under the GPL Version 3 license.<br>For all details and documentation:<br><a href="http://neocotic.com/qr.js">http://neocotic.com/qr.js</a></p>
 
             </div>
 
@@ -2234,7 +2234,7 @@ <h2 id="constants">Constants</h2>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre>    VERSION: <span class="hljs-string">'1.1.2'</span>,</pre></div></div>
+            <div class="content"><div class='highlight'><pre>    VERSION: <span class="hljs-string">'1.1.3'</span>,</pre></div></div>
 
         </li>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qr-js",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Library for QR code generation using canvas",
   "homepage": "http://neocotic.com/qr.js",
   "bugs": {
@@ -13,7 +13,7 @@
   },
   "licenses": [
     {
-      "type": "MIT",
+      "type": "GPL-3.0",
       "url": "https://github.com/neocotic/qr.js/raw/master/LICENSE.md"
     }
   ],
@@ -29,12 +29,12 @@
     "url": "git://github.com/neocotic/qr.js.git"
   },
   "dependencies": {
-    "canvas": "~1.1.3"
+    "canvas": "~1.1.6"
   },
   "devDependencies": {
-    "grunt": "~0.4.4",
+    "grunt": "~0.4.5",
     "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-uglify": "~0.4.0",
+    "grunt-contrib-uglify": "~0.5.1",
     "grunt-docco": "~0.3.3"
   },
   "main": "qr.js",

qr.js

@@ -1,6 +1,6 @@
 // [qr.js](http://neocotic.com/qr.js)  
 // (c) 2014 Alasdair Mercer  
-// Freely distributable under the MIT license.  
+// Licensed under the GPL Version 3 license.  
 // Based on [jsqrencode](http://code.google.com/p/jsqrencode/)  
 // (c) 2010 [email protected]  
 // Licensed under the GPL Version 3 license.  
@@ -1003,7 +1003,7 @@
     // ---------
 
     // Current version of `qr`.
-    VERSION: '1.1.2',
+    VERSION: '1.1.3',
 
     // QR functions
     // ------------