Please merge empathy (0.12) from debian (main)

[Laurent Bigonville]

Please merge empathy from debian main

See bzr branch

[Daniel Holbach (dholbach)]

Can you subscribe ubuntu-universe-sponsors next time? (https://wiki.ubuntu.com/SponsorshipProcess)

Looking at it now.

[Daniel Holbach (dholbach)]

 - I'm not so happy about you dropping changelog entries.
 - You drop Section: gnome for the empathy package.
 - Are you sure that the Conflicts and Replaces are good enough? We have 0.12-0ubuntu2 in Ubuntu right now.
 - what about DEB_PYTHON_SYSTEM := pysupport and having python-all-dev as Build-Depends?

[Laurent Bigonville (bigon)]

I've now readded the missing changelog entries and changed the version for the replaces/conflicts.

About the section, since the source package is in the gnome section, a binary package that doesn't specify a section should also be in the gnome section by default.

About the python package I don't think it's possible since it doesn't use distutils (see:http://wiki.debian.org/DebianPython/NewPolicy)

[Laurent Bigonville (bigon)]

empathy (0.12-2ubuntu1) gutsy; urgency=low

  * Merge from debian unstable, remaining Ubuntu changes: (LP: #138027)
    - Add profiles for haze support
    - Depends: telepathy-gabble | telepathy-connection-manager,
    - Suggests: telepaty-core.
  * Add debian/patches/no-date-crash.patch: Fix crash if there is no date in
    conversation (Taken from upstream)
  * Add debian/patches/search-contact-list.patch: Fix search function in
    contact list (Taken from upstream)
  * Fix typo in libempathy-dev description
  * Change Conflicts and Replaces accordingly
  * Change bzr url to the Ubuntu branch

empathy (0.12-2) unstable; urgency=low

  * debian/control: Let the -common packages conflict and replace the old
    empathy
  * debian/control: Let libempathy-gtk-dev depends on libglade2-dev instead of
    libglade-dev
  * debian/control: Tighten depends of libempathy-gtk-dev a bit more

 -- Laurent Bigonville <email address hidden> Mon, 10 Sep 2007 17:12:54 +0200