Merge heads

AUTHORS

@@ -1,7 +1,18 @@
- Virtual Machine Manager
- =======================
+ Virtual Machine Manager Authors
+ ===============================
 
-Virtual Machine Manager is maintained by:
+Virtual Machine Manager code is developed by:
 
    Daniel Berrange <berrange@redhat.com>
+   Hugh O. Brock <hbrock@redhat.com>
+
+The user interaction / interface design and artwork is
+done by:
+
+   Máirín Duffy <duffy@redhat.com>
+
+Further patches have been submitted by:
+
+  <...send a patch & get your name here...>
+
 

README

@@ -4,3 +4,98 @@
 This application provides a graphical tool for managing virtual machines
 via the libvirt library.
 
+The front end of the application uses the PyGTK / Glade libraries for
+all user interaction components. The back end uses libvirt for managing
+Xen virtual machines. Although primarily tested with Xen, the UI code is
+intended to be portable to any virtualization backend libvirt supports. So
+when libvirt is ported to QEMU / UML / VmWare the UI should not require
+any significant changes to deal with these technologies.
+
+Terminology
+-----------
+
+In prose this app should be referred to as 'Virtual Machine Manager'.
+For source / RPM packaging, & the command name, it is called by the
+shortened form 'virt-manager'
+
+Pre-requisite software
+----------------------
+
+Where versions are noted below these are the versions tested to definitely
+work. For some of them you may be able to run with earlier releases, so
+please report any success to the mailing lists 
+
+ python  >= 2.4
+ pygtk2 >= 1.99.12-6
+ gnome-python2-gconf >= 1.99.11-7
+ libvirt-python >= 0.1.1
+ dbus-python >= 0.61
+ gnome-keyring >= 0.4.9
+ python-ctypes >= 0.9.9.6
+ python-imaging
+
+Contact
+-------
+
+All comments / suggestions / patches should be directed to the fedora-xen
+mailing list:
+
+  http://www.redhat.com/mailman/listinfo/fedora-xen
+
+There are futher project details on the website:
+
+  http://virt-manager.et.redhat.com/
+
+Submitting patches
+------------------
+
+Patches should be submitted either as unified diffs:
+
+   tar zxvf virt-manager-X.Y.Z.tar.gz
+   cp -a virt-manager-X.Y.Z virt-manager-X.Y.Z-myfeature
+   cd virt-manager-X.Y.Z-myfeature
+   ... make some changes .. 
+   cd ..
+   diff -ruN virt-manager-X.Y.Z virt-manager-X.Y.Z-myfeature \
+      > myfeature.patch
+
+Alternatively use Mercurial and submit a changeset bundle against
+the main source repository:
+
+   hg clone  http://hg.et.redhat.com/virt/applications/virt-manager--devel
+   cd virt-manager--devel
+   ... make some changes & commit them locally...
+   hg bundle myfeature.hg http://hg.et.redhat.com/virt/applications/virt-manager--devel
+
+Then mail the 'myfeature.hg' file to fedora-xen list. This approach is
+preferred to plain patches, because the Mercurial bundle preserves all
+your local commit messages & history.
+
+Related software
+----------------
+
+Links which are relevant:
+
+  http://libvirt.org
+  http://xensource.com/xen/
+  http://pygtk.org/
+  http://gtk.org/
+
+Copyright /  License
+--------------------
+
+Unless otherwise noted, all the code for the Virtual Machine Manager
+is covered under the GPL, and Copyright (C) Red Hat.
+
+The exception to this is the backend RFB protocol code for the embedded
+VNC viewer widget. This code is taken from the excellant pyvnc2swf 
+application:
+
+  http://www.unixuser.org/~euske/vnc2swf/pyvnc2swf.html
+
+It is also covered under the GPL, but refer to the individual source
+code files under 'src/vncViewer' for details of all the copyright holders
+and original authors.
+
+-- End of broadcast!
+

configure.ac

@@ -1,5 +1,5 @@
 AC_INIT(virt-manager.spec.in)
-AM_INIT_AUTOMAKE(virt-manager, 0.1.3)
+AM_INIT_AUTOMAKE(virt-manager, 0.1.4)
 
 AC_PROG_CC
 AC_PROG_LIBTOOL

src/Makefile.am

@@ -6,7 +6,7 @@ bin_SCRIPTS = virt-manager
 
 pythondir = $(pkgdatadir)
 python_SOURCES = $(PACKAGE).py.in
-python_SCRIPTS = $(PACKAGE).py
+python_DATA = $(PACKAGE).py
 
 libexec_SOURCES = $(PACKAGE)-launch.in
 libexec_SCRIPTS = $(PACKAGE)-launch
@@ -22,7 +22,7 @@ dbusdir = $(datadir)/dbus-1/services
 dbus_SOURCES = $(PACKAGE).service.in
 dbus_DATA = $(PACKAGE).service
 
-CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_SCRIPTS)  $(libexec_SCRIPTS)
+CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_DATA)  $(libexec_SCRIPTS)
 
 EXTRA_DIST = $(bin_SOURCES) $(desktop_SOURCES) $(dbus_SOURCES) $(python_SOURCES) $(glade_DATA) $(libexec_SOURCES)
 

src/virt-manager.py.in

@@ -1,4 +1,3 @@
-#!/usr/bin/python
 # -*- python -*-
 #
 # Copyright (C) 2006 Red Hat, Inc.

src/virtManager/Makefile.am

@@ -1,5 +1,5 @@
 
 pythondir = $(pkgdatadir)/virtManager
-python_SCRIPTS = $(wildcard $(srcdir)/*.py)
+python_DATA = $(wildcard $(srcdir)/*.py)
 
-EXTRA_DIST = $(python_SCRIPTS)
+EXTRA_DIST = $(python_DATA)

src/vncViewer/Makefile.am

@@ -1,5 +1,5 @@
 
 pythondir = $(pkgdatadir)/vncViewer
-python_SCRIPTS = $(wildcard $(srcdir)/*.py)
+python_DATA = $(wildcard $(srcdir)/*.py)
 
-EXTRA_DIST = $(python_SCRIPTS)
+EXTRA_DIST = $(python_DATA)

src/vncViewer/crippled_des.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 ##
 ##  pyvnc2swf - crippled_des.py
 ##

src/vncViewer/image.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 ##
 ##  pyvnc2swf - image.py
 ##

src/vncViewer/rfb.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 ##
 ##  pyvnc2swf - rfb.py
 ##

src/vncViewer/vnc.py

@@ -1,4 +1,3 @@
-#!/usr/bin/python
 #
 # Copyright (C) 2006  Daniel Berrange
 # Copyright (C) 2006 Red Hat

virt-manager.spec.in

@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Thu Jul 20 2006 Daniel Berrange <berrange@redhat.com> - 0.1.4-1
+- Update to new 0.1.4 release snapshot
+
 * Mon Jul 17 2006 Daniel Berrange <berrange@redhat.com> - 0.1.3-1
 - Fix License tag
 - Updated for new release