Please merge amsn 0.97.1~debian-1 from Debian unstable (main)

You might want to add that this has to be synced from Debian sid main.

I don't think this is a sync, there are many changes in Ubuntu that should be included. If you can't I can work at it, let me know.

Changed the description to merge.
The debdiff

New debdiff

I'm not sure about adding tk8.4 to the dependencies. amsn already depends on tk8.5 and that should be enough.
There are some Ubuntu changes missing:
  * Makefile patch and debian/rules change
  * Disable new version check patch
  * Fix for KDE4 tray icon patch

0.97.1 contains a required change in protocol.tcl for logging in to MSN-servers:
http://amsn.svn.sourceforge.net/viewvc/amsn/branches/0_97/amsn/protocol.tcl?r1=10215&r2=10261

Without that, logging in fails!

Importance: Critical! :P

New debdiff
tk2.4 seems to make amsn more stable (I can confirm this)
The only change missing in the previous debdiff is "Disable new version check patch".
"Makefile patch and debian/rules change": some changes to debian/rules were useless and the makefile changes are included in the rules (target clean).
"Fix for KDE4 tray icon patch": was a patch downloaded from svn, it is already included in 0.97.1.

14:14:11 <Adri2000> devfil: I don't think amsn should depend on both tk8.5 and tk8.4
14:14:30 <Adri2000> and upstream confirmed me it should work just fine with tk8.5
14:14:57 <Adri2000> fix for kde4 thing: ok
14:15:33 <Adri2000> makefile patch: if you choose to drop that ubuntu change, you should mention it in the changelog
14:16:19 <Adri2000> I agree that this change isn't really useful, it just sounds more logicial to do that way. but if we want to reduce the delta with debian, let's drop it

New debdiff

New debdiff

New debdiff

This bug was fixed in the package amsn - 0.97.2~debian-0ubuntu1

---------------
amsn (0.97.2~debian-0ubuntu1) intrepid; urgency=low

  [ Adrien Cunin ]

  * New upstream release
  * Repacked tarball to .tar.gz and according to debian/README.Debian-source
  * Keep the ~debian versioning scheme
  * debian/patches/05_changing_sxml.dpatch: dropped, it's upstream
  * debian/control: changed sox suggests to alsa-utils as we are now using
    aplay (see below)

  [ Devid Filoni ]

  * Merge from Debian unstable (LP: #249965). Remaining Ubuntu changes:
    - add 04_use_xdg-open.dpatch patch to use xdg-open as file manager
    - add 05-disable_newVersionCheck.dpatch patch
    + debian/control:
      - modify iceweasel to firefox in amsn Suggests field
      - add xdg-utils to amsn Depends field
    - don't merge 06-fix_makefile.dpatch patch because the debian package add
      the commands in the debian/rules clean target
    - dont' merge 07-fix_kde4_tray_icon.dpatch patch, merged upstream
    - don't merge debian/amsn.desktop removal to reduce delta
  * Add 08_use_aplay_for_sound.dpatch patch by Festor Wailon Dacoba to use
    aplay to play sounds (LP: #99605).
  * The new upstream version fixes LP: #243722 (login doesn't work).

amsn (0.97.1~debian-1) unstable; urgency=low

  * New upstream release. (Closes: #488850)
  * Bump Standards-Version to 3.8.0
  * The circular dependency has been erased in this revision of aMSN.
    amsn-data does not depend on amsn anymore. (Closes: #478692)
  * The problem caused by a missing Replaces in amsn-data package has
    been fixed in this new revision. (Closes: #484302)
  * aMSN depends on tcl-tls instead of tcltls. (Closes: #484206, #490762)

amsn (0.97-3) unstable; urgency=low

  * Bug: 'amsn: replace/conflict' has been fixed in this revision.
  (Closes: #476666)
  * Added a new preinst script to remove unneeded files from amsn-data
    package.

amsn (0.97-2) unstable; urgency=low

  * Bug: 'Please disable new version notification' has been fixed in this new
    revision of aMSN (Closes: #272741). Thanks to Marco Rodrigues for
    providing a patch.
  * Data files have been moved to a new amsn-data package.
  * debian/rules: dh_desktop was added. (Closes: #461800).
  * Desktop file has been improved to follow new standars.
  * A manpage for amsn-remote has been done.
  * Added preinst script to remove unneeded files from amsn package that has
    been moved to amsn-data.

 -- Adrien Cunin <email address hidden> Tue, 05 Aug 2008 17:10:29 +0200