--- sugar-pollbuilder-activity-17.orig/debian/rules
+++ sugar-pollbuilder-activity-17/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+  
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
--- sugar-pollbuilder-activity-17.orig/debian/install
+++ sugar-pollbuilder-activity-17/debian/install
@@ -0,0 +1 @@
+Poll.activity /usr/share/sugar/activities
--- sugar-pollbuilder-activity-17.orig/debian/copyright
+++ sugar-pollbuilder-activity-17/debian/copyright
@@ -0,0 +1,31 @@
+This package was debianized by Jani Monoses <jani@ubuntu.com> on
+Mon, 10 Sep 2007 23:13:09 +0200.
+
+It was downloaded from git://dev.laptop.org/ 
+
+Upstream Author: Morgan Collett <morgan.collett@gmail.com>
+
+Copyright: 2007 World Wide Workshop Foundation
+	   2007 Collabora, Ltd.
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2007, Jani Monoses <jani@ubuntu.com> and
+is licensed under the GPL, see above.
--- sugar-pollbuilder-activity-17.orig/debian/compat
+++ sugar-pollbuilder-activity-17/debian/compat
@@ -0,0 +1 @@
+5
--- sugar-pollbuilder-activity-17.orig/debian/control
+++ sugar-pollbuilder-activity-17/debian/control
@@ -0,0 +1,13 @@
+Source: sugar-pollbuilder-activity
+Section: universe/x11
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jani Monoses <jani@ubuntu.com>
+Build-Depends: cdbs, debhelper (>= 5)
+Standards-Version: 3.7.2
+
+Package: sugar-pollbuilder-activity
+Architecture: all
+Depends: sugar
+Description: poll activity on the XO laptop
+ Poll building activity used in the Sugar interface on the XO laptop
--- sugar-pollbuilder-activity-17.orig/debian/changelog
+++ sugar-pollbuilder-activity-17/debian/changelog
@@ -0,0 +1,19 @@
+sugar-pollbuilder-activity (17-0ubuntu3) maverick; urgency=low
+
+  * Install activity folder in proper directory. (LP: #601219)
+
+ -- Luke Faraone <luke@faraone.cc>  Sat, 03 Jul 2010 17:35:18 -0700
+
+sugar-pollbuilder-activity (17-0ubuntu2) intrepid; urgency=low
+
+  * Patch to fix two issues (LP: #283279)
+    - remove python-abiword dependency (LP: #283254)
+    - remove failing LanguageComboBox (LP: #283269)
+
+ -- Morgan Collett <morgan@ubuntu.com>  Tue, 14 Oct 2008 16:43:47 +0200
+
+sugar-pollbuilder-activity (17-0ubuntu1) hardy; urgency=low
+
+  * Initial upload to Ubuntu 
+
+ -- Jani Monoses <jani@ubuntu.com>  Wed, 13 Feb 2008 12:44:00 +0200
--- sugar-pollbuilder-activity-17.orig/debian/patches/0001_remove_abiword_langcombo.patch
+++ sugar-pollbuilder-activity-17/debian/patches/0001_remove_abiword_langcombo.patch
@@ -0,0 +1,46 @@
+diff --git a/poll.py b/poll.py
+index 170f5e9..61edcd5 100644
+diff -Nur -x '*.orig' -x '*~' sugar-pollbuilder-activity-17/Poll.activity/poll.py sugar-pollbuilder-activity-17.new/Poll.activity/poll.py
+--- sugar-pollbuilder-activity-17/Poll.activity/poll.py	2008-01-16 10:53:38.000000000 +0200
++++ sugar-pollbuilder-activity-17.new/Poll.activity/poll.py	2008-10-14 16:52:19.000000000 +0200
+@@ -49,7 +49,7 @@
+ except:
+     pass  # FIXME remove this once compatibility with Trial 3 not required
+ from sugar.presence import presenceservice
+-from abiword import Canvas as AbiCanvas
++#from abiword import Canvas as AbiCanvas
+ from i18n import LanguageComboBox
+ 
+ SERVICE = "org.worldwideworkshop.olpc.PollBuilder"
+@@ -899,9 +899,11 @@
+             padding_top=12, padding_bottom=12,
+             padding_left=100, padding_right=100,
+             orientation=hippo.ORIENTATION_VERTICAL)
+-        button = LanguageComboBox()
+-        button.install()
+-        languageselectbox.append(hippo.CanvasWidget(widget=theme_button(button)))
++        # Disable for Ubuntu:
++        # https://bugs.launchpad.net/ubuntu/+source/sugar-pollbuilder-activity/+bug/283269
++        #button = LanguageComboBox()
++        #button.install()
++        #languageselectbox.append(hippo.CanvasWidget(widget=theme_button(button)))
+         return languageselectbox
+ 
+     def _canvas_pollbuilder_box(self):
+@@ -966,10 +968,12 @@
+         else:
+             highlight = False
+             button = gtk.Button(_("Lesson Plans"))
+-        if lesson_return:
+-            button.connect('clicked', self._button_closelessonplan_cb, lesson_return)
+-        else:
+-            button.connect('clicked', self._button_lessonplan_cb)
++        # Disabled for Ubuntu:
++        # https://bugs.launchpad.net/ubuntu/+source/sugar-pollbuilder-activity/+bug/283254
++        #if lesson_return:
++        #    button.connect('clicked', self._button_closelessonplan_cb, lesson_return)
++        #else:
++        #    button.connect('clicked', self._button_lessonplan_cb)
+         lessonplanbox.append(hippo.CanvasWidget(widget=theme_button(
+             button, highlight=highlight)))
+         return lessonplanbox