diff --git a/COPYING b/COPYING index d60c31a9..d511905c 100644 --- a/COPYING +++ b/COPYING @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + 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. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/src/virt-manager.py.in b/src/virt-manager.py.in index e3bd4bf6..612e2346 100755 --- a/src/virt-manager.py.in +++ b/src/virt-manager.py.in @@ -15,7 +15,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import os diff --git a/src/virtManager/__init__.py b/src/virtManager/__init__.py index 2347c085..0c22807b 100644 --- a/src/virtManager/__init__.py +++ b/src/virtManager/__init__.py @@ -14,5 +14,6 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # diff --git a/src/virtManager/about.py b/src/virtManager/about.py index 7b54484e..a5d8ff4a 100644 --- a/src/virtManager/about.py +++ b/src/virtManager/about.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gtk.glade diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py index 6cb1cad1..063510e0 100644 --- a/src/virtManager/addhardware.py +++ b/src/virtManager/addhardware.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/asyncjob.py b/src/virtManager/asyncjob.py index 8492394a..9be9e14a 100644 --- a/src/virtManager/asyncjob.py +++ b/src/virtManager/asyncjob.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import threading diff --git a/src/virtManager/choosecd.py b/src/virtManager/choosecd.py index b187a645..bef41be7 100644 --- a/src/virtManager/choosecd.py +++ b/src/virtManager/choosecd.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gtk.glade import gobject diff --git a/src/virtManager/config.py b/src/virtManager/config.py index bd89918b..a8956c38 100644 --- a/src/virtManager/config.py +++ b/src/virtManager/config.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gconf import os diff --git a/src/virtManager/connect.py b/src/virtManager/connect.py index 353c3d79..4e8695af 100644 --- a/src/virtManager/connect.py +++ b/src/virtManager/connect.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/connection.py b/src/virtManager/connection.py index 919aabaf..52c9be09 100644 --- a/src/virtManager/connection.py +++ b/src/virtManager/connection.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/console.py b/src/virtManager/console.py index 2aa6ac3c..44bb042c 100644 --- a/src/virtManager/console.py +++ b/src/virtManager/console.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/create.py b/src/virtManager/create.py index 215b1e8b..cb5bf26e 100644 --- a/src/virtManager/create.py +++ b/src/virtManager/create.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/createmeter.py b/src/virtManager/createmeter.py index b4eb5916..0f9721c7 100644 --- a/src/virtManager/createmeter.py +++ b/src/virtManager/createmeter.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import urlgrabber.progress as progress diff --git a/src/virtManager/createnet.py b/src/virtManager/createnet.py index 682a67fd..cbdcdb6e 100644 --- a/src/virtManager/createnet.py +++ b/src/virtManager/createnet.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/details.py b/src/virtManager/details.py index 6eb64814..5ae12c16 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/domain.py b/src/virtManager/domain.py index 323a4788..f6fcdb58 100644 --- a/src/virtManager/domain.py +++ b/src/virtManager/domain.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/engine.py b/src/virtManager/engine.py index 11e0bba0..9053a0e8 100644 --- a/src/virtManager/engine.py +++ b/src/virtManager/engine.py @@ -14,8 +14,10 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # + import gobject import gtk import sys diff --git a/src/virtManager/error.py b/src/virtManager/error.py index cac48e0f..5e5bb833 100644 --- a/src/virtManager/error.py +++ b/src/virtManager/error.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. import gtk import gtk.glade diff --git a/src/virtManager/host.py b/src/virtManager/host.py index 855de556..6f5c8501 100644 --- a/src/virtManager/host.py +++ b/src/virtManager/host.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/keyring.py b/src/virtManager/keyring.py index 0f8acaa9..f1ed4617 100644 --- a/src/virtManager/keyring.py +++ b/src/virtManager/keyring.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # from virtManager.secret import * diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py index 94efa67a..3adeb8e0 100644 --- a/src/virtManager/manager.py +++ b/src/virtManager/manager.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/netdev.py b/src/virtManager/netdev.py index bc08512c..8674cddf 100644 --- a/src/virtManager/netdev.py +++ b/src/virtManager/netdev.py @@ -13,7 +13,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/network.py b/src/virtManager/network.py index 9172fc77..b8004c7f 100644 --- a/src/virtManager/network.py +++ b/src/virtManager/network.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/opticalhelper.py b/src/virtManager/opticalhelper.py index 36bc3be4..154024d1 100644 --- a/src/virtManager/opticalhelper.py +++ b/src/virtManager/opticalhelper.py @@ -13,7 +13,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gobject diff --git a/src/virtManager/preferences.py b/src/virtManager/preferences.py index 733adf12..1bc856cc 100644 --- a/src/virtManager/preferences.py +++ b/src/virtManager/preferences.py @@ -14,8 +14,10 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # + import gtk.glade import gobject diff --git a/src/virtManager/remote.py b/src/virtManager/remote.py index accbae8c..435f19a1 100644 --- a/src/virtManager/remote.py +++ b/src/virtManager/remote.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import dbus.service diff --git a/src/virtManager/secret.py b/src/virtManager/secret.py index 29afb6bd..c783cb76 100644 --- a/src/virtManager/secret.py +++ b/src/virtManager/secret.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # diff --git a/src/virtManager/serialcon.py b/src/virtManager/serialcon.py index 52ee0c6f..61111b07 100644 --- a/src/virtManager/serialcon.py +++ b/src/virtManager/serialcon.py @@ -14,7 +14,8 @@ # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # import gtk diff --git a/virt-manager.spec.in b/virt-manager.spec.in index d5dd6043..82f826d4 100644 --- a/virt-manager.spec.in +++ b/virt-manager.spec.in @@ -12,7 +12,7 @@ Release: 1%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators -License: GPL +License: GPLv2+ URL: http://virt-manager.et.redhat.com/ Source0: http://virt-manager.et.redhat.com/download/sources/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)