-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2010-06-21 22:47:10 UTC
-
mfrom:
(2.1.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20100621224710-9t1iyiglri330pss
Tags: 2.8.8-1ubuntu1
* Merge from debian unstable (LP: #597042), remaining changes:
- debian/patches:
+ series: Refreshed.
+ 01_serverlist.patch: Numerous changes to default serverlist.
+ 02_ubuntu_default_server.patch: select "Ubuntu servers" by default.
+ 37_lpi.patch: Add launchpad integration.
+ 38_autoconf.patch: Autoconf modifications for launchpad integration.
+ 45_brand_ctcp_version.patch: Add Ubuntu brand to CTCP version response.
+ 70_notification_strings_shorten.patch: Shorten notification strings.
- 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.patch
+ Added short description.
* Converted all patches to quilt, as in debian quilt has been
adopted, all old dpatch patches have been renamed with the
*.patch extension.
* Dropped changes:
- 71_notification_icon_change.patch: can't be applied