From bed46208533c2037e2c71100d504bac37371a472 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Sat, 16 Feb 2013 12:22:53 +0100 Subject: [PATCH] Update license information --- Makefile | 16 ++++++++++++++++ NEWS | 20 +++++++++++--------- README.org | 22 ++++++++++++++++++++++ conkeror/Makefile | 16 ++++++++++++++++ conkeror/markam.js | 16 +++++++++------- doc/Makefile | 16 ++++++++++++++++ src/Makefile | 16 ++++++++++++++++ src/common.scm | 22 ++++++++++++---------- src/markam-convert.scm | 22 ++++++++++++---------- src/paths.scm | 22 ++++++++++++---------- 10 files changed, 142 insertions(+), 46 deletions(-) diff --git a/Makefile b/Makefile index b1bc198..165c872 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,19 @@ +# Copyright (C) 2012, 2013 Tom Willemsen +# +# This file is part of Markam +# +# Markam 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. +# +# Markam 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 Markam. If not, see . INSTALL = install -D export DESTDIR ?= /usr/local diff --git a/NEWS b/NEWS index c520af3..2af855c 100644 --- a/NEWS +++ b/NEWS @@ -44,18 +44,20 @@ candidates. ---------------------------------------------------------------------- -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 file is part of Markam -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. +Markam 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. + +Markam 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 . +along with Markam. If not, see . Local Variables: diff --git a/README.org b/README.org index 24bf6c7..e87f158 100644 --- a/README.org +++ b/README.org @@ -1,3 +1,25 @@ +#+STARTUP: showall + +Copyright (C) 2012, 2013 Tom Willemsen +See the end of the file for license conditions. + * Markam Collects bookmarks. + +* License + + This file is part of Markam + + Markam 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. + + Markam 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 Markam. If not, see . diff --git a/conkeror/Makefile b/conkeror/Makefile index 1d11b15..44be726 100644 --- a/conkeror/Makefile +++ b/conkeror/Makefile @@ -1,3 +1,19 @@ +# Copyright (C) 2012, 2013 Tom Willemsen +# +# This file is part of Markam +# +# Markam 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. +# +# Markam 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 Markam. If not, see . DESTDIR ?= /usr/local .PHONY: all install uninstall diff --git a/conkeror/markam.js b/conkeror/markam.js index 5e76702..ff30e98 100644 --- a/conkeror/markam.js +++ b/conkeror/markam.js @@ -1,18 +1,20 @@ /* markam -- Store/retrieve/manage bookmarks Copyright (C) 2012,2013 Tom Willemsen - 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 + This file is part of Markam + + Markam 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. + Markam 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 . + along with Markam. If not, see . */ /// Commentary: diff --git a/doc/Makefile b/doc/Makefile index a3dd2bc..f66f0bf 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,3 +1,19 @@ +# Copyright (C) 2012, 2013 Tom Willemsen +# +# This file is part of Markam +# +# Markam 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. +# +# Markam 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 Markam. If not, see . DESTDIR ?= /usr/local INSTALL_INFO = install-info TEXI2PDF = texi2pdf diff --git a/src/Makefile b/src/Makefile index 4bc49b4..aae7c04 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,3 +1,19 @@ +# Copyright (C) 2012, 2013 Tom Willemsen +# +# This file is part of Markam +# +# Markam 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. +# +# Markam 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 Markam. If not, see . DESTDIR ?= /usr/local CSC = csc diff --git a/src/common.scm b/src/common.scm index 20baece..6b7846f 100644 --- a/src/common.scm +++ b/src/common.scm @@ -1,18 +1,20 @@ ;;; markam -- Store/retrieve/manage bookmarks -;; Copyright (C) 2012 Tom Willemsen +;; Copyright (C) 2012, 2013 Tom Willemsen -;; 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 +;; This file is part of Markam + +;; Markam 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. - +;; +;; Markam 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 . +;; along with Markam. If not, see . ;;; Commentary: diff --git a/src/markam-convert.scm b/src/markam-convert.scm index e6f0f48..b18bd1f 100644 --- a/src/markam-convert.scm +++ b/src/markam-convert.scm @@ -1,18 +1,20 @@ ;;; markam -- Store/retrieve/manage bookmarks -;; Copyright (C) 2012 Tom Willemsen +;; Copyright (C) 2012, 2013 Tom Willemsen -;; 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 +;; This file is part of Markam + +;; Markam 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. - +;; +;; Markam 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 . +;; along with Markam. If not, see . ;;; Commentary: diff --git a/src/paths.scm b/src/paths.scm index cfd8838..50dd258 100644 --- a/src/paths.scm +++ b/src/paths.scm @@ -1,18 +1,20 @@ ;;; markam -- Store/retrieve/manage bookmarks -;; Copyright (C) 2012 Tom Willemsen +;; Copyright (C) 2012, 2013 Tom Willemsen -;; 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 +;; This file is part of Markam + +;; Markam 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. - +;; +;; Markam 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 . +;; along with Markam. If not, see . ;;; Commentary: