~ubuntu-branches/ubuntu/maverick/xchat/maverick

Viewing all changes in revision 39.

  • Committer: Bazaar Package Importer
  • Author(s): Lorenzo De Liso
  • Date: 2010-06-09 15:29:05 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100609152905-nuxvjl7pfanxogco
Tags: 2.8.6-6ubuntu1
* Merge from debian unstable (LP: #591714), remaining changes:
  - debian/patches:
    + 00list: Refreshed.
    + 01_serverlist.dpatch: Numerous changes to default serverlist.
    + 02_ubuntu_default_server.dpatch: select "Ubuntu servers" by default.
    + 37_lpi.dpatch: Add launchpad integration.
    + 38_autoconf.dpatch: Autoconf modifications for launchpad integration.
    + 45_brand_ctcp_version: Add Ubuntu brand to CTCP version response.
    + 53_fix_deprecated_widgets.dpatch: Fix FTBFS errors due to new GTK 2.20
      widgets names. Patch taken from Debian.
    + 70_notification_strings_shorten.dpatch: Shorten notification strings.
    + 71_notification_icon_change.dpatch: Use nicer icon for notifications.
  - debian/control:
    + Build-depend on libgtk2.0-dev (>= 2.10.0).
    + Build-depend on liblaunchpad-integration-dev.
    + Remove conflict/replaces on xchat-gnome.
    + Updated Maintainer field to match Ubuntu Developers.
  - debian/rules:
    + Make build independent of the python version.
  - debian/patches/45_ctcp_version_less_information.dpatch: 
    + Renamed to debian/patches/45_brand_ctcp_version.dpatch
    + Added short description.
* Dropped changes:
  - 72_fix_connect_button.dpatch: Replaced with 50_fix_connect.dpatch from
    debian
  - 73_freenode_ircd-seven.dpatch: Replaced with 51_freenode_ircd-seven.dpatch
    from debian
  - 99_ubuntu-fix_implicit_declaration.dpatch: Replaced with 52_fix_implicit_declaration.dpatch
    from debian
  - debian/rules: XCHATSHAREDIR, fixes the FTBFS.
 

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: