Add license note to lots of files and add EXPAT file.

diff --git a/AUTHORS b/AUTHORS
index 124c660243cd3f8a7d0bbdfb200e2a44121c06fb..68ec1880d563197d17d50d18bb657570b1e499e5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,5 @@
+This file is licensed under the terms of the expat license, see the file EXPAT.
+
 Developers:
     Christian Dywan <christian@twotoasts.de>
 

diff --git a/ChangeLog b/ChangeLog
index 4dcb4741dd357c177e53b636f7116662b6baeb86..4979a3e358aa691e01659082b9c4a2edebd145a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+This file is licensed under the terms of the expat license, see the file EXPAT.
+
 v0.0.21:
  + Update some translations
  + Show progress in location when statusbar is hidden

diff --git a/EXPAT b/EXPAT
new file mode 100644 (file)
index 0000000..7da1ab3
--- /dev/null
+++ b/EXPAT
@@ -0,0 +1,18 @@
+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.

diff --git a/HACKING b/HACKING
index c1fd53392db49f636ef1ade7edb56df335045324..883424715269e2300f836c4cdbf2c5600721c369 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -1,3 +1,5 @@
+This file is licensed under the terms of the expat license, see the file EXPAT.
+
 It is 4 spaces, no tabs, preferrably at 80 columns per line.
 
 The preferred coding style is explained by example.

diff --git a/INSTALL b/INSTALL
index 96ddec5bbd310f57833591604ebfea485dd3d66d..9fe7303843750a4932ecf509cf70c1898ab6ee27 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,5 @@
+This file is licensed under the terms of the expat license, see the file EXPAT.
+
 +++ Installing Midori +++
 
 Building and installing Midori is straightforward.

diff --git a/Makefile.am b/Makefile.am
index 9a6151c49da0249aa3cb9258c82197d269db1b27..9e2ee96ef56ba0baf5062ed6ba94ef281ca2e39f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+# This file is licensed under the terms of the expat license, see the file EXPAT.
+
 AUTOMAKE_OPTIONS = gnu
 
 SUBDIRS = katze midori po icons

diff --git a/README b/README
index 4a3509463f1b8d41d0c8ca51579ff477c01a12ea..23a69fb7090b7af410c9645091b4a14a2c2f2fbc 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
+This file is licensed under the terms of the expat license, see the file EXPAT.
+
 Midori is a lightweight web browser.
 
 * Full integration with GTK+2.

diff --git a/TODO b/TODO
index af976e1f609b79180167c382fc2d18f2265c4397..58e019ac660a36616224c6ebcdf951051b4fdbac 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+This file is licensed under the terms of the expat license, see the file EXPAT.
+
 TODO:
  . Revamp bookmarks UI, including creating of bookmark folders
  . Use an update timeout in KatzePropertyProxy instead of only focus-out

diff --git a/configure.in b/configure.in
index fa102248102caee7074e467625649dea80b6f5b5..2638da0591ec3ea09a7edc32b661584744cf6f72 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,3 +1,4 @@
+# This file is licensed under the terms of the expat license, see the file EXPAT.
 # Register ourselves to autoconf
 AC_INIT([midori], [0.0.21], [http://www.twotoasts.de/bugs])
 AC_CONFIG_SRCDIR([midori/midori-stock.h])

diff --git a/docs/api/wscript_build b/docs/api/wscript_build
index 7cba870e9140f6c0712a704c9160424902321512..7733da718252563e68f6920932dc6a93e3768a3c 100644 (file)
--- a/docs/api/wscript_build
+++ b/docs/api/wscript_build
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 # WAF build script for midori
+# This file is licensed under the terms of the expat license, see the file EXPAT.
 
 import pproc as subprocess
 

diff --git a/docs/user/midori.css b/docs/user/midori.css
index 57048efe32e25b70f44eb6f85a9ecec9948d0639..eb96e13effeaae05fb38f4febfe0daa8b217ea59 100644 (file)
--- a/docs/user/midori.css
+++ b/docs/user/midori.css
@@ -1,7 +1,7 @@
 /*
 :Author: Christian Dywan
 :Contact: christian@twotoasts.de
-:Copyright: This stylesheet has been placed in the public domain.
+:Copyright: This file is licensed under the terms of the expat license, see the file EXPAT.
 
 Stylesheet for Midori's documentation based on a version of Enrico Troeger.
 */

diff --git a/icons/Makefile.am b/icons/Makefile.am
index b03110ca0395c6d70c8e9c09ed9af612032e4a15..1ca619c3b6f072b8aa7ea013974232782428a957 100644 (file)
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,3 +1,5 @@
+# This file is licensed under the terms of the expat license, see the file EXPAT.
+
 iconsdir = $(datadir)/icons/hicolor/scalable/apps
 icons_DATA = scalable/midori.svg
 

diff --git a/icons/wscript_build b/icons/wscript_build
index 35cdcbf9e82670b320491a5936cbe5564a15b2bc..2896e0cf0ef543acc5c18bf3a9732c91dfac4d23 100644 (file)
--- a/icons/wscript_build
+++ b/icons/wscript_build
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 # WAF build script for midori
+# This file is licensed under the terms of the expat license, see the file EXPAT.
 
 def add_image (bld, install_files, category, name):
     import os

diff --git a/katze/Makefile.am b/katze/Makefile.am
index f357f6a558270348ba1f7a78f00867d7bec3d44b..a6b17545b8d09002e8ea30a518d2e1683c0ae3d9 100644 (file)
--- a/katze/Makefile.am
+++ b/katze/Makefile.am
@@ -1,3 +1,5 @@
+# This file is licensed under the terms of the expat license, see the file EXPAT.
+
 INCLUDES = \
     $(GTK_CFLAGS)    \
     $(LIBXML_CFLAGS)

diff --git a/katze/wscript_build b/katze/wscript_build
index efa43b5e3d7c18780c78da13366908907e0a68ff..b31455526189fe0be4d6efc819eb895a7e172ec8 100644 (file)
--- a/katze/wscript_build
+++ b/katze/wscript_build
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 # WAF build script for midori
+# This file is licensed under the terms of the expat license, see the file EXPAT.
 
 obj = bld.create_obj ('cc', 'staticlib')
 obj.name = 'katze'

diff --git a/legacy.sh b/legacy.sh
index dd4632a3ab6dc7e6d81b540e86b605424f6321a8..7086768832fd84da405f34ddb73ec8de7c6473ba 100755 (executable)
--- a/legacy.sh
+++ b/legacy.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# This file is licensed under the terms of the expat license, see the file EXPAT.
 
 echo "no" | glib-gettextize --force --copy
 intltoolize --copy --force --automake

diff --git a/midori/Makefile.am b/midori/Makefile.am
index 627c49a5c33aa5cc45add1d7760803f760a9c158..6219a8ea99d259e05384ce33ba677ce860638032 100644 (file)
--- a/midori/Makefile.am
+++ b/midori/Makefile.am
@@ -1,3 +1,5 @@
+# This file is licensed under the terms of the expat license, see the file EXPAT.
+
 INCLUDES = \
     $(UNIQUE_CFLAGS)        \
     $(GIO_CFLAGS)           \

diff --git a/midori/wscript_build b/midori/wscript_build
index 0dfb01a32af1bb0ad145690fd20798ae0d39cc09..af1c06e84d9c8e63f257a017af5eb330591d0cac 100644 (file)
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 # WAF build script for midori
+# This file is licensed under the terms of the expat license, see the file EXPAT.
 
 obj = bld.create_obj ('cc', 'program')
 obj.target = 'midori'

diff --git a/po/wscript_build b/po/wscript_build
index 149046b6a932cc5f9cd6622c8c36923d4607bc69..fe03f6c6f3b10b04c5d132141c40063f709871ad 100644 (file)
--- a/po/wscript_build
+++ b/po/wscript_build
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 # WAF build script for midori
+# This file is licensed under the terms of the expat license, see the file EXPAT.
 
 import Params
 import pproc as subprocess

diff --git a/wscript b/wscript
index 76e1c4dae3d082e77314af610105dee0cfa4fabf..b872cfdaca8c20e1bdeaaedf8bfc6ca6e6d12199 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 # WAF build script for midori
+# This file is licensed under the terms of the expat license, see the file EXPAT.
 
 import Params
 import pproc as subprocess