Jakob Truelsen 14 жил өмнө
parent
commit
b3ed026819

+ 3 - 3
common.pri

@@ -1,9 +1,9 @@
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 unix {
 unix {

+ 3 - 3
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)); -*-
 /* -*- 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 :
  * vi:set ts=4 sts=4 sw=4 noet :
  *
  *
- * Copyright 2010 wkhtmltopdf authors
+ * Copyright 2010, 2011 wkhtmltopdf authors
  *
  *
  * This file is part of wkhtmltopdf.
  * This file is part of wkhtmltopdf.
  *
  *
  * wkhtmltopdf is free software: you can redistribute it and/or modify
  * 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
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * (at your option) any later version.
  *
  *
@@ -15,7 +15,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * 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/>.
  * along with wkhtmltopdf.  If not, see <http: *www.gnu.org/licenses/>.
  */
  */
 
 

+ 3 - 3
scripts/pre-commit-hook.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 #!/bin/bash
 #
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # 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
 git diff --staged --name-only HEAD | grep -v version.pri | xargs -d '\n' python scripts/sourcefix.py || exit 1

+ 3 - 3
scripts/release.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 #!/bin/bash
 #
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 function usage() {
 function usage() {

+ 6 - 6
scripts/sourcefix.py

@@ -1,11 +1,11 @@
 #!/usr/bin/python
 #!/usr/bin/python
 #
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 from sys import argv, exit
 from sys import argv, exit
@@ -72,7 +72,7 @@ for path in argv[1:]:
 // This file is part of %(name)s.
 // This file is part of %(name)s.
 //
 //
 // %(name)s is free software: you can redistribute it and/or modify
 // %(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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -81,10 +81,10 @@ for path in argv[1:]:
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // 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"]:
 	if ext in ["c", "h", "inc"]:
 		header = "/*" + header[2:-1] + " */\n\n"
 		header = "/*" + header[2:-1] + " */\n\n"

+ 3 - 3
scripts/static-build.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 #!/bin/bash
 #
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # 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)
 # This script will compile static versions of wkhtmltopdf for linux and for windows (it must run in linux)

+ 3 - 3
scripts/syncwkhtmltpdf.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 #!/bin/bash
 #
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 mkdir -p include/wkhtmltox
 mkdir -p include/wkhtmltox

+ 3 - 3
scripts/test.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 #!/bin/bash
 #
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 #This script will test a compiled wkhtmltopdf for some basic functionality
 #This script will test a compiled wkhtmltopdf for some basic functionality

+ 3 - 3
scripts/upload.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 #!/bin/bash
 #
 #
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 cd "release-$1"
 cd "release-$1"

+ 3 - 3
src/image/image.pro

@@ -1,9 +1,9 @@
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 include(../../version.pri)
 include(../../version.pri)

+ 3 - 3
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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "arghandler.inl"
 #include "arghandler.inl"

+ 3 - 3
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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "imagecommandlineparser.hh"
 #include "imagecommandlineparser.hh"

+ 3 - 3
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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef __IMAGECOMMANDLINEPARSER_HH__
 #ifndef __IMAGECOMMANDLINEPARSER_HH__

+ 3 - 3
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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "imagecommandlineparser.hh"
 #include "imagecommandlineparser.hh"

+ 3 - 3
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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "imagecommandlineparser.hh"
 #include "imagecommandlineparser.hh"

+ 3 - 3
src/pdf/pdf.pro

@@ -1,9 +1,9 @@
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 include(../../version.pri)
 include(../../version.pri)

+ 3 - 3
src/pdf/pdfarguments.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "arghandler.inl"
 #include "arghandler.inl"

+ 3 - 3
src/pdf/pdfcommandlineparser.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "outputter.hh"
 #include "outputter.hh"

+ 3 - 3
src/pdf/pdfcommandlineparser.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef __PDFCOMMANDLINEPARSER_HH__
 #ifndef __PDFCOMMANDLINEPARSER_HH__

+ 3 - 3
src/pdf/pdfdocparts.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "outputter.hh"
 #include "outputter.hh"

+ 3 - 3
src/pdf/wkhtmltopdf.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "pdfcommandlineparser.hh"
 #include "pdfcommandlineparser.hh"

+ 3 - 3
src/shared/arghandler.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "outputter.hh"
 #include "outputter.hh"

+ 3 - 3
src/shared/arghandler.inl

@@ -1,12 +1,12 @@
 // -*- mode: c++; tab-width: 4; indent-tabs-mode: t; eval: (progn (c-set-style "stroustrup") (c-set-offset 'innamespace 0)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef __ARGHANDLER_INL__
 #ifndef __ARGHANDLER_INL__

+ 3 - 3
src/shared/commandlineparserbase.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "commandlineparserbase.hh"
 #include "commandlineparserbase.hh"

+ 3 - 3
src/shared/commandlineparserbase.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef __COMMANDLINEPARSERBASE_HH__
 #ifndef __COMMANDLINEPARSERBASE_HH__

+ 3 - 3
src/shared/commonarguments.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "arghandler.inl"
 #include "arghandler.inl"

+ 3 - 3
src/shared/commondocparts.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "commandlineparserbase.hh"
 #include "commandlineparserbase.hh"

+ 3 - 3
src/shared/htmloutputter.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "outputter.hh"
 #include "outputter.hh"

+ 3 - 3
src/shared/manoutputter.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "outputter.hh"
 #include "outputter.hh"

+ 3 - 3
src/shared/outputter.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "outputter.hh"
 #include "outputter.hh"

+ 3 - 3
src/shared/outputter.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef __OUTPUTTER_HH__
 #ifndef __OUTPUTTER_HH__

+ 3 - 3
src/shared/progressfeedback.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "progressfeedback.hh"
 #include "progressfeedback.hh"

+ 3 - 3
src/shared/progressfeedback.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef __PROGRESSFEEDBACK_HH__
 #ifndef __PROGRESSFEEDBACK_HH__

+ 3 - 3
src/shared/shared.pri

@@ -1,9 +1,9 @@
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 HEADERS +=  ../shared/progressfeedback.hh
 HEADERS +=  ../shared/progressfeedback.hh

+ 3 - 3
src/shared/textoutputter.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)); -*-
 // -*- 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 :
 // vi:set ts=4 sts=4 sw=4 noet :
 //
 //
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2011 wkhtmltopdf authors
 //
 //
 // This file is part of wkhtmltopdf.
 // This file is part of wkhtmltopdf.
 //
 //
 // wkhtmltopdf is free software: you can redistribute it and/or modify
 // 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
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
 // (at your option) any later version.
 //
 //
@@ -15,7 +15,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 // 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/>.
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "outputter.hh"
 #include "outputter.hh"

+ 2 - 2
static_qt_conf_base

@@ -1,7 +1,7 @@
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -10,7 +10,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 -release
 -release
 -static
 -static

+ 2 - 2
static_qt_conf_linux

@@ -1,7 +1,7 @@
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -10,7 +10,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 -largefile
 -largefile
 -rpath
 -rpath

+ 2 - 2
static_qt_conf_osx

@@ -1,7 +1,7 @@
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -10,7 +10,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 -largefile
 -largefile
 -rpath
 -rpath

+ 2 - 2
static_qt_conf_win

@@ -1,7 +1,7 @@
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -10,7 +10,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 -qt-style-windows    #Required for cleanlooks
 -qt-style-windows    #Required for cleanlooks
 -qt-style-cleanlooks
 -qt-style-cleanlooks

+ 17 - 0
version.pri

@@ -1,3 +1,20 @@
+# Copyright 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 Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wkhtmltopdf 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 Lesser General Public License
+# along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
+
 MAJOR_VERSION=0
 MAJOR_VERSION=0
 MINOR_VERSION=10
 MINOR_VERSION=10
 PATCH_VERSION=0
 PATCH_VERSION=0

+ 3 - 3
wkhtmltopdf.pro

@@ -1,9 +1,9 @@
-# Copyright 2010 wkhtmltopdf authors
+# Copyright 2010, 2011 wkhtmltopdf authors
 #
 #
 # This file is part of wkhtmltopdf.
 # This file is part of wkhtmltopdf.
 #
 #
 # wkhtmltopdf is free software: you can redistribute it and/or modify
 # 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # (at your option) any later version.
 #
 #
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 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/>.
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
 
 TEMPLATE = subdirs
 TEMPLATE = subdirs