Bundle cleanup, new icon from Loser.

7 files changed, 167 insertions, 64 deletions

diff --git a/MANIFEST b/MANIFEST
index e996963..9f9da5c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,9 +1,12 @@
-NEWS
 COPYING
+TODO
+xorg-dcon.conf
 colors.py
 colorsc.py
 _colorsc.so
 setup.py
+src/build.sh
+src/deploy.sh
 src/gtk_types.h
 src/canvas.h
 src/setup.py
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 19d8b05..0000000
--- a/NEWS
+++ /dev/null
@@ -1,28 +0,0 @@
-9
-
-8
-
-7
-
-6
-
-5
-
-Colors-4
-
-* New toolbar icons.
-
-Colors-3
-
-* Add icons & descriptions to samples.
-* Fix various bugs.
-
-Colors-2
-
-* Fixed palette display.
-* Fixed Journal integration.
-
-Colors-1
-
-* Initial release.  Most features basically work, but there are bugs, usability and 
-memory issues.
diff --git a/activity/Activity-colors.svg b/activity/Activity-colors.svg
new file mode 100644
index 0000000..d276ef4
--- /dev/null
+++ b/activity/Activity-colors.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"[

+     <!ENTITY stroke_color "#000000">

+     <!ENTITY fill_color "#FFFFFF">

+ ]>

+<svg version="1.1" id="Colors" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">

+<path id="Paint" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" d="M30.814,32.609c1.34,1.188,6.019,5.182,5.269,7.349

+	S32,50.438,38.5,50.438s2.282-10.293,2.465-10.539c0.794-1.069,7.405-2.266,6.785-7.586c-0.3-2.578-3.973-6.417-9.5-10.813

+	c-0.299-0.238,4.834-1.417,7.584-5.5c3.291-5.125,1.416-11.813,1.416-11.188c-0.083,2.021-5.583,2.521-8.625,5.813

+	c-2.917,2.583-4.014,7.894-4.286,7.696c-7.748-5.597-16.93-10.485-21.984-10.482c0,0-4.26,5.072,2.38,6.281

+	c1.89,0.463-3.091,6.673-1.36,7.567s5.692,1.959,10.123,5.124"/>

+<path id="Brush" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" stroke-linejoin="round" d="M38.25,21.5

+	c0,0-3.666,4.917-5.333,6.917c-3.75,5.75-24.141,22.271-25.779,20.927C5.5,48,21.297,28.574,26.859,24.425

+	c1.854-1.649,7.48-6.104,7.48-6.104L38.25,21.5z"/>

+</svg>

diff --git a/activity/Colors-activity.svg b/activity/Colors-activity.svg
deleted file mode 100644
index 2aa7936..0000000
--- a/activity/Colors-activity.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->

-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [

-    <!ENTITY ns_svg "http://www.w3.org/2000/svg">

-    <!ENTITY ns_xlink " http://www.w3.org/1999/xlink">

-    <!ENTITY stroke_color "#000000">

-    <!ENTITY fill_color "#FFFFFF">

-]>

-<svg version="1.1" id="Colors" xmlns:svg="http://www.w3.org/2000/svg"

-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="45px" height="45px"

-	 viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve">

-<path id="Paint" style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.5;stroke-linejoin:round;" d="M18.875,21.875

-	c0.75,0.5,9.5-8.375,9.5-8.375l4.25,3.5c0,0-7.5,9.75-7.125,10.125c1.214,1.078,1.793,1.652,2.864,2.797

-	c0.536,0.572,2.928,2.76,2.147,3.904c-0.779,1.143-2.519,6.272-1.185,7.69c1.688,2.185,4.663,2.315,6.015-0.018

-	c1.396-1.567-1.006-7.285-0.646-7.771c0.719-0.971,2.211-1.461,3.572-2.144c1.36-0.683,2.592-1.56,2.789-3.302

-	c0.195-3.092-2.744-5.776-7.342-9.987c-4.597-4.21,0.504-0.321-5.851-5.083c-6.353-4.762-13.64-8.518-19.08-8.518

-	c0,0-3.859,4.594,2.156,5.688c1.375,1.963-3.861,7.063-0.594,7.063C11.818,17.448,14.863,19.01,18.875,21.875z"/>

-<path id="Brush_1_" style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.5;stroke-linejoin:round;" d="M4.058,42.281

-	c-1.605-3.517,12.824-18.809,17.861-22.566c1.679-1.494,7.304-6.475,7.304-6.475s0.807-3.884,3.578-6.47

-	c3.709-3.46,5.655-1.625,7.729-4.974c0,0,0.688,2.771,0.457,3.74c-0.236,0.991-1.226,5.307-1.896,6.539

-	c-1.738,3.217-6.662,4.476-6.662,4.476s-3.319,4.9-4.338,6.127C23.092,30.735,4.088,43.024,4.058,42.281z M27.842,13.052

-	c1.018,0.939,4.31,3.213,4.875,3.856"/>

-</svg>

diff --git a/activity/activity.info b/activity/activity.info
index f3e9607..8417fd1 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,5 +3,5 @@ name = Colors!
 activity_version = 9
 host_version = 1
 service_name = org.laptop.community.Colors
-icon = Colors-activity
+icon = Activity-colors
 exec = sugar-activity colors.Colors
diff --git a/colors.changes b/colors.changes
deleted file mode 100644
index 3f6c3b0..0000000
--- a/colors.changes
+++ /dev/null
@@ -1,11 +0,0 @@
-Colors-4.xo
-
-  * New toolbar icons.
-
-  -- Wade Brainerd <wadetb@gmail.com>  May 8th, 2008
-
-Colors-3.xo
-
-  * Initial push of Colors!.
-
-  -- Wade Brainerd <wadetb@gmail.com>  March 25th, 2008
diff --git a/xorg-dcon.conf b/xorg-dcon.conf
new file mode 100644
index 0000000..eb2a9e4
--- /dev/null
+++ b/xorg-dcon.conf
@@ -0,0 +1,145 @@
+# Xorg configuration file for OLPC
+
+Section "ServerLayout"
+	Identifier     "Default Layout"
+	Screen      0  "Screen0" 0 0
+    InputDevice "Wacom Tablet" "SendCoreEvents"
+    InputDevice "Wacom Pen" "SendCoreEvents"
+    InputDevice "Wacom Eraser" "SendCoreEvents"
+    InputDevice "Wacom Mouse" "SendCoreEvents"
+EndSection
+
+#Section "ServerFlags"
+	#Option "AllowEmptyInput" "yes"
+#EndSection
+
+Section "Module"
+	SubSection "extmod"
+		Option "omit XFree86-DGA"
+		#Option "omit XFree86-Misc" # needed by 'xset m'
+		Option "omit MIT-SUNDRY-NONSTANDARD"
+		Option "omit TOG-CUP"
+		Option "omit Extended-Visual-Information"
+	EndSubSection
+	Load  "freetype"
+	Load  "evdev"
+	# Load "record" # Mostly a debugging tool
+EndSection
+
+Section "Extensions"
+	Option  "XTEST" "Disable" # Mostly a debugging tool
+	#Option  "SECURITY" "Disable" # CRASH!
+	Option  "XC-APPGROUP" "Disable"
+	Option  "XINERAMA" "Disable"
+EndSection
+
+Section "Monitor"
+	Identifier  "Monitor0"
+	HorizSync   30-67
+	VertRefresh 48-52 
+	DisplaySize 152 114
+	Mode "1200x900"
+		DotClock 57.275
+		HTimings 1200 1208 1216 1240
+		VTimings 900 905 908 912
+		Flags    "-HSync" "-VSync"
+	EndMode
+EndSection
+
+Section "Device"
+	Identifier  "Videocard0"
+	Driver      "amd"
+	VendorName  "Advanced Micro Devices, Inc."
+	BoardName   "AMD Geode GX/LX"
+
+	Option     "AccelMethod" "EXA"
+	Option     "NoCompression" "true"
+	Option     "PanelGeometry" "1200x900"
+EndSection
+
+Section "Screen"
+	Identifier "Screen0"
+	Device     "Videocard0"
+	Monitor    "Monitor0"
+	DefaultDepth 16
+	SubSection "Display"
+		Depth   16
+		Modes   "1200x900"
+	EndSubSection
+EndSection
+Section "InputDevice"
+        Identifier "fake"
+        Driver     "void"
+EndSection
+
+Section "InputDevice"
+        Identifier "ATKbd"
+        Driver     "evdev"
+
+        Option  "Name"  "AT Translated Set 2 keyboard"
+        Option  "evBits"    "+1"
+        Option  "keyBits"   "~1-255 ~352-511"
+        Option  "Pass"      "2"
+EndSection
+Section "InputDevice"
+        Identifier "Keyboard"
+        Driver     "evdev"
+
+        Option  "evBits"    "+1"
+        Option  "keyBits"   "~1-115 ~117-255"
+        Option  "Pass"      "3"
+EndSection
+
+Section "InputDevice"
+        Identifier "Mouse"
+        Driver     "evdev"
+
+        Option  "evBits"    "+1-2"
+        Option  "keyBits"   "~272-287"
+        Option  "Pass"      "3"
+EndSection
+Section "InputDevice"
+        Identifier "GS"
+        Driver     "evdev"
+
+        Option  "Name" "OLPC ALPS GlideSensor"
+        Option  "evBits"    "+1 +3"
+        Option  "keyBits"   "~272-287"
+        Option  "absBits"   "~0-2 ~24"
+        Option  "Pass"      "2"
+        Option  "Mode"      "Relative"
+EndSection
+
+Section "InputDevice"
+        Driver "wacom"
+		Identifier "Wacom Pen"
+		Option "Device" "/dev/input/wacom"
+		Option "Type" "stylus"
+		Option "USB" "on"
+		Option "PressCurve" "0,0,100,100"
+EndSection
+Section "InputDevice"
+        Driver "wacom"
+		Identifier "Wacom Eraser"
+		Option "Device" "/dev/input/wacom"
+		Option "Type" "eraser"
+		Option "USB" "on"
+EndSection
+Section "InputDevice"
+        Driver "wacom"
+		Identifier "Wacom Mouse"
+		Option "Device" "/dev/input/wacom"
+		Option "Type" "cursor"
+		Option "Mode" "relative"
+		Option "USB" "on"
+EndSection
+Section "InputDevice"
+        Driver "wacom"
+		Identifier "Wacom Tablet"
+		Option "Device" "/dev/input/wacom"
+		Option "Type" "pad"
+		Option "ButtonsOnly" "on"
+		Option "Button9" "2"
+		Option "Button10" "3"
+		Option "USB" "on"
+EndSection