Merge xchat 2.8.6-6 (universe) from Debian unstable (main)

This fails to build:

dpkg-source -b xchat-2.8.6
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building xchat using existing ./xchat_2.8.6.orig.tar.gz
dpkg-source: info: building xchat in xchat_2.8.6-6ubuntu1.debian.tar.gz
dpkg-source: info: building xchat in xchat_2.8.6-6ubuntu1.dsc
 debian/rules build
test -d debian/patched || install -d debian/patched
dpatch apply-all
applying patch 01_serverlist to ./ ... ok.
applying patch 10_fix_unchecked_mallocs to ./ ... ok.
applying patch 20_url_pattern to ./ ... ok.
applying patch 41_casecomp to ./ ... ok.
applying patch 43_french to ./ ... ok.
applying patch 44_open_url to ./ ... ok.
applying patch 45_save_ignore to ./ ... ok.
applying patch 46_CVE-2009-0315 to ./ ... ok.
applying patch 47_galician to ./ ... ok.
applying patch 48_spanish to ./ ... ok.
applying patch 49_xc286-smallfixes to ./ ... ok.
applying patch 50_fix_connect to ./ ... ok.
applying patch 51_freenode_ircd-seven to ./ ... ok.
applying patch 52_fix_implicit_declaration to ./ ... ok.
applying patch 53_fix_deprecated_widgets to ./ ... ok.
applying patch 72_fix_connect_button to ./ ... failed.
make: *** [patch-stamp] Error 1
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package
I: unmounting dev/pts filesystem
I: unmounting proc filesystem
I: cleaning the build env
I: removing directory /var/cache/pbuilder/build//18141 and its subdirectories

Should be fixed now.

You seem to drop a lot more patches than what's mentioned in the changelog.

 01_serverlist
-02_ubuntu_default_server
 10_fix_unchecked_mallocs
 20_url_pattern
-37_lpi
-38_autoconf
 41_casecomp
 43_french
 44_open_url
-45_brand_ctcp_version
 45_save_ignore
 46_CVE-2009-0315
 47_galician
 48_spanish
 49_xc286-smallfixes
-53_fix_deprecated_widgets.dpatch
-70_notification_strings_shorten
-71_notification_icon_change
-72_fix_connect_button.dpatch
-73_freenode_ircd-seven.dpatch
+50_fix_connect
+51_freenode_ircd-seven
+52_fix_implicit_declaration
+53_fix_deprecated_widgets
 99_gtype
-99_ubuntu-fix_implicit_declaration.dpatch

Fixed.

I personally wouldn't mention the XCHATSHAREDIR change if it's not applied. Can I drop that from the changelog?

Of course, but please, keep in mind I mentioned it because:

xchat (2.8.4-0ubuntu4) gutsy; urgency=low

  * debian/rules:
    - Sets XCHATSHAREDIR correctly _indeed_ (patch by Whoopie) (LP: #137712)

 -- Aron Sisak <email address hidden> Sat, 08 Sep 2007 14:00:11 +0200

I mentioned it in "Dropped changes" and it was applied in the previous versions.

This bug was fixed in the package xchat - 2.8.6-6ubuntu1

---------------
xchat (2.8.6-6ubuntu1) maverick; urgency=low

  * 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.

xchat (2.8.6-6) unstable; urgency=medium

  * The "Death Star" release.
  * debian/patches/53_fix_deprecated_widgets.dpatch: Added. Closes: #576690.

xchat (2.8.6-5) unstable; urgency=low

  * The "End of Journey" release.
  * debian/patches/50_fix_connect.dpatch: Added. Closes: #538733.
  * debian/patches/51_freenode_ircd-seven.dpatch: Added. Closes: #565380.
  * debian/patches/52_fix_implicit_declaration.dpatch: Added.
 -- Lorenzo De Liso <email address hidden> Wed, 09 Jun 2010 15:29:05 +0200