conduit r1330 - in trunk: . conduit/gtkui data

[jstowers svn gnome org]

Author: jstowers
Date: Mon Feb 18 21:26:14 2008
New Revision: 1330
URL: http://svn.gnome.org/viewvc/conduit?rev=1330&view=rev

Log:
2008-02-19  John Stowers  <john stowers gmail com>

	* conduit/gtkui/UI.py:
	* data/COPYING:
	* data/Makefile.am: Attribute tango derived icons to satisfy cc-by-sa 2.5



Added:
   trunk/data/COPYING
Modified:
   trunk/ChangeLog
   trunk/conduit/gtkui/UI.py
   trunk/data/Makefile.am

Modified: trunk/conduit/gtkui/UI.py
==============================================================================
--- trunk/conduit/gtkui/UI.py	(original)
+++ trunk/conduit/gtkui/UI.py	Mon Feb 18 21:26:14 2008
@@ -536,7 +536,15 @@
         self.set_version(conduit.APPVERSION)
         self.set_comments("Synchronisation for GNOME")
         self.set_website("http://www.conduit-project.org";)
-        self.set_authors(["John Stowers","John Carr","Thomas Van Machelen","Jonny Lamb"])
+        self.set_authors([
+        		"John Stowers",
+        		"John Carr",
+        		"Thomas Van Machelen",
+        		"Jonny Lamb"])
+        self.set_artists([
+        		"John Stowers",
+        		"mejogid",
+        		"The Tango Project (http://tango.freedesktop.org)"])
         self.set_logo_icon_name("conduit")
 
 class StatusIcon(gtk.StatusIcon):

Added: trunk/data/COPYING
==============================================================================
--- (empty file)
+++ trunk/data/COPYING	Mon Feb 18 21:26:14 2008
@@ -0,0 +1,7 @@
+The Conduit icons in data/icons/hicolor/ are derived from the Tango Project [1] 
+and are licensed under the cc-by-sa 2.5 license [2].
+
+The Conduit application icon was contributed by mejogid.
+
+[1] http://tango.freedesktop.org
+[2] http://creativecommons.org/licenses/by-sa/2.5/

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Feb 18 21:26:14 2008
@@ -94,6 +94,7 @@
 	$(pkgconfig_in_files) \
 	$(dbusservice_in_files) \
 	conduit.desktop.in.in \
-	conduit-autostart.desktop.in.in
+	conduit-autostart.desktop.in.in \
+	COPYING
 	
 CLEANFILES = conduit.desktop org.conduit.service