Change the license boiler plates of all LGPL files removing the special exception.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Renato Araújo <renato.filho@openbossa.org>

84 files changed, 672 insertions, 1680 deletions

diff --git a/tests/libother/extendsnoimplicitconversion.h b/tests/libother/extendsnoimplicitconversion.h
index a94c63ade..837f47ee1 100644
--- a/tests/libother/extendsnoimplicitconversion.h
+++ b/tests/libother/extendsnoimplicitconversion.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef EXTENDSNOIMPLICITCONVERSION_H
diff --git a/tests/libother/libothermacros.h b/tests/libother/libothermacros.h
index f7f328180..5c32a226a 100644
--- a/tests/libother/libothermacros.h
+++ b/tests/libother/libothermacros.h
@@ -5,31 +5,19 @@
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef LIBOTHERMACROS_H
diff --git a/tests/libother/number.cpp b/tests/libother/number.cpp
index 61dc33195..132624a5b 100644
--- a/tests/libother/number.cpp
+++ b/tests/libother/number.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "number.h"
diff --git a/tests/libother/number.h b/tests/libother/number.h
index 8fd2671da..9deeb680d 100644
--- a/tests/libother/number.h
+++ b/tests/libother/number.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef NUMBER_H
diff --git a/tests/libother/otherderived.cpp b/tests/libother/otherderived.cpp
index 5659fe0cf..f51f48252 100644
--- a/tests/libother/otherderived.cpp
+++ b/tests/libother/otherderived.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "otherderived.h"
diff --git a/tests/libother/otherderived.h b/tests/libother/otherderived.h
index 8e9171ba5..16f215451 100644
--- a/tests/libother/otherderived.h
+++ b/tests/libother/otherderived.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef OTHERDERIVED_H
diff --git a/tests/libother/othermultiplederived.cpp b/tests/libother/othermultiplederived.cpp
index fadaa02b8..3bd000386 100644
--- a/tests/libother/othermultiplederived.cpp
+++ b/tests/libother/othermultiplederived.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "othermultiplederived.h"
diff --git a/tests/libother/othermultiplederived.h b/tests/libother/othermultiplederived.h
index 33260b6ec..8cead4d7e 100644
--- a/tests/libother/othermultiplederived.h
+++ b/tests/libother/othermultiplederived.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef OTHERMULTIPLEDERIVED_H
diff --git a/tests/libother/otherobjecttype.cpp b/tests/libother/otherobjecttype.cpp
index 7cffdd6cf..845ac07c2 100644
--- a/tests/libother/otherobjecttype.cpp
+++ b/tests/libother/otherobjecttype.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "otherobjecttype.h"
diff --git a/tests/libother/otherobjecttype.h b/tests/libother/otherobjecttype.h
index d4c77cb19..455e78b5e 100644
--- a/tests/libother/otherobjecttype.h
+++ b/tests/libother/otherobjecttype.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef OTHEROBJECTTYPE_H
diff --git a/tests/libsample/abstract.cpp b/tests/libsample/abstract.cpp
index f1f26421c..26c342352 100644
--- a/tests/libsample/abstract.cpp
+++ b/tests/libsample/abstract.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/abstract.h b/tests/libsample/abstract.h
index 842435bcb..7a9f3e094 100644
--- a/tests/libsample/abstract.h
+++ b/tests/libsample/abstract.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef ABSTRACT_H
diff --git a/tests/libsample/blackbox.cpp b/tests/libsample/blackbox.cpp
index 563b562d1..474a605fb 100644
--- a/tests/libsample/blackbox.cpp
+++ b/tests/libsample/blackbox.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "blackbox.h"
diff --git a/tests/libsample/blackbox.h b/tests/libsample/blackbox.h
index 344ff001d..ed6f0d37b 100644
--- a/tests/libsample/blackbox.h
+++ b/tests/libsample/blackbox.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef BLACKBOX_H
diff --git a/tests/libsample/bucket.cpp b/tests/libsample/bucket.cpp
index 1cfe828e7..b69ac7ec2 100644
--- a/tests/libsample/bucket.cpp
+++ b/tests/libsample/bucket.cpp
@@ -5,31 +5,19 @@
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "bucket.h"
diff --git a/tests/libsample/bucket.h b/tests/libsample/bucket.h
index c0ff388b7..af1bee5f3 100644
--- a/tests/libsample/bucket.h
+++ b/tests/libsample/bucket.h
@@ -5,31 +5,19 @@
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef BUCKET_H
diff --git a/tests/libsample/collector.cpp b/tests/libsample/collector.cpp
index b87eb2957..eaa3e813a 100644
--- a/tests/libsample/collector.cpp
+++ b/tests/libsample/collector.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "collector.h"
diff --git a/tests/libsample/collector.h b/tests/libsample/collector.h
index e0ee74149..c916d6f77 100644
--- a/tests/libsample/collector.h
+++ b/tests/libsample/collector.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef COLLECTOR_H
diff --git a/tests/libsample/complex.cpp b/tests/libsample/complex.cpp
index 120dd8bf9..5717e4902 100644
--- a/tests/libsample/complex.cpp
+++ b/tests/libsample/complex.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/complex.h b/tests/libsample/complex.h
index 2441d3ae8..d8f27b0a9 100644
--- a/tests/libsample/complex.h
+++ b/tests/libsample/complex.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef COMPLEX_H
diff --git a/tests/libsample/derived.cpp b/tests/libsample/derived.cpp
index 1e8303692..98f4395ca 100644
--- a/tests/libsample/derived.cpp
+++ b/tests/libsample/derived.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/derived.h b/tests/libsample/derived.h
index e2e1dfa2a..07c11caff 100644
--- a/tests/libsample/derived.h
+++ b/tests/libsample/derived.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef DERIVED_H
diff --git a/tests/libsample/echo.cpp b/tests/libsample/echo.cpp
index 54ddd9351..1d51cb5a0 100644
--- a/tests/libsample/echo.cpp
+++ b/tests/libsample/echo.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "echo.h"
diff --git a/tests/libsample/echo.h b/tests/libsample/echo.h
index 3c50f9842..3e607cdd5 100644
--- a/tests/libsample/echo.h
+++ b/tests/libsample/echo.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef ECHO_H
diff --git a/tests/libsample/functions.cpp b/tests/libsample/functions.cpp
index aebd9b83b..8cd77351b 100644
--- a/tests/libsample/functions.cpp
+++ b/tests/libsample/functions.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "functions.h"
diff --git a/tests/libsample/functions.h b/tests/libsample/functions.h
index 8c93d7c98..02256e033 100644
--- a/tests/libsample/functions.h
+++ b/tests/libsample/functions.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef FUNCTIONS_H
diff --git a/tests/libsample/implicitconv.cpp b/tests/libsample/implicitconv.cpp
index 8e0d3f463..b4dc2fb39 100644
--- a/tests/libsample/implicitconv.cpp
+++ b/tests/libsample/implicitconv.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "implicitconv.h"
diff --git a/tests/libsample/implicitconv.h b/tests/libsample/implicitconv.h
index e7373b048..b7eaf9660 100644
--- a/tests/libsample/implicitconv.h
+++ b/tests/libsample/implicitconv.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef IMPLICITCONV_H
diff --git a/tests/libsample/injectcode.cpp b/tests/libsample/injectcode.cpp
index 3621acb2d..05c4a1438 100644
--- a/tests/libsample/injectcode.cpp
+++ b/tests/libsample/injectcode.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "injectcode.h"
diff --git a/tests/libsample/injectcode.h b/tests/libsample/injectcode.h
index e7c68cf9b..b7a2f5d49 100644
--- a/tests/libsample/injectcode.h
+++ b/tests/libsample/injectcode.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef INJECTCODE_H
diff --git a/tests/libsample/libsamplemacros.h b/tests/libsample/libsamplemacros.h
index 4a845ab76..888a27186 100644
--- a/tests/libsample/libsamplemacros.h
+++ b/tests/libsample/libsamplemacros.h
@@ -5,31 +5,19 @@
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef LIBSAMPLEMACROS_H
diff --git a/tests/libsample/list.h b/tests/libsample/list.h
index c620c5f81..d9a52c31f 100644
--- a/tests/libsample/list.h
+++ b/tests/libsample/list.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef LIST_H
diff --git a/tests/libsample/listuser.cpp b/tests/libsample/listuser.cpp
index 8dc76f8ae..2110c0047 100644
--- a/tests/libsample/listuser.cpp
+++ b/tests/libsample/listuser.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <numeric>
diff --git a/tests/libsample/listuser.h b/tests/libsample/listuser.h
index 6f04c2e57..bbb555be7 100644
--- a/tests/libsample/listuser.h
+++ b/tests/libsample/listuser.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef LISTUSER_H
diff --git a/tests/libsample/main.cpp b/tests/libsample/main.cpp
index a37510172..3dfb1ba9a 100644
--- a/tests/libsample/main.cpp
+++ b/tests/libsample/main.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/mapuser.cpp b/tests/libsample/mapuser.cpp
index eb29bb62c..f733c677a 100644
--- a/tests/libsample/mapuser.cpp
+++ b/tests/libsample/mapuser.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/mapuser.h b/tests/libsample/mapuser.h
index 21bd226a9..e08525ab9 100644
--- a/tests/libsample/mapuser.h
+++ b/tests/libsample/mapuser.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef MAPUSER_H
diff --git a/tests/libsample/modifications.cpp b/tests/libsample/modifications.cpp
index 881aaba8e..8d3539814 100644
--- a/tests/libsample/modifications.cpp
+++ b/tests/libsample/modifications.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/modifications.h b/tests/libsample/modifications.h
index 64841d63a..639d09218 100644
--- a/tests/libsample/modifications.h
+++ b/tests/libsample/modifications.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef MODIFICATIONS_H
diff --git a/tests/libsample/multiple_derived.cpp b/tests/libsample/multiple_derived.cpp
index e8e4c4c3d..2bed90b1d 100644
--- a/tests/libsample/multiple_derived.cpp
+++ b/tests/libsample/multiple_derived.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "multiple_derived.h"
diff --git a/tests/libsample/multiple_derived.h b/tests/libsample/multiple_derived.h
index 98ccb4de8..32a4f7245 100644
--- a/tests/libsample/multiple_derived.h
+++ b/tests/libsample/multiple_derived.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef MDERIVED_H
diff --git a/tests/libsample/noimplicitconversion.h b/tests/libsample/noimplicitconversion.h
index 89010f426..95a4afde3 100644
--- a/tests/libsample/noimplicitconversion.h
+++ b/tests/libsample/noimplicitconversion.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef NOIMPLICITCONVERSION_H
diff --git a/tests/libsample/nondefaultctor.h b/tests/libsample/nondefaultctor.h
index ea0d6dfab..4317f3c60 100644
--- a/tests/libsample/nondefaultctor.h
+++ b/tests/libsample/nondefaultctor.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef NONDEFAULTCTOR_H
diff --git a/tests/libsample/null.h b/tests/libsample/null.h
index ffddaafa0..6c069b4b6 100644
--- a/tests/libsample/null.h
+++ b/tests/libsample/null.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef NULL_H
diff --git a/tests/libsample/objecttype.cpp b/tests/libsample/objecttype.cpp
index d57dbeddd..ea3c78e7c 100644
--- a/tests/libsample/objecttype.cpp
+++ b/tests/libsample/objecttype.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "objecttype.h"
diff --git a/tests/libsample/objecttype.h b/tests/libsample/objecttype.h
index 34142185e..c3bd8c626 100644
--- a/tests/libsample/objecttype.h
+++ b/tests/libsample/objecttype.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef OBJECTTYPE_H
diff --git a/tests/libsample/objecttypelayout.cpp b/tests/libsample/objecttypelayout.cpp
index 92180418f..fd9a306c4 100644
--- a/tests/libsample/objecttypelayout.cpp
+++ b/tests/libsample/objecttypelayout.cpp
@@ -5,31 +5,19 @@
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "objecttypelayout.h"
diff --git a/tests/libsample/objecttypelayout.h b/tests/libsample/objecttypelayout.h
index 8473bb079..18693ca56 100644
--- a/tests/libsample/objecttypelayout.h
+++ b/tests/libsample/objecttypelayout.h
@@ -5,31 +5,19 @@
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef OBJECTTYPELAYOUT_H
diff --git a/tests/libsample/objectview.cpp b/tests/libsample/objectview.cpp
index 03da872be..835e71839 100644
--- a/tests/libsample/objectview.cpp
+++ b/tests/libsample/objectview.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "objectview.h"
diff --git a/tests/libsample/objectview.h b/tests/libsample/objectview.h
index 085300350..fd3d640b4 100644
--- a/tests/libsample/objectview.h
+++ b/tests/libsample/objectview.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef OBJECTVIEW_H
diff --git a/tests/libsample/oddbool.h b/tests/libsample/oddbool.h
index e46894766..bbb4340e1 100644
--- a/tests/libsample/oddbool.h
+++ b/tests/libsample/oddbool.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef ODDBOOL_H
diff --git a/tests/libsample/overload.cpp b/tests/libsample/overload.cpp
index 23ff560c1..ccef1f9ae 100644
--- a/tests/libsample/overload.cpp
+++ b/tests/libsample/overload.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "overload.h"
diff --git a/tests/libsample/overload.h b/tests/libsample/overload.h
index dbce9de8d..739c40656 100644
--- a/tests/libsample/overload.h
+++ b/tests/libsample/overload.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef OVERLOAD_H
diff --git a/tests/libsample/overloadsort.cpp b/tests/libsample/overloadsort.cpp
index d6d2f0dbf..99550b1ba 100644
--- a/tests/libsample/overloadsort.cpp
+++ b/tests/libsample/overloadsort.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "overloadsort.h"
diff --git a/tests/libsample/overloadsort.h b/tests/libsample/overloadsort.h
index 83ab04308..c95c35728 100644
--- a/tests/libsample/overloadsort.h
+++ b/tests/libsample/overloadsort.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef OVERLOADSORT_H
diff --git a/tests/libsample/pairuser.cpp b/tests/libsample/pairuser.cpp
index f2c884850..38f1bf093 100644
--- a/tests/libsample/pairuser.cpp
+++ b/tests/libsample/pairuser.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/pairuser.h b/tests/libsample/pairuser.h
index 6e42f44c4..3cf2393fb 100644
--- a/tests/libsample/pairuser.h
+++ b/tests/libsample/pairuser.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef PAIRUSER_H
diff --git a/tests/libsample/point.cpp b/tests/libsample/point.cpp
index 0b6540202..b8d310cfe 100644
--- a/tests/libsample/point.cpp
+++ b/tests/libsample/point.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/point.h b/tests/libsample/point.h
index cfd1f251d..5c1e19a25 100644
--- a/tests/libsample/point.h
+++ b/tests/libsample/point.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef POINT_H
diff --git a/tests/libsample/pointerholder.h b/tests/libsample/pointerholder.h
index cf11cad7b..fc9c43342 100644
--- a/tests/libsample/pointerholder.h
+++ b/tests/libsample/pointerholder.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef POINTERHOLDER_H
diff --git a/tests/libsample/polygon.cpp b/tests/libsample/polygon.cpp
index 78c742fb0..7f1e7f6da 100644
--- a/tests/libsample/polygon.cpp
+++ b/tests/libsample/polygon.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/polygon.h b/tests/libsample/polygon.h
index 9d341a65c..a127387f4 100644
--- a/tests/libsample/polygon.h
+++ b/tests/libsample/polygon.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef POLYGON_H
diff --git a/tests/libsample/privatector.h b/tests/libsample/privatector.h
index 674a2052d..399eef6ed 100644
--- a/tests/libsample/privatector.h
+++ b/tests/libsample/privatector.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef PRIVATECTOR_H
diff --git a/tests/libsample/privatedtor.h b/tests/libsample/privatedtor.h
index 0bc8c2f7f..79e4b2b4c 100644
--- a/tests/libsample/privatedtor.h
+++ b/tests/libsample/privatedtor.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef PRIVATEDTOR_H
diff --git a/tests/libsample/protected.cpp b/tests/libsample/protected.cpp
index 4a2b251db..85749d726 100644
--- a/tests/libsample/protected.cpp
+++ b/tests/libsample/protected.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "protected.h"
diff --git a/tests/libsample/protected.h b/tests/libsample/protected.h
index 4bb26b50c..bf4dea045 100644
--- a/tests/libsample/protected.h
+++ b/tests/libsample/protected.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef PROTECTED_H
diff --git a/tests/libsample/reference.cpp b/tests/libsample/reference.cpp
index 08805dc5b..670395ff6 100644
--- a/tests/libsample/reference.cpp
+++ b/tests/libsample/reference.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/reference.h b/tests/libsample/reference.h
index 5f9c20c4e..046a1518e 100644
--- a/tests/libsample/reference.h
+++ b/tests/libsample/reference.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef REFERENCE_H
diff --git a/tests/libsample/samplenamespace.cpp b/tests/libsample/samplenamespace.cpp
index 159b19f0b..0bcc5c2b2 100644
--- a/tests/libsample/samplenamespace.cpp
+++ b/tests/libsample/samplenamespace.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/samplenamespace.h b/tests/libsample/samplenamespace.h
index 834b3bc24..2533b9740 100644
--- a/tests/libsample/samplenamespace.h
+++ b/tests/libsample/samplenamespace.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef SAMPLENAMESPACE_H
diff --git a/tests/libsample/simplefile.cpp b/tests/libsample/simplefile.cpp
index 1dc378acd..1a3e64a3f 100644
--- a/tests/libsample/simplefile.cpp
+++ b/tests/libsample/simplefile.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <stdlib.h>
diff --git a/tests/libsample/simplefile.h b/tests/libsample/simplefile.h
index 9f7d042a2..c5328daff 100644
--- a/tests/libsample/simplefile.h
+++ b/tests/libsample/simplefile.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef SIMPLEFILE_H
diff --git a/tests/libsample/size.cpp b/tests/libsample/size.cpp
index e664e6905..47e36b147 100644
--- a/tests/libsample/size.cpp
+++ b/tests/libsample/size.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
diff --git a/tests/libsample/size.h b/tests/libsample/size.h
index c5bf2b5cb..6154245f7 100644
--- a/tests/libsample/size.h
+++ b/tests/libsample/size.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef SIZE_H
diff --git a/tests/libsample/sometime.cpp b/tests/libsample/sometime.cpp
index 03b512ff4..d2dba4bc9 100644
--- a/tests/libsample/sometime.cpp
+++ b/tests/libsample/sometime.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total time of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "sometime.h"
diff --git a/tests/libsample/sometime.h b/tests/libsample/sometime.h
index d67998715..627c93233 100644
--- a/tests/libsample/sometime.h
+++ b/tests/libsample/sometime.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total time of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef SOMETIME_H
diff --git a/tests/libsample/str.cpp b/tests/libsample/str.cpp
index 461b936df..20c2084a9 100644
--- a/tests/libsample/str.cpp
+++ b/tests/libsample/str.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "str.h"
diff --git a/tests/libsample/str.h b/tests/libsample/str.h
index 9675d4ec8..f51378240 100644
--- a/tests/libsample/str.h
+++ b/tests/libsample/str.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef STR_H
diff --git a/tests/libsample/strlist.cpp b/tests/libsample/strlist.cpp
index dfb337f22..2e487f5e8 100644
--- a/tests/libsample/strlist.cpp
+++ b/tests/libsample/strlist.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "strlist.h"
diff --git a/tests/libsample/strlist.h b/tests/libsample/strlist.h
index 334c868f9..5845d06b5 100644
--- a/tests/libsample/strlist.h
+++ b/tests/libsample/strlist.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef STRLIST_H
diff --git a/tests/libsample/valueandvirtual.h b/tests/libsample/valueandvirtual.h
index d13a2c155..e72dbd255 100644
--- a/tests/libsample/valueandvirtual.h
+++ b/tests/libsample/valueandvirtual.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef VALUEANDVIRTUAL_H
diff --git a/tests/libsample/virtualmethods.cpp b/tests/libsample/virtualmethods.cpp
index 58f8a955a..63c1c8711 100644
--- a/tests/libsample/virtualmethods.cpp
+++ b/tests/libsample/virtualmethods.cpp
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "virtualmethods.h"
diff --git a/tests/libsample/virtualmethods.h b/tests/libsample/virtualmethods.h
index 022453876..dc5db49f4 100644
--- a/tests/libsample/virtualmethods.h
+++ b/tests/libsample/virtualmethods.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef VIRTUALMETHODS_H
diff --git a/tests/libsample/voidholder.h b/tests/libsample/voidholder.h
index 032c9531b..ac2790f84 100644
--- a/tests/libsample/voidholder.h
+++ b/tests/libsample/voidholder.h
@@ -5,31 +5,19 @@
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef VOIDHOLDER_H