diff -u amsn-0.97.2~debian/debian/changelog amsn-0.97.2~debian/debian/changelog --- amsn-0.97.2~debian/debian/changelog +++ amsn-0.97.2~debian/debian/changelog @@ -1,3 +1,13 @@ +amsn (0.97.2~debian-2ubuntu3) karmic; 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 + * Remaining changes: + - debian/control: 'Homepage' set to http://www.amsn-project.net/ + + -- Patrick Kuijvenhoven Thu, 07 May 2009 18:36:43 +0200 + amsn (0.97.2~debian-2ubuntu2) jaunty; urgency=low * debian/rules: added -lv4l2 to LDFLAGS for libv4l support to work correctly, diff -u amsn-0.97.2~debian/debian/control amsn-0.97.2~debian/debian/control --- amsn-0.97.2~debian/debian/control +++ amsn-0.97.2~debian/debian/control @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Muammar El Khatib Build-Depends: debhelper (>= 6), tcl8.5-dev, tk8.5-dev, dpatch, libpng12-dev, libjpeg62-dev, libv4l-dev (>= 0.5.0) Standards-Version: 3.8.0 -Homepage: http://amsn.sourceforge.net/ +Homepage: http://www.amsn-project.net/ Package: amsn Architecture: any diff -u amsn-0.97.2~debian/debian/patches/00list amsn-0.97.2~debian/debian/patches/00list --- amsn-0.97.2~debian/debian/patches/00list +++ amsn-0.97.2~debian/debian/patches/00list @@ -7,6 +7,7 @@ 09_libv4l_svn10551 10_svn10639 11_svn10867 +12_svn11166 06_TkCximage 07_autoupdate 08_proxy only in patch2: unchanged: --- amsn-0.97.2~debian.orig/debian/patches/12_svn11166.dpatch +++ amsn-0.97.2~debian/debian/patches/12_svn11166.dpatch @@ -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