Unmerged changes from Debian

Bug #9648 reported by Debian Bug Importer
8
Affects Status Importance Assigned to Milestone
gaim (Ubuntu)
Fix Released
Medium
Sebastien Bacher

Bug Description

The gaim package has been updated in Debian, and those changes
        need to be merged into Ubuntu. An automatic merge was
        attempted, but was not able to process all of the changes.

        The output from the automatic attempt can be found here:

        http://people.ubuntu.com/~scott/merge/review/gaim

        Some documentation about the output can be found here:

        http://people.ubuntu.com/~scott/merge/README

Revision history for this message
Matt Zimmerman (mdz) wrote :

Changed-By: Martin Pitt <email address hidden>
Description:
 gaim - multi-protocol instant messaging client
Changes:
 gaim (1:1.0.2-1ubuntu1) hoary; urgency=low
 .
   * Synchronized to Debian.
   * Build-Depends on evolution-data-server-dev to get the Gaim-Evolution
     plugin.
   * configure with --enable-gevolution to build the Gaim-Evolution plugin.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.