From 2242ea0a5b437842276cba36b1e30a7668d5b661 Mon Sep 17 00:00:00 2001
From: Alexandre Antonino Gonçalves Martinazzo <alexandremartinazzo@gmail.com>
Date: Thu, 23 Aug 2007 22:41:57 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/oficina

Conflicts:

	NEWS
---
diff --git a/NEWS b/NEWS
index 822acdbc..9aacd25 100644
--- a/NEWS
+++ b/NEWS
@@ -1,45 +1,50 @@
-5
-===
-Added 'Clear' button (alexandre)
-Modifications on selection and gelection bounds (pekayatt)
-Added rainbow effect (andremossinato)
-Side number for regular polygon can be choosen (alexandre)
-New shape available: Heart (andremossinato)
+7
+
+* Build as Paint not oficina
+* Clean up NEWS file - please use setup.py release to do releases
+
+6
+
+* Added 'Clear' button (alexandre)
+* Modifications on selection and gelection bounds (pekayatt)
+* Added rainbow effect (andremossinato)
+* Side number for regular polygon can be choosen (alexandre)
+* New shape available: Heart (andremossinato)
 
 4
-===
-Now paste and copy are integrated to Sugar (pekayatt)
-Colors now are choosen from a ColorButton. Selected color is shown, not its name (alexandre)
-Adjust in Undo/Redo functions, now we have a limit (on 10 times) (pekayatt)
-New past and copy funcions, improvements on selection func (pekayatt)
-Fixed bug with pixmap_temp
-New FILL fuction, linked to C module (pekayatt)
-Color list in Area.py is not used anymore. Toolbox.py now passes a gdk.Color (nathalia.sautchuk, alexandre)
-Fixed Cursors errors (nathalia.sautchuk)
-Fixed Image load bug, now enableUndo is working with it (pekayatt)
-Added COPYING (alexandre)
-Fixed bug that corrupted colors in toolbox.py (alexandre)
-Adding file header and cleaning unused files (nathalia.sautchuk)
-Tools assigned by string instead of numbers (nathalia.sautchuk)
-Changing and Adding new colors (nathalia.sautchuk)
-ToolsToolbar now keeps color and size when user chooses different tools (alexandre)
-Adding new cursors (nathalia.sautchuk)
-New selection, the selectionbox remains (pekayatt)
-Fixed line size (nathalia.sautchuk, alexandre)
-Implemented Eraser shapes (nathalia.sautchuk)
-Fixed undo bugs and new selection function (pekayatt)
-Trapezoid and triangle functions added, minor changes on fill function, bug on fuction undo solved (andre)
-Fill function changed (alexandre)
+
+* Now paste and copy are integrated to Sugar (pekayatt)
+* Colors now are choosen from a ColorButton. Selected color is shown, not its name (alexandre)
+* Adjust in Undo/Redo functions, now we have a limit (on 10 times) (pekayatt)
+* New past and copy funcions, improvements on selection func (pekayatt)
+* Fixed bug with pixmap_temp
+* New FILL fuction, linked to C module (pekayatt)
+* Color list in Area.py is not used anymore. Toolbox.py now passes a gdk.Color (nathalia.sautchuk, alexandre)
+* Fixed Cursors errors (nathalia.sautchuk)
+* Fixed Image load bug, now enableUndo is working with it (pekayatt)
+* Added COPYING (alexandre)
+* Fixed bug that corrupted colors in toolbox.py (alexandre)
+* Adding file header and cleaning unused files (nathalia.sautchuk)
+* Tools assigned by string instead of numbers (nathalia.sautchuk)
+* Changing and Adding new colors (nathalia.sautchuk)
+* ToolsToolbar now keeps color and size when user chooses different tools (alexandre)
+* Adding new cursors (nathalia.sautchuk)
+* New selection, the selectionbox remains (pekayatt)
+* Fixed line size (nathalia.sautchuk, alexandre)
+* Implemented Eraser shapes (nathalia.sautchuk)
+* Fixed undo bugs and new selection function (pekayatt)
+* Trapezoid and triangle functions added, minor changes on fill function, bug on fuction undo solved (andre)
+* Fill function changed (alexandre)
 
 3
-===
-Addition of a new SVG Icon with fixes to some bugs. Project name changed from Oficina to Paint
+
+* Addition of a new SVG Icon with fixes to some bugs. Project name changed from Oficina to Paint
 
 2
-===
-Make it work with python setup.py: John Palmeiri and Manusheel Gupta
+
+* Make it work with python setup.py: John (J5) Palmieri and Manusheel Gupta
 
 1
-===
-First Sugar Version: joyce, andremossinato, pekayatt, barbolo, nathalia.sautchuk, alexandre from LSI Research Group, University of São Paulo, Brazil with manusheel gupta(manu@laptop.org) and Eben Eliason(eben@laptop.org)from OLPC, Cambridge
+
+* First Sugar Version: joyce, andremossinato, pekayatt, barbolo, nathalia.sautchuk, alexandre from LSI Research Group, University of São Paulo, Brazil with manusheel gupta(manu@laptop.org) and Eben Eliason(eben@laptop.org)from OLPC, Cambridge
 
diff --git a/activity/activity.info b/activity/activity.info
index 0d73cf1..39bf286 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Paint
-activity_version = 5
+activity_version = 7
 service_name = org.laptop.Oficina
 icon = activity-rgbpaint
 class = OficinaActivity.OficinaActivity
diff --git a/setup.py b/setup.py
index c273089..3b9166d 100755
--- a/setup.py
+++ b/setup.py
@@ -18,5 +18,5 @@
 
 from sugar.activity import bundlebuilder
 
-bundlebuilder.start('oficina')
+bundlebuilder.start('Paint')
 
--
cgit v0.9.1