Resync to joyride; pick up Amharic fixes and latest sugar snapshot.

19 files changed, 47 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 1cf571f..30dce9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6250,6 +6250,14 @@ libX11-1.1.4-2.olpc3.src.rpm
   -- Sayamindu Dasgupta <sayamindu@gmail.com> Sun, Aug  3 2008 19:01:10 +0530
 
 
+libX11-1.1.4-3.olpc3.i386.rpm
+libX11-1.1.4-3.olpc3.src.rpm
+
+  * More fixes to the Amharic Compose table (The US English keyboard works)
+
+  -- Sayamindu Dasgupta <sayamindu@gmail.com> Sat, Aug 23 2008 02:42:14 +0530
+
+
 libabiword-2.6.0.svn20071127-2.i386.rpm
 libabiword-2.6.0.svn20071127-2.src.rpm
 
@@ -7125,6 +7133,19 @@ sugar-0.81.7-1.fc9.i386.rpm
   -- Tomeu Vizoso <tomeu@tomeuvizoso.net> Wed, Jul 23 2008
 
 
+sugar-0.82.0-2.20080822git454def195d.fc9.i386.rpm
+sugar-0.82.0-2.20080822git454def195d.fc9.src.rpm
+sugar-debuginfo-0.82.0-2.20080822git454def195d.fc9.i386.rpm
+sugar-emulator-0.82.0-2.20080822git454def195d.fc9.i386.rpm
+sugar-toolkit-0.82.1-2.20080822git2e6be9ea55.fc9.i386.rpm
+sugar-toolkit-0.82.1-2.20080822git2e6be9ea55.fc9.src.rpm
+sugar-toolkit-debuginfo-0.82.1-2.20080822git2e6be9ea55.fc9.i386.rpm
+
+  * Manually pull sugar 0.82.1 snapshots into joyride.
+
+  -- C. Scott Ananian <cscott@laptop.org>  Sat, 23 Aug 2008 08:32:00 -0400
+
+
 sugar-datastore-0.7.2-2.olpc2.src.rpm
 sugar-datastore-0.7.2-2.olpc2.noarch.rpm
 rainbow-0.7.5.11.20080104git6c25f7-1.olpc2.noarch.rpm
@@ -7298,6 +7319,14 @@ watch-listen-realmedia-14.xo
   -- Peter Krenesky <peter@osuosl.org> Wed, 9 Jul 2008
 
 
+xkeyboard-config-1.3-3.olpc3.noarch.rpm
+xkeyboard-config-1.3-3.olpc3.src.rpm
+
+  * Fixes to the Amharic symbol file (#7474)
+
+  -- Sayamindu Dasgupta <sayamindu@gmail.com> Sat, Aug 23 2008 02:45:18 +0530
+
+
 xorg-x11-drv-geode-2.10.1-1.olpc3.i386.rpm
 
  * Upstream bugfix release
diff --git a/RPMS/libX11-1.1.4-3.olpc3.i386.rpm b/RPMS/libX11-1.1.4-3.olpc3.i386.rpm
new file mode 100644
index 0000000..b8bf53f
--- /dev/null
+++ b/RPMS/libX11-1.1.4-3.olpc3.i386.rpm
diff --git a/RPMS/sugar-0.82.0-2.20080822git454def195d.fc9.i386.rpm b/RPMS/sugar-0.82.0-2.20080822git454def195d.fc9.i386.rpm
new file mode 100644
index 0000000..f6c4a64
--- /dev/null
+++ b/RPMS/sugar-0.82.0-2.20080822git454def195d.fc9.i386.rpm
diff --git a/RPMS/sugar-debuginfo-0.82.0-2.20080822git454def195d.fc9.i386.rpm b/RPMS/sugar-debuginfo-0.82.0-2.20080822git454def195d.fc9.i386.rpm
new file mode 100644
index 0000000..e265a95
--- /dev/null
+++ b/RPMS/sugar-debuginfo-0.82.0-2.20080822git454def195d.fc9.i386.rpm
diff --git a/RPMS/sugar-emulator-0.82.0-2.20080822git454def195d.fc9.i386.rpm b/RPMS/sugar-emulator-0.82.0-2.20080822git454def195d.fc9.i386.rpm
new file mode 100644
index 0000000..e3c93d9
--- /dev/null
+++ b/RPMS/sugar-emulator-0.82.0-2.20080822git454def195d.fc9.i386.rpm
diff --git a/RPMS/sugar-toolkit-0.82.1-2.20080822git2e6be9ea55.fc9.i386.rpm b/RPMS/sugar-toolkit-0.82.1-2.20080822git2e6be9ea55.fc9.i386.rpm
new file mode 100644
index 0000000..828d152
--- /dev/null
+++ b/RPMS/sugar-toolkit-0.82.1-2.20080822git2e6be9ea55.fc9.i386.rpm
diff --git a/RPMS/sugar-toolkit-debuginfo-0.82.1-2.20080822git2e6be9ea55.fc9.i386.rpm b/RPMS/sugar-toolkit-debuginfo-0.82.1-2.20080822git2e6be9ea55.fc9.i386.rpm
new file mode 100644
index 0000000..555ac0d
--- /dev/null
+++ b/RPMS/sugar-toolkit-debuginfo-0.82.1-2.20080822git2e6be9ea55.fc9.i386.rpm
diff --git a/RPMS/xkeyboard-config-1.3-3.olpc3.noarch.rpm b/RPMS/xkeyboard-config-1.3-3.olpc3.noarch.rpm
new file mode 100644
index 0000000..b3003e8
--- /dev/null
+++ b/RPMS/xkeyboard-config-1.3-3.olpc3.noarch.rpm
diff --git a/SRPMS/libX11-1.1.4-3.olpc3.src.rpm b/SRPMS/libX11-1.1.4-3.olpc3.src.rpm
new file mode 100644
index 0000000..3c182ec
--- /dev/null
+++ b/SRPMS/libX11-1.1.4-3.olpc3.src.rpm
diff --git a/SRPMS/sugar-0.82.0-2.20080822git454def195d.fc9.src.rpm b/SRPMS/sugar-0.82.0-2.20080822git454def195d.fc9.src.rpm
new file mode 100644
index 0000000..4d13e5f
--- /dev/null
+++ b/SRPMS/sugar-0.82.0-2.20080822git454def195d.fc9.src.rpm
diff --git a/SRPMS/sugar-toolkit-0.82.1-2.20080822git2e6be9ea55.fc9.src.rpm b/SRPMS/sugar-toolkit-0.82.1-2.20080822git2e6be9ea55.fc9.src.rpm
new file mode 100644
index 0000000..b1f7cc3
--- /dev/null
+++ b/SRPMS/sugar-toolkit-0.82.1-2.20080822git2e6be9ea55.fc9.src.rpm
diff --git a/SRPMS/xkeyboard-config-1.3-3.olpc3.src.rpm b/SRPMS/xkeyboard-config-1.3-3.olpc3.src.rpm
new file mode 100644
index 0000000..8d23ab5
--- /dev/null
+++ b/SRPMS/xkeyboard-config-1.3-3.olpc3.src.rpm
diff --git a/repodata/filelists.sqlite.bz2 b/repodata/filelists.sqlite.bz2
index d92c8c6..8050fa4 100644
--- a/repodata/filelists.sqlite.bz2
+++ b/repodata/filelists.sqlite.bz2
diff --git a/repodata/filelists.xml.gz b/repodata/filelists.xml.gz
index 289d6f9..6bf6c75 100644
--- a/repodata/filelists.xml.gz
+++ b/repodata/filelists.xml.gz
diff --git a/repodata/other.sqlite.bz2 b/repodata/other.sqlite.bz2
index 673e7af..5a7fba9 100644
--- a/repodata/other.sqlite.bz2
+++ b/repodata/other.sqlite.bz2
diff --git a/repodata/other.xml.gz b/repodata/other.xml.gz
index 6205f41..efc9938 100644
--- a/repodata/other.xml.gz
+++ b/repodata/other.xml.gz
diff --git a/repodata/primary.sqlite.bz2 b/repodata/primary.sqlite.bz2
index fb1fa00..6608020 100644
--- a/repodata/primary.sqlite.bz2
+++ b/repodata/primary.sqlite.bz2
diff --git a/repodata/primary.xml.gz b/repodata/primary.xml.gz
index d64047b..6aadd2a 100644
--- a/repodata/primary.xml.gz
+++ b/repodata/primary.xml.gz
diff --git a/repodata/repomd.xml b/repodata/repomd.xml
index a474cb3..ba9b8b0 100644
--- a/repodata/repomd.xml
+++ b/repodata/repomd.xml
@@ -2,41 +2,41 @@
 <repomd xmlns="http://linux.duke.edu/metadata/repo">
   <data type="other_db">
     <location href="repodata/other.sqlite.bz2"/>
-    <checksum type="sha">cf1eb69bffb17ce7215f6aa97df6cb0d02300af9</checksum>
-    <timestamp>1219433245</timestamp>
-    <open-checksum type="sha">e21ed03bb1cc8e8b81230a74c42dc9a7b43640b5</open-checksum>
+    <checksum type="sha">bb57ff749b783f3ed2cdaa1dbb813f7ed9bf3f7a</checksum>
+    <timestamp>1219493756</timestamp>
+    <open-checksum type="sha">b9a8b44463a7433a202d64736a88f9ba5a3a5ef4</open-checksum>
     <database_version>10</database_version>
   </data>
   <data type="other">
     <location href="repodata/other.xml.gz"/>
-    <checksum type="sha">a2f4c552e41fffecd0ee18672642954fc1dc2682</checksum>
-    <timestamp>1219433241</timestamp>
-    <open-checksum type="sha">fab559142f135fd2cf798bc24c116eb3755cca6e</open-checksum>
+    <checksum type="sha">3647cacf51a3eb23c1c32b25773a113050638d43</checksum>
+    <timestamp>1219493752</timestamp>
+    <open-checksum type="sha">6b8b14ba45bd9bc421653e6f394c907bdc11cfd1</open-checksum>
   </data>
   <data type="filelists_db">
     <location href="repodata/filelists.sqlite.bz2"/>
-    <checksum type="sha">9b101ad5b488baa0af5539c351b9875615b12370</checksum>
-    <timestamp>1219433247</timestamp>
-    <open-checksum type="sha">803a0721085c3dd08eb30e416e3a6b9fb6d35e1b</open-checksum>
+    <checksum type="sha">708e6ccf6819516fe841b48ff5f54dc632f673e2</checksum>
+    <timestamp>1219493758</timestamp>
+    <open-checksum type="sha">d73ccd6354aedee6639ee36263fc78abe82f377b</open-checksum>
     <database_version>10</database_version>
   </data>
   <data type="filelists">
     <location href="repodata/filelists.xml.gz"/>
-    <checksum type="sha">9c5537e1ac2f7f36201adab39a09af5b13c906cf</checksum>
-    <timestamp>1219433241</timestamp>
-    <open-checksum type="sha">cff7e161530181025b2357cf4ca2ac21705856a6</open-checksum>
+    <checksum type="sha">a68f962ba83751924019ff0a2a5f8e3d8b863a43</checksum>
+    <timestamp>1219493752</timestamp>
+    <open-checksum type="sha">763e5c00ef4ee28ceef89fc1ea846566f0a1716a</open-checksum>
   </data>
   <data type="primary_db">
     <location href="repodata/primary.sqlite.bz2"/>
-    <checksum type="sha">0df4d4d41e64bc673c103e6db3c080d094351d6e</checksum>
-    <timestamp>1219433248</timestamp>
-    <open-checksum type="sha">b6c257937e2042c76964378642008e041285397e</open-checksum>
+    <checksum type="sha">92b0a594ffaa5b7af89ce45dd2a84249f56d06ea</checksum>
+    <timestamp>1219493760</timestamp>
+    <open-checksum type="sha">00053fd1d72f36723a6c9441fc4a20c9bda775c8</open-checksum>
     <database_version>10</database_version>
   </data>
   <data type="primary">
     <location href="repodata/primary.xml.gz"/>
-    <checksum type="sha">eb7c8b4f078d18cd78d32308f2ba4abbf492f992</checksum>
-    <timestamp>1219433241</timestamp>
-    <open-checksum type="sha">a584b204c3877c0048a50fce67931594299f92ec</open-checksum>
+    <checksum type="sha">563cdc29ec6bfc0322ff42f0aefe6836005eeb77</checksum>
+    <timestamp>1219493752</timestamp>
+    <open-checksum type="sha">f2f1a3a3f68e6eae23f1706e31b4e05337e459e3</open-checksum>
   </data>
 </repomd>