Bump sugar and include feedback hackdextrose-2

* Disable feedback feature from sending personal info in manually
  submitted personalized reports.
* Bump sugar version

Signed-off-by: Anish Mangal <anish@sugarlabs.org>

6 files changed, 11 insertions, 8 deletions

diff --git a/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch b/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch
index d7e71d1..7ac6d6b 100644
--- a/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch
+++ b/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch
@@ -988,8 +988,8 @@ index 16a132f..e212337 100644
 +msgstr "Enviar anónimamente"
 +
 +#: ../extensions/deviceicon/feedback.py:115
-+msgid "Submit feedback with contact infromation"
-+msgstr "Enviar comentarios con información de contacto"
++msgid "Submit feedback"
++msgstr "Enviar comentarios"
 +
 +#: ../extensions/deviceicon/feedback.py:120
 +msgid "Submit"
diff --git a/rpms/sugar/sugar-1-2-Two-kinds-of-feedback-submits.patch b/rpms/sugar/sugar-1-2-Two-kinds-of-feedback-submits.patch
index 34ce5f9..5c74f3d 100644
--- a/rpms/sugar/sugar-1-2-Two-kinds-of-feedback-submits.patch
+++ b/rpms/sugar/sugar-1-2-Two-kinds-of-feedback-submits.patch
@@ -188,7 +188,7 @@ index 2a0075e..add633c 100644
 +
 +        self._add_separator(False)
 +
-+        title = gtk.Label(_('Submit feedback with contact infromation'))
++        title = gtk.Label(_('Submit feedback'))
 +        self._add_widget(title)
 +
 +        self._add_separator(True)
diff --git a/rpms/sugar/sugar-2-2-Initial-client-implementation-for-feedback-feature.patch b/rpms/sugar/sugar-2-2-Initial-client-implementation-for-feedback-feature.patch
index f09ce0e..59ac34e 100644
--- a/rpms/sugar/sugar-2-2-Initial-client-implementation-for-feedback-feature.patch
+++ b/rpms/sugar/sugar-2-2-Initial-client-implementation-for-feedback-feature.patch
@@ -201,8 +201,8 @@ index 0000000..c0deae2
 +    nick = client.get_string("/desktop/sugar/user/nick")
 +
 +    data = {'message': message,
-+            'serial_number': misc.get_xo_serial(),
-+            'nick': nick,
++            'serial_number': '',
++            'nick': '',
 +            'jabber_server': jabber,
 +            }
 +    _submit(data)
diff --git a/rpms/sugar/sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch b/rpms/sugar/sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch
index 78c6297..7f1546f 100644
--- a/rpms/sugar/sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch
+++ b/rpms/sugar/sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch
@@ -30,7 +30,7 @@ index 43540a0..3f3b9a8 100644
  
  def update(bundle_id, report, log_file):
 @@ -88,27 +89,28 @@ def submit(message):
-             'nick': nick,
+             'nick': '',
              'jabber_server': jabber,
              }
 -    _submit(data, False)
diff --git a/rpms/sugar/sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch b/rpms/sugar/sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch
index eb93ccf..2ea8aac 100644
--- a/rpms/sugar/sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch
+++ b/rpms/sugar/sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch
@@ -43,7 +43,7 @@ index 4671437..43540a0 100644
  
  def update(bundle_id, report, log_file):
 @@ -86,24 +88,26 @@ def submit(message):
-             'nick': nick,
+             'nick': '',
              'jabber_server': jabber,
              }
 -    _submit(data)
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index efa977c..6552106 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -3,7 +3,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.88.1
-Release: 5.60dxo%{?dist}
+Release: 5.61dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -484,6 +484,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Fri Apr  1 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.61
+- XXX Do not send s.no. or nick with personalized submits
+
 * Thu Mar 17 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.60
 - XXX Copy bundle to removable device (hack by tch)