=== modified file 'debian/changelog' --- debian/changelog 2009-04-08 23:53:46 +0000 +++ debian/changelog 2010-02-17 19:27:16 +0000 @@ -1,3 +1,11 @@ +amsn (0.97.2~debian-2ubuntu2.1) jaunty-proposed; urgency=low + + * Load proxy.tcl before plugins.tcl to make sure the correct version of the + http package is loaded before any plugins start loading some incompatible + version (LP: #371103). Thanks to aMSN developer KaKaRoTo + + -- Patrick Kuijvenhoven Wed, 17 Feb 2010 20:23:16 +0100 + amsn (0.97.2~debian-2ubuntu2) jaunty; urgency=low * debian/rules: added -lv4l2 to LDFLAGS for libv4l support to work correctly, === modified file 'debian/patches/00list' --- debian/patches/00list 2009-04-03 23:03:03 +0000 +++ debian/patches/00list 2010-02-17 19:27:16 +0000 @@ -7,6 +7,7 @@ 09_libv4l_svn10551 10_svn10639 11_svn10867 +12_svn11166 06_TkCximage 07_autoupdate 08_proxy === added file 'debian/patches/12_svn11166.dpatch' --- debian/patches/12_svn11166.dpatch 1970-01-01 00:00:00 +0000 +++ debian/patches/12_svn11166.dpatch 2010-02-17 19:27:16 +0000 @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_svn11166.dpatch +## +## DP: Load proxy.tcl before plugins.tcl to make sure the correct version of the http package is loaded before any plugins start loading some incompatible version +## DP: See LP #371103 +## DP: Backport of http://amsn.svn.sourceforge.net/viewvc/amsn?view=rev&revision=11166 + +@DPATCH@ +--- a/amsn 2009-05-07 18:32:26.000000000 +0200 ++++ b/amsn 2009-05-07 18:33:33.000000000 +0200 +@@ -227,10 +227,10 @@ + source gui.tcl ;#gui.tcl must be at the beginning to make msg_box procedure available for errors + source abook.tcl ;# Handle buddy address book + source protocol.tcl ++ source proxy.tcl ;# loaded before plugins + source plugins.tcl ;# Plugins system must be loaded before config + source pluginslog.tcl + source config.tcl ;# config needs to be loaded before pluginslog for translations +- source proxy.tcl + source msnp2p.tcl + source msncam.tcl + source preferences.tcl