Merge lp:~darkxst/ubuntu/raring/gnome-contacts/lp1033262 into lp:ubuntu/raring/gnome-contacts

[Tim Lunn]

[Jeremy Bícha (jbicha)]

Uploaded. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-01 18:04:37 +0000
+++ debian/changelog	2013-06-07 00:24:27 +0000
@@ -1,3 +1,9 @@
+gnome-contacts (3.6.2-0ubuntu3) raring; urgency=low
+
+  * debian/patches/bytestring_type.patch: Dropped, no longer need (LP: #1033262) 
+
+ --  Tim Lunn <[e-mail]>  Fri, 07 Jun 2013 10:03:13 +1000
+
 gnome-contacts (3.6.2-0ubuntu2) raring; urgency=low
 
   * debian/patches/fix_build_with_telepathy-glib.patch:

=== removed file 'debian/patches/bytestring_type.patch'
--- debian/patches/bytestring_type.patch	2012-07-05 17:15:23 +0000
+++ debian/patches/bytestring_type.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
----
- src/contacts-contact.vala |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/src/contacts-contact.vala
-===================================================================
---- a/src/contacts-contact.vala
-+++ b/src/contacts-contact.vala
-@@ -165,7 +165,7 @@ public class Contacts.Contact : GLib.Obj
-         if (small_avatar == null)
-           return null;
- 
--        var pixel_data = Variant.new_from_data (VariantType.BYTESTRING,
-+        var pixel_data = Variant.new_from_data (VariantType.ARRAY,
-                                                 small_avatar.get_pixels_with_length (),
-                                                 true, small_avatar);
-         _avatar_icon_data = new Variant ("(iiibii@ay)",

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-04-01 18:04:37 +0000
+++ debian/patches/series	2013-06-07 00:24:27 +0000
@@ -1,3 +1,2 @@
-bytestring_type.patch
 unity_no_goa.patch
 fix_build_with_telepathy-glib.patch