gnome-specimen r93 - in trunk-from-bzr: . specimen

[wbolster svn gnome org]

Author: wbolster
Date: Tue Jun 17 18:42:50 2008
New Revision: 93
URL: http://svn.gnome.org/viewvc/gnome-specimen?rev=93&view=rev

Log:
* gnome-specimen.in:
* specimen/config.py.in:
* specimen/main.py:
* specimen/specimenwindow.py:
* NEWS:
  - Oops, this application is GPL, not LGPL. Thanks Daniel
    Holbach for pointing this out
  - Correct copyright notice in config.py.in. Thanks to
    Vincent Untz for the Pessulus example, but the file is
    rewritten by me, so copyright is not an issue here.


Modified:
   trunk-from-bzr/   (props changed)
   trunk-from-bzr/NEWS
   trunk-from-bzr/gnome-specimen.in
   trunk-from-bzr/specimen/config.py.in
   trunk-from-bzr/specimen/main.py
   trunk-from-bzr/specimen/specimenwindow.py

Modified: trunk-from-bzr/NEWS
==============================================================================
--- trunk-from-bzr/NEWS	(original)
+++ trunk-from-bzr/NEWS	Tue Jun 17 18:42:50 2008
@@ -8,6 +8,7 @@
 - Don't ellipsize the preview texts
 - Allow running from the source directory
 - Consistently use the correct application name
+- Changed license to GPL only (copy-pasted boilerplate referred to LGPL as well)
 
 Translations:
 - Dutch (Wouter Bolsterlee)

Modified: trunk-from-bzr/gnome-specimen.in
==============================================================================
--- trunk-from-bzr/gnome-specimen.in	(original)
+++ trunk-from-bzr/gnome-specimen.in	Tue Jun 17 18:42:50 2008
@@ -4,18 +4,19 @@
 # Copyright (C) 2006  Wouter Bolsterlee <uws xs4all nl>
 #
 # This program 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.
-#
-# This library is distributed in the hope that it will be useful,
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA+
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 
 import sys
 

Modified: trunk-from-bzr/specimen/config.py.in
==============================================================================
--- trunk-from-bzr/specimen/config.py.in	(original)
+++ trunk-from-bzr/specimen/config.py.in	Tue Jun 17 18:42:50 2008
@@ -1,22 +1,20 @@
-#!/usr/bin/env python
-
-#
-# Copyright (C) 2005 Vincent Untz <vuntz gnome org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# GNOME Specimen, a font preview application for GNOME
+# Copyright (C) 2006  Wouter Bolsterlee <uws xs4all nl>
 #
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
-#
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 
 from os.path import join, exists, dirname, realpath
 

Modified: trunk-from-bzr/specimen/main.py
==============================================================================
--- trunk-from-bzr/specimen/main.py	(original)
+++ trunk-from-bzr/specimen/main.py	Tue Jun 17 18:42:50 2008
@@ -1,21 +1,20 @@
-#!/usr/bin/env python
-
 # GNOME Specimen, a font preview application for GNOME
 # Copyright (C) 2006  Wouter Bolsterlee <uws xs4all nl>
 #
 # This program 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.
-#
-# This library is distributed in the hope that it will be useful,
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA+
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 
 def main(args):
     import gettext

Modified: trunk-from-bzr/specimen/specimenwindow.py
==============================================================================
--- trunk-from-bzr/specimen/specimenwindow.py	(original)
+++ trunk-from-bzr/specimen/specimenwindow.py	Tue Jun 17 18:42:50 2008
@@ -1,3 +1,20 @@
+# GNOME Specimen, a font preview application for GNOME
+# Copyright (C) 2006  Wouter Bolsterlee <uws xs4all nl>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 
 import os.path