aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Brautaset <sbrautaset@laterpay.net>2016-02-26 10:42:26 +0000
committerStig Brautaset <sbrautaset@laterpay.net>2016-02-26 10:42:26 +0000
commite0fc20e5f27ab7672dd02026e3f7d277cb6d2e91 (patch)
tree0a273f5c41e05889916cfc0b47ce82fc315b0b40
parent24c3851c84ad7348459e7db9197fe4104b5e3a11 (diff)
Fix license for test file also
-rw-r--r--test/ox-jira-test.el29
-rw-r--r--test/ox-jira-test.org33
2 files changed, 27 insertions, 35 deletions
diff --git a/test/ox-jira-test.el b/test/ox-jira-test.el
index aab7095..dd435d0 100644
--- a/test/ox-jira-test.el
+++ b/test/ox-jira-test.el
@@ -7,23 +7,18 @@
;;; Copyright (C) 2016 Stig Brautaset
-;; 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:
-
-;; The above copyright notice and this permission notice shall be included in
-;; all copies or substantial portions of the Software.
-
-;; 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.
+;; 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.
+
+;; 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.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
diff --git a/test/ox-jira-test.org b/test/ox-jira-test.org
index f597af1..39264d6 100644
--- a/test/ox-jira-test.org
+++ b/test/ox-jira-test.org
@@ -29,28 +29,25 @@
I prefer the MIT license because it is short enough to read without toilet
or tea breaks, and I _think_ I can actually wrap my head around it. (And I
- feel it's important to understand the license of your choice.)
+ feel it's important to understand the license of your choice.) However,
+ given I've cribbed copiously from `ox-latex.el' I should probably stick
+ with the GPL for this work.
#+BEGIN_SRC emacs-lisp
;;; Copyright (C) 2016 Stig Brautaset
- ;; 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:
-
- ;; The above copyright notice and this permission notice shall be included in
- ;; all copies or substantial portions of the Software.
-
- ;; 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.
+ ;; 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.
+
+ ;; 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.
+
+ ;; You should have received a copy of the GNU General Public License
+ ;; along with this program. If not, see <http://www.gnu.org/licenses/>.
#+END_SRC
** Code