diff -u gnome-phone-manager-0.7/debian/changelog gnome-phone-manager-0.7/debian/changelog --- gnome-phone-manager-0.7/debian/changelog +++ gnome-phone-manager-0.7/debian/changelog @@ -1,3 +1,14 @@ +gnome-phone-manager (0.7-0ubuntu4) edgy; urgency=low + + * rebuild for libbluetooth2 and libebook1.2-9 + * update build-depends + - libbluetooth1-dev -> libbluetooth2-dev + - libgnokii2-dev -> libgnokii3-dev + * take patch from bugzilla to build with newer e-d-s (stripped down) + (http://bugzilla.gnome.org/show_bug.cgi?id=349726) + + -- Michael Bienia Thu, 24 Aug 2006 18:58:25 +0200 + gnome-phone-manager (0.7-0ubuntu3) edgy; urgency=low * debian/control: diff -u gnome-phone-manager-0.7/debian/control gnome-phone-manager-0.7/debian/control --- gnome-phone-manager-0.7/debian/control +++ gnome-phone-manager-0.7/debian/control @@ -2,7 +2,7 @@ Section: gnome Priority: optional Maintainer: Edd Dumbill -Build-Depends: debhelper (>> 4.2.0), libbluetooth1-dev (>= 2.7-1), cdbs, pkg-config, libglib2.0-dev, libgtk2.0-dev, libbtctl2-dev (>= 0.4.1), libgnomebt0-dev (>= 0.5.1), libgsmme-dev (>= 1.10-5), libxml-parser-perl, liborbit2-dev, libglade2-dev (>= 2.3.1), libgconf2-dev, scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev, libtool, libbonobo2-dev (>= 2.1.1), libbonoboui2-dev, libsigc++-1.2-dev, librsvg2-dev, libgnomeui-dev, libopenobex-1.0-0-dev, libgnokii2-dev (>= 0.6.4), libgnomeui-dev (>= 1.110.0), libebook1.2-dev (>= 1.7), libxpm-dev, gnokii +Build-Depends: debhelper (>> 4.2.0), libbluetooth2-dev, cdbs, pkg-config, libglib2.0-dev, libgtk2.0-dev, libbtctl2-dev (>= 0.4.1), libgnomebt0-dev (>= 0.5.1), libgsmme-dev (>= 1.10-5), libxml-parser-perl, liborbit2-dev, libglade2-dev (>= 2.3.1), libgconf2-dev, scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev, libtool, libbonobo2-dev (>= 2.1.1), libbonoboui2-dev, libsigc++-1.2-dev, librsvg2-dev, libgnomeui-dev, libopenobex-1.0-0-dev, libgnokii3-dev, libgnomeui-dev (>= 1.110.0), libebook1.2-dev (>= 1.7), libxpm-dev, gnokii Standards-Version: 3.6.2 Package: gnome-phone-manager only in patch2: unchanged: --- gnome-phone-manager-0.7.orig/debian/patches/349726-EContactPhoto-gpm.patch +++ gnome-phone-manager-0.7/debian/patches/349726-EContactPhoto-gpm.patch @@ -0,0 +1,30 @@ +--- src/e-contact-entry.c 2006/08/02 22:30:11 1.1 ++++ src/e-contact-entry.c 2006/08/02 22:52:03 +@@ -250,13 +250,13 @@ view_contacts_added_cb (EBook *book, GLi + } + + photo = e_contact_get (contact, E_CONTACT_PHOTO); +- if (photo) { ++ if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { + GdkPixbufLoader *loader; + + loader = gdk_pixbuf_loader_new (); + +- if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data, +- photo->length, NULL)) ++ if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data, ++ photo->data.inlined.length, NULL)) + pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); + + if (pixbuf) { +@@ -277,8 +286,9 @@ view_contacts_added_cb (EBook *book, GLi + pixbuf = tmp; + } + } +- e_contact_photo_free (photo); + } ++ if (photo) ++ e_contact_photo_free (photo); + + gtk_list_store_append (lookup->entry->priv->store, &iter); + /* At this point the matcher callback gets called */