Made the license notice a bit shorter in source code. Left the long version in script...

diff --git a/README.md b/README.md
index d19505d..a84d45f 100755 (executable)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 License
 -------
+
+  ![AGPL Logo](http://www.gnu.org/graphics/agplv3-155x51.png)
     
     Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
     
@@ -45,7 +47,7 @@ Other features:
 Dependencies
 ------------
 
- * [lxml] (http://codespeak.net/lxml/) >= 2.2
+ * lxml <http://codespeak.net/lxml/>, version 2.2 or later
 
 
 Installation

diff --git a/librarian/__init__.py b/librarian/__init__.py
index 582ee98..ca527f6 100644 (file)
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -1,25 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# exception classes
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>  
 
 class ParseError(Exception):
     

diff --git a/librarian/dcparser.py b/librarian/dcparser.py
index d3547f0..30811ac 100644 (file)
--- a/librarian/dcparser.py
+++ b/librarian/dcparser.py
@@ -1,23 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
 #
 from xml.parsers.expat import ExpatError
 from datetime import date

diff --git a/librarian/html.py b/librarian/html.py
index 7733fee..983853d 100644 (file)
--- a/librarian/html.py
+++ b/librarian/html.py
@@ -1,23 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
 #
 import os
 import cStringIO

diff --git a/librarian/parser.py b/librarian/parser.py
index 225000b..727f02e 100644 (file)
--- a/librarian/parser.py
+++ b/librarian/parser.py
@@ -1,23 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
 #
 from librarian import ValidationError, NoDublinCore,  ParseError
 from librarian import RDFNS

diff --git a/librarian/text.py b/librarian/text.py
index 70d98c4..156f92a 100644 (file)
--- a/librarian/text.py
+++ b/librarian/text.py
@@ -1,23 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
 #
 from librarian import dcparser, parser
 from lxml import etree

diff --git a/scripts/master.css b/scripts/master.css
index 8f61999..553bb59 100755 (executable)
--- a/scripts/master.css
+++ b/scripts/master.css
@@ -1,25 +1,10 @@
 /*
-#
-#    This file is part of Librarian.
-#
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-*/
+ * Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
+ *
+ * This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+ * For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
+ *
+ */
 body {
     font-size: 16px;
     font: Georgia, "Times New Roman", serif;

diff --git a/scripts/normalize.py b/scripts/normalize.py
index 38ac8be..ae1d84a 100644 (file)
--- a/scripts/normalize.py
+++ b/scripts/normalize.py
@@ -1,24 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
 #
 
 from __future__ import with_statement

diff --git a/tests/test_dcparser.py b/tests/test_dcparser.py
index d3acef1..7af573e 100644 (file)
--- a/tests/test_dcparser.py
+++ b/tests/test_dcparser.py
@@ -1,23 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
 #
 
 from librarian import dcparser

diff --git a/tests/test_html.py b/tests/test_html.py
index 6914066..a6c6125 100644 (file)
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -1,23 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
 #
 from librarian import html, NoDublinCore
 from nose.tools import *

diff --git a/tests/test_text.py b/tests/test_text.py
index da7e4ab..3f93239 100644 (file)
--- a/tests/test_text.py
+++ b/tests/test_text.py
@@ -1,23 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
 #
 from librarian import text, NoDublinCore
 from nose.tools import *

diff --git a/tests/utils.py b/tests/utils.py
index 0c6f8d4..16db28b 100644 (file)
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,23 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska  
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# For full license text see COPYING or <http://www.gnu.org/licenses/agpl.html>
 #
 from __future__ import with_statement
 from os.path import realpath, join, dirname