Licensing stuff: GPL and MIT

Some parts GPL, some parts MIT. Common parts dual-licensed.

8 files changed, 74 insertions, 4 deletions

diff --git a/COPYING b/LICENSE.GPL
index 3912109..3912109 100644
--- a/COPYING
+++ b/LICENSE.GPL
diff --git a/LICENSE.MIT b/LICENSE.MIT
new file mode 100644
index 0000000..c662ae7
--- /dev/null
+++ b/LICENSE.MIT
@@ -0,0 +1,26 @@
+ndim's git utilities
+Copyright (C) 2007 Hans Ulrich Niedermann
+Portions (C) by others
+
+Files contained herein are distributed under the following license:
+
+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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+
+All licensing questions regarding this software should be directed to
+   Hans Ulrich Niedermann <hun@n-dimensional.de>
diff --git a/Makefile-files b/Makefile-files
index 65aae34..17bd7af 100644
--- a/Makefile-files
+++ b/Makefile-files
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
-dist_doc_DATA += COPYING
-UPLOAD_FILES  += COPYING
+dist_doc_DATA += LICENSE.GPL LICENSE.MIT
+UPLOAD_FILES  += LICENSE.GPL LICENSE.MIT
 
 dist_doc_DATA += README
 UPLOAD_FILES  += README
diff --git a/README b/README
index 292b86b..0ae5366 100644
--- a/README
+++ b/README
@@ -24,6 +24,12 @@ Updates
     $ git clone http://nix.lauft.net/ndim-git-utils.git/
 
 
+License
+=======
+
+  Partly MIT, partly GPL. Shared parts dual-licensed.
+
+
 ========================================================================
 End of README for ndim's git utilities.
 ========================================================================
diff --git a/doc/.htaccess b/doc/.htaccess
index 0abae65..d3eed09 100644
--- a/doc/.htaccess
+++ b/doc/.htaccess
@@ -2,6 +2,10 @@ AddDescription "GNU GENERAL PUBLIC LICENSE" COPYING
 AddDescription "General description of ndim-git-utils" README
 AddDescription "The git-amb(1) man page" git-amb.txt
 AddDescription "The git-amb script" git-amb
+AddDescription "The git-rebase-subtree(1) man page" git-rebase-subtree.txt
+AddDescription "The git-rebase-subtree script" git-rebase-subtree
+AddDescription "The git-buildmsg(1) man page" git-buildmsg.txt
+AddDescription "The git-buildmsg script" git-buildmsg
 AddDescription "ndim's git cheatsheet" ndim-git-cheatsheet.txt
 AddDescription "source tarball distribution" ndim-git-utils-*.tar.bz2
 ReadmeName FOOTER.html
diff --git a/git-buildmsg/git-buildmsg.in b/git-buildmsg/git-buildmsg.in
index 82057c3..38f0df6 100644
--- a/git-buildmsg/git-buildmsg.in
+++ b/git-buildmsg/git-buildmsg.in
@@ -1,10 +1,27 @@
 #!/bin/sh
-#
-# Generate some basic versioning information which can be piped to a header.
+# Generate some basic info on source code version to be included in program.
 #
 # Copyright (c) 2006-2007 Luc Verhaegen <libv@skynet.be>
 # Copyright (C) 2007 Hans Ulrich Niedermann <hun@n-dimensional.de>
 #
+# 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+#
 # The author thanks the nice people on #git for the assistance!
 #
 # Simple testing of this script:
diff --git a/git-ndim-sh/git-ndim-sh.in b/git-ndim-sh/git-ndim-sh.in
index 6856629..3b38732 100644
--- a/git-ndim-sh/git-ndim-sh.in
+++ b/git-ndim-sh/git-ndim-sh.in
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Dual-licensed. Choose LICENSE.MIT or LICENSE.GPL.
+# Contributions to this file will only be accepted under the same license.
 
 # Designed to be sourced.
 case "$(basename "$0")" in
diff --git a/git-rebase-subtree/git-rebase-subtree.in b/git-rebase-subtree/git-rebase-subtree.in
index d2422ab..1798942 100644
--- a/git-rebase-subtree/git-rebase-subtree.in
+++ b/git-rebase-subtree/git-rebase-subtree.in
@@ -1,5 +1,20 @@
 #!/bin/sh
+# git-rebase-subtree - rebase "subtree of branches" in one go
+# Copyright (C) 2007 Hans Ulrich Niedermann
 #
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 unset CDPATH
 SED="${SED-sed}"