Relicense under LGLP

Teabeats · Jan 14, 2011 · b3ed026 · b3ed026
1 parent 1177fa4
commit b3ed026
Show file tree

Hide file tree

Showing 41 changed files with 136 additions and 119 deletions.
diff --git a/common.pri b/common.pri
@@ -1,9 +1,9 @@
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -12,7 +12,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 unix {

diff --git a/examples/pdf_c_api.c b/examples/pdf_c_api.c
@@ -1,12 +1,12 @@
 /* -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
  * vi:set ts=4 sts=4 sw=4 noet :
  *
- * Copyright 2010 wkhtmltopdf authors
+ * Copyright 2010, 2011 wkhtmltopdf authors
  *
  * This file is part of wkhtmltopdf.
  *
  * wkhtmltopdf is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
@@ -15,7 +15,7 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
  * along with wkhtmltopdf.  If not, see <http: *www.gnu.org/licenses/>.
  */
 

diff --git a/scripts/pre-commit-hook.sh b/scripts/pre-commit-hook.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -14,7 +14,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 git diff --staged --name-only HEAD | grep -v version.pri | xargs -d '\n' python scripts/sourcefix.py || exit 1
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -14,7 +14,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 function usage() {

diff --git a/scripts/sourcefix.py b/scripts/sourcefix.py
@@ -1,11 +1,11 @@
 #!/usr/bin/python
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -14,7 +14,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 from sys import argv, exit
@@ -72,7 +72,7 @@ def includesort(x):
 // This file is part of %(name)s.
 //
 // %(name)s is free software: you can redistribute it and/or modify
-// it under the terms of the GNU %(lesser)sGeneral Public License as published by
+// it under the terms of the GNU Lesser General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
@@ -81,10 +81,10 @@ def includesort(x):
 // 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 %(lesser)sGeneral Public License
+// You should have received a copy of the GNU Lesser General Public License
 // along with %(name)s.  If not, see <http://www.gnu.org/licenses/>.
 
-"""%{"years": (", ".join(sorted(list(years)))),"name":progname, "lesser": ("Lesser " if path.startswith("src/lib/") else "")}
+"""%{"years": (", ".join(sorted(list(years)))),"name":progname}
 
 	if ext in ["c", "h", "inc"]:
 		header = "/*" + header[2:-1] + " */\n\n"

diff --git a/scripts/static-build.sh b/scripts/static-build.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -14,7 +14,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 # This script will compile static versions of wkhtmltopdf for linux and for windows (it must run in linux)

diff --git a/scripts/syncwkhtmltpdf.sh b/scripts/syncwkhtmltpdf.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -14,7 +14,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 mkdir -p include/wkhtmltox

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -14,7 +14,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 #This script will test a compiled wkhtmltopdf for some basic functionality

diff --git a/scripts/upload.sh b/scripts/upload.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -14,7 +14,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 cd "release-$1"

diff --git a/src/image/image.pro b/src/image/image.pro
@@ -1,9 +1,9 @@
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -12,7 +12,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 include(../../version.pri)

diff --git a/src/image/imagearguments.cc b/src/image/imagearguments.cc
@@ -1,12 +1,12 @@
 // -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
 // vi:set ts=4 sts=4 sw=4 noet :
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 // This file is part of wkhtmltopdf.
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// it under the terms of the GNU Lesser General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
@@ -15,7 +15,7 @@
 // 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
+// You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "arghandler.inl"

diff --git a/src/image/imagecommandlineparser.cc b/src/image/imagecommandlineparser.cc
@@ -1,12 +1,12 @@
 // -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
 // vi:set ts=4 sts=4 sw=4 noet :
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 // This file is part of wkhtmltopdf.
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// it under the terms of the GNU Lesser General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
@@ -15,7 +15,7 @@
 // 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
+// You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "imagecommandlineparser.hh"

diff --git a/src/image/imagecommandlineparser.hh b/src/image/imagecommandlineparser.hh
@@ -1,12 +1,12 @@
 // -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
 // vi:set ts=4 sts=4 sw=4 noet :
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 // This file is part of wkhtmltopdf.
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// it under the terms of the GNU Lesser General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
@@ -15,7 +15,7 @@
 // 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
+// You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef __IMAGECOMMANDLINEPARSER_HH__

diff --git a/src/image/imagedocparts.cc b/src/image/imagedocparts.cc
@@ -1,12 +1,12 @@
 // -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
 // vi:set ts=4 sts=4 sw=4 noet :
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 // This file is part of wkhtmltopdf.
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// it under the terms of the GNU Lesser General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
@@ -15,7 +15,7 @@
 // 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
+// You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "imagecommandlineparser.hh"

diff --git a/src/image/wkhtmltoimage.cc b/src/image/wkhtmltoimage.cc
@@ -1,12 +1,12 @@
 // -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
 // vi:set ts=4 sts=4 sw=4 noet :
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 // This file is part of wkhtmltopdf.
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// it under the terms of the GNU Lesser General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 //
@@ -15,7 +15,7 @@
 // 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
+// You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "imagecommandlineparser.hh"

diff --git a/src/pdf/pdf.pro b/src/pdf/pdf.pro
@@ -1,9 +1,9 @@
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 # This file is part of wkhtmltopdf.
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -12,7 +12,7 @@
 # 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
+# You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 include(../../version.pri)