[Pkg-e-commits] [SCM] Python bindings for Edje branch, master, updated. debian/0.2.1-2-2-gb624a9a

[Jan Luebbe]

The following commit has been merged in the master branch:
commit 685f0af4ed147d4a367613ff8180969a7657f468
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Sat Aug 9 18:37:28 2008 +0200

    Fix unicode text

diff --git a/debian/changelog b/debian/changelog
index 7e77d1c..bce1e46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-edje (0.2.1-3) UNRELEASED; urgency=low
+
+  * Fix unicode text
+
+ -- Jan Lübbe <jluebbe at debian.org>  Sat, 09 Aug 2008 18:38:00 +0200
+
 python-edje (0.2.1-2) experimental; urgency=low
 
   * Upload to experimental instead of unstable
diff --git a/debian/patches/0001-fix-unicode-conversion.patch b/debian/patches/0001-fix-unicode-conversion.patch
new file mode 100644
index 0000000..7964e09
--- /dev/null
+++ b/debian/patches/0001-fix-unicode-conversion.patch
@@ -0,0 +1,41 @@
+From fa12a33b5a3c0e86231ca84967d9eff456e5f314 Mon Sep 17 00:00:00 2001
+From: Jan Luebbe <jluebbe at debian.org>
+Date: Sat, 9 Aug 2008 18:30:04 +0200
+Subject: [PATCH] fix unicode conversion
+
+---
+ edje/edje.c_edje_object.pxi |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/edje/edje.c_edje_object.pxi b/edje/edje.c_edje_object.pxi
+index 0f4da68..21c237e 100644
+--- a/edje/edje.c_edje_object.pxi
++++ b/edje/edje.c_edje_object.pxi
+@@ -391,17 +391,20 @@ cdef public class Edje(evas.c_evas.Object) [object PyEdje, type PyEdje_Type]:
+         else:
+             raise TypeError("func must be callable or None")
+ 
+-    def part_text_set(self, char *part, char *text):
+-        edje_object_part_text_set(self.obj, part, text)
++    def part_text_set(self, char *part, text):
++        cdef char *s
++        u = text.encode("utf8")
++        s = u
++        edje_object_part_text_set(self.obj, part, s)
+ 
+     def part_text_get(self, char *part):
+-        "@rtype: str"
++        "@rtype: unicode"
+         cdef char *s
+         s = edje_object_part_text_get(self.obj, part)
+         if s == NULL:
+             return None
+         else:
+-            return s
++            return s.decode("utf8")
+ 
+     def part_swallow(self, char *part, c_evas.Object obj):
+         """Swallows an object into the edje
+-- 
+1.5.6.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0a2ea08
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-unicode-conversion.patch
diff --git a/debian/rules b/debian/rules
index f257297..38d3950 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,14 @@ DEB_PYTHON_SYSTEM=pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+refresh-patches:
+	@dh_testdir
+	@echo 'refreshing debian/patches:'
+	@rm -rf '$(CURDIR)'/debian/patches
+	@mkdir -p '$(CURDIR)'/debian/patches
+	@cd '$(CURDIR)'/debian/patches && git format-patch upstream..upstream+patches | tee series
+	@sed -i s:^debian/patches/:: '$(CURDIR)'/debian/patches/series
+	@echo .
 

-- 
Python bindings for Edje