beagle r4707 - in trunk/beagle/Util/F-Spot: . upstream-changes

[dbera svn gnome org]

Author: dbera
Date: Sun Apr 13 21:34:58 2008
New Revision: 4707
URL: http://svn.gnome.org/viewvc/beagle?rev=4707&view=rev

Log:
Merge svn r3993.


Added:
   trunk/beagle/Util/F-Spot/upstream-changes/11-add-cc-namespace.diff
Modified:
   trunk/beagle/Util/F-Spot/MetadataStore.cs

Modified: trunk/beagle/Util/F-Spot/MetadataStore.cs
==============================================================================
--- trunk/beagle/Util/F-Spot/MetadataStore.cs	(original)
+++ trunk/beagle/Util/F-Spot/MetadataStore.cs	Sun Apr 13 21:34:58 2008
@@ -170,6 +170,7 @@
 		public const string RdfsNS = "http://www.w3.org/2000/01/rdf-schema#";;
 		public const string IViewNS = "http://ns.iview-multimedia.com/mediapro/1.0/";;
 		public const string XmlNS = "http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/";;
+		public const string CcNS = "http://creativecommons.org/ns#";;
 
 		// FIXME this needs to be parsable by System.Uri
 		public const string FSpotXMPBase = "http://fakebase.f-spot.org/internal/";;
@@ -191,6 +192,7 @@
 			Namespaces.AddNamespace (RdfNS, "rdf");
 			Namespaces.AddNamespace (RdfsNS, "rdfs");
 			Namespaces.AddNamespace (IViewNS, "mediapro");
+			Namespaces.AddNamespace (CcNS, "cc");
 		}
 
 		public static MetadataStore Descriptions {

Added: trunk/beagle/Util/F-Spot/upstream-changes/11-add-cc-namespace.diff
==============================================================================
--- (empty file)
+++ trunk/beagle/Util/F-Spot/upstream-changes/11-add-cc-namespace.diff	Sun Apr 13 21:34:58 2008
@@ -0,0 +1,24 @@
+Add namespace for creative commong license.
+
+Patch from Jason Kivlighn.
+
+Index: MetadataStore.cs
+===================================================================
+--- MetadataStore.cs	(revision 4696)
++++ MetadataStore.cs	(working copy)
+@@ -170,6 +170,7 @@
+ 		public const string RdfsNS = "http://www.w3.org/2000/01/rdf-schema#";;
+ 		public const string IViewNS = "http://ns.iview-multimedia.com/mediapro/1.0/";;
+ 		public const string XmlNS = "http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/";;
++		public const string CcNS = "http://creativecommons.org/ns#";;
+ 
+ 		// FIXME this needs to be parsable by System.Uri
+ 		public const string FSpotXMPBase = "http://fakebase.f-spot.org/internal/";;
+@@ -191,6 +192,7 @@
+ 			Namespaces.AddNamespace (RdfNS, "rdf");
+ 			Namespaces.AddNamespace (RdfsNS, "rdfs");
+ 			Namespaces.AddNamespace (IViewNS, "mediapro");
++			Namespaces.AddNamespace (CcNS, "cc");
+ 		}
+ 
+ 		public static MetadataStore Descriptions {