[systemd-commits] 2 commits - README test/rules-test.sh test/rule-syntax-check.py TODO

[Kay Sievers]

 README                    |    4 +++-
 TODO                      |    3 ---
 test/rule-syntax-check.py |   21 ++++++++++-----------
 test/rules-test.sh        |   13 +++++++++++++
 4 files changed, 26 insertions(+), 15 deletions(-)

New commits:
commit 85424725d1870e2c218e3e2d53971f7e5dc3f0ae
Author: Kay Sievers <kay at vrfy.org>
Date:   Wed Aug 14 22:58:21 2013 +0200

    README: update list of used LICENSEs

diff --git a/README b/README
index 0d7db41..a16f342 100644
--- a/README
+++ b/README
@@ -31,7 +31,9 @@ AUTHOR:
 LICENSE:
         LGPLv2.1+ for all code
         - except sd-daemon.[ch] and sd-readahead.[ch] which are MIT
-        - except src/udev/ which is (currently still) GPLv2+
+        - except src/shared/MurmurHash3.c which is Public Domain
+        - except src/journal/lookup3.c which is Public Domain
+        - except src/udev/* which is (currently still) GPLv2, GPLv2+
 
 REQUIREMENTS:
         Linux kernel >= 3.0
diff --git a/TODO b/TODO
index fdf9d7b..f6e7566 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,4 @@
 Bugfixes:
-* update COPYRIGHT in our README:
-   http://ftp-master.metadata.debian.org/changelogs//main/s/systemd/systemd_204-2_copyright
-
 * the running hwdb seems not to pick up updated database files without
   an explicit: udevadm control --reload
 

commit 0228a7e56a618aed45940f6ec61b24d34fff7dc5
Author: Kay Sievers <kay at vrfy.org>
Date:   Wed Aug 14 22:55:40 2013 +0200

    test: add licence header and switch to LGPL
    
    Checked with and got OK from Martin.

diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py
index b18f878..ce4f5c7 100755
--- a/test/rule-syntax-check.py
+++ b/test/rule-syntax-check.py
@@ -4,19 +4,18 @@
 # (C) 2010 Canonical Ltd.
 # Author: Martin Pitt <martin.pitt at ubuntu.com>
 #
-# 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
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
 # (at your option) any later version.
+
+# systemd 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
+# Lesser General Public License for more details.
 #
-# 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 import re
 import sys
diff --git a/test/rules-test.sh b/test/rules-test.sh
index 1e224ff..47d42cb 100755
--- a/test/rules-test.sh
+++ b/test/rules-test.sh
@@ -3,6 +3,19 @@
 #
 # (C) 2010 Canonical Ltd.
 # Author: Martin Pitt <martin.pitt at ubuntu.com>
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+# systemd 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 [ -n "$srcdir" ] || srcdir=`dirname $0`/..