Add patch 0001 to fix pointer conversion. This closes: bug#505459, thanks to dann frazier.

5 files changed, 27 insertions, 1 deletions

diff --git a/debian/control b/debian/control
index dcd87c4..04ffabe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo, python-xpcom (>= 1.9~rc2), xulrunner-dev (>= 1.9~rc2), python-gtk2-dev
+Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo, python-xpcom (>= 1.9~rc2), xulrunner-dev (>= 1.9~rc2), python-gtk2-dev
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-hulahop.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-hulahop.git;a=summary
diff --git a/debian/patches/0001_fix_pointer_conversion.patch b/debian/patches/0001_fix_pointer_conversion.patch
new file mode 100644
index 0000000..9e17a47
--- /dev/null
+++ b/debian/patches/0001_fix_pointer_conversion.patch
@@ -0,0 +1,21 @@
+commit a33d6707e8d71b0f41f04c6d7df50bf8ff0ca3de
+Author: Morgan Collett <morgan.collett@gmail.com>
+Date:   Sat Nov 29 15:01:42 2008 +0200
+
+    dev.sugarlabs.org #20: fix missing header file
+    
+    Patch from dann frazier <dannf@debian.org>
+    Fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505459
+
+diff --git a/python/hulahop.override b/python/hulahop.override
+index d846c64..f4d019c 100644
+--- a/python/hulahop.override
++++ b/python/hulahop.override
+@@ -4,6 +4,7 @@ headers
+ #include <Python.h>
+ #include <pygtk/pygtk.h>
+ 
++#include "hulahop.h"
+ #include "hulahop-web-view.h"
+ 
+ %%
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c05035e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_fix_pointer_conversion.patch
diff --git a/debian/rules b/debian/rules
index 656c380..82ac222 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ ifneq (,$(DEB_MAINTAINER_MODE))
 endif
 include debian/cdbs/1/rules/upstream-tarball.mk
 include debian/cdbs/1/rules/copyright-check.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/1/class/python-autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/1/rules/buildinfo.mk