diff -u amsn-0.98.3/debian/control amsn-0.98.3/debian/control --- amsn-0.98.3/debian/control +++ amsn-0.98.3/debian/control @@ -1,15 +1,16 @@ Source: amsn Section: x11 Priority: optional -Maintainer: Muammar El Khatib +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Muammar El Khatib Build-Depends: debhelper (>= 6), tcl8.5-dev, tk8.5-dev, dpatch, libpng12-dev, libjpeg62-dev, libnice-dev, libgstreamer-plugins-base0.10-dev, libgstfarsight0.10-dev (>= 0.0.9), libv4l-dev, libgupnp-1.0-dev, libgupnp-igd-1.0-dev Standards-Version: 3.8.4 Homepage: http://amsn.sourceforge.net/ Package: amsn Architecture: any -Depends: ${shlibs:Depends}, amsn-data (= ${source:Version}), tk8.5, tcl-tls, libsnack2-alsa | libsnack2, ${misc:Depends} -Suggests: iceweasel | iceape | galeon | konqueror, sox, docker, tclsh +Depends: ${shlibs:Depends}, amsn-data (= ${source:Version}), tk8.5, tcl-tls, libsnack2-alsa | libsnack2, xdg-utils, gstreamer0.10-nice, ${misc:Depends} +Suggests: firefox | iceape | galeon | konqueror, alsa-utils, docker, tclsh Replaces: amsn-data Conflicts: amsn-data (<= 0.9.7.1~debian-1) Description: An MSN messenger written in Tcl diff -u amsn-0.98.3/debian/changelog amsn-0.98.3/debian/changelog --- amsn-0.98.3/debian/changelog +++ amsn-0.98.3/debian/changelog @@ -1,9 +1,41 @@ +amsn (0.98.3-1ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #590158), remaining changes: + - add 08_use_aplay_for_sound.dpatch patch by Festor Wailon Dacoba to use + aplay to play sounds + + debian/control: + - modify iceweasel to firefox | abrowser in amsn Suggests field + - add xdg-utils and gstreamer0.10-nice to amsn Depends field + - mofify sox to alsa-utils in amsn Suggests field as we are now using + aplay + - Changes dropped: + + Fix missing-debian-source-format lintian warning: already fixed in + this upstream release + + -- Lorenzo De Liso Sat, 05 Jun 2010 18:42:19 +0200 + amsn (0.98.3-1) unstable; urgency=medium * New upstream release. -- Muammar El Khatib Thu, 18 Mar 2010 23:03:36 -0430 +amsn (0.98.3-0ubuntu1) lucid; urgency=low + + * Merge from Debian unstable (LP: #449072), remaining Ubuntu changes: + - add 08_use_aplay_for_sound.dpatch patch by Festor Wailon Dacoba to use + aplay to play sounds + + debian/control: + - modify iceweasel to firefox | abrowser in amsn Suggests field + - add xdg-utils and gstreamer0.10-nice to amsn Depends field + - mofify sox to alsa-utils in amsn Suggests field as we are now using + aplay + * New upstream release (LP: #562619), tarball repacked according to + debian/README.source. + * Fix missing-debian-source-format lintian warning. + + -- Devid Antonio Filoni Tue, 13 Apr 2010 23:21:29 +0200 + amsn (0.98.1-2) unstable; urgency=low * Bump Standards-Version to 3.8.4. No changes were needed. @@ -24,6 +56,20 @@ -- Muammar El Khatib Tue, 03 Nov 2009 22:47:59 -0430 +amsn (0.98.1~debian-0ubuntu2) lucid; urgency=low + + * No-change rebuild against libgssdp-1.0-2 + + -- Steve Langasek Tue, 16 Mar 2010 11:09:11 +0000 + +amsn (0.98.1~debian-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #458159), source tarball repacked as described + in debian/README.Debian-source. + * debian/rules: don't remove plugins/amsnplus/snapshot binary anymore. + + -- Devid Antonio Filoni Thu, 22 Oct 2009 16:25:28 +0200 + amsn (0.98-1) unstable; urgency=low * New upstream release. (Closes: #545968) @@ -42,6 +88,36 @@ -- Muammar El Khatib Thu, 03 Sep 2009 22:58:41 -0430 +amsn (0.98~debian-0ubuntu2) karmic; urgency=low + + * debian/rules: remove plugins/amsnplus/snapshot binary before build, + fix FTBFS. + * debian/control: add libgupnp-igd-1.0-dev to Build-Depends field. + + -- Devid Antonio Filoni Wed, 26 Aug 2009 22:31:36 +0200 + +amsn (0.98~debian-0ubuntu1) karmic; urgency=low + + * New upstream release, tarball repacked according to + debian/README.Debian-source. + * Remove debian/patches/{09_libv4l_svn10551, 10_svn10639, 11_svn10867, + 12_svn11166, 07_autoupdate, 08_proxy, 06_TkCximage, 04_use_xdg-open}.dpatch + patches, merged upstream. + * Regenerate debian/patches/{04_settingoff_autoupdate, + 08_use_aplay_for_sound}.dpatch patches. + * Remove not-applied debian/patches/05_changing_sxml.dpatch patch. + * Remove useless debian/messenger.xpm file. + * debian/rules: remove -DHAVE_LIBV4L from CFLAGS and -lv4l2 from LDFLAGS. + * debian/control: add libgstfarsight0.10-dev and + libgstreamer-plugins-base0.10-dev to Build-Depends field. + * debian/control: add gstreamer0.10-nice to Depends field. + * Bump Standards-Version to 3.8.3. + * Fix dh_desktop-is-deprecated lintian warning. + * Fix duplicate-long-description lintian info. + * Fix patch-system-but-no-source-readme lintian warning. + + -- Devid Antonio Filoni Wed, 26 Aug 2009 20:01:20 +0200 + amsn (0.98~svn11402-1) unstable; urgency=low * New upstream snapshot. @@ -76,6 +152,34 @@ -- Muammar El Khatib Fri, 03 Jul 2009 20:59:30 -0430 +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 + + -- 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, + fixes LP: #314805 + + -- Adrien Cunin Wed, 08 Apr 2009 23:53:46 +0200 + +amsn (0.97.2~debian-2ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, fixes login issue with tcl 8.5.6 (LP: #352814) + Remaining Ubuntu changes: + - Added patch 04_use_xdg-open, added xdg-utils dependency + - Added patch 08_use_aplay_for_sound + - Added libv4l support: build-dep on libv4l, add -DHAVE_LIBV4L to CFLAGS, + add patch 09_libv4l_svn10551 + - Added patches 10_svn10639 and 11_svn10867 + - debian/control: iceweasel -> firefox | abrowser, sox -> alsa-utils + + -- Adrien Cunin Fri, 03 Apr 2009 23:03:03 +0200 + amsn (0.97.2~debian-2) unstable; urgency=low * aMSN is now able to work with version 8.5.6 of tcl/tk8.5. @@ -85,6 +189,42 @@ -- Muammar El Khatib Thu, 26 Feb 2009 11:21:32 -0430 +amsn (0.97.2~debian-1ubuntu3) jaunty; urgency=low + + * Add 11_svn10867.dpatch from upstream svn to fix an issue with v4l1 webcams + not working with v4l2. Fix LP: #260918. + + -- Devid Antonio Filoni Thu, 29 Jan 2009 16:10:22 +0100 + +amsn (0.97.2~debian-1ubuntu2) jaunty; urgency=low + + * Add support for libv4l (LP: #260918): + - add libv4l-dev (>= 0.5.0) to Build-Depends field in debian/control + - add debian/patches/09_libv4l_svn10551.dpatch patch from upstream svn, + this makes libng use libv4l2 for webcam palette conversion and access + - debian/rules: add -DHAVE_LIBV4L to CFLAGS; 09_libv4l_svn10551.dpatch + patch doesn't contain the changes included in r10551 to Makefile and + configure{,.ac} + * add debian/patches/10_svn10639.dpatch patch from upstream svn, this + contains a fix from Fedora to utils/linux/capture/libng/plugins/drv0-v4l2.c + file. + + -- Devid Antonio Filoni Wed, 26 Nov 2008 22:02:24 +0100 + +amsn (0.97.2~debian-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - add 04_use_xdg-open.dpatch patch to use xdg-open as file manager + - add 08_use_aplay_for_sound.dpatch patch by Festor Wailon Dacoba to use + aplay to play sounds + + debian/control: + - modify iceweasel to firefox | abrowser in amsn Suggests field + - add xdg-utils to amsn Depends field + - mofify sox to alsa-utils in amsn Suggests field as we are now using + aplay + + -- Devid Antonio Filoni Mon, 17 Nov 2008 21:09:49 +0100 + amsn (0.97.2~debian-1) unstable; urgency=low * New upstream version. @@ -102,6 +242,49 @@ -- Muammar El Khatib Sat, 16 Aug 2008 21:52:24 -0300 +amsn (0.97.2~debian-0ubuntu3) intrepid; urgency=low + + * fix LP: #272772: packages that Depend/Recommend/Suggest firefox + (meta-package) must alternatively Depend/Recommend/Suggest abrowser + - update debian/control + + -- Fabien Tassin Sun, 21 Sep 2008 22:00:47 +0200 + +amsn (0.97.2~debian-0ubuntu2) intrepid; urgency=low + + * Replace amsn << 0.97.2~debian-0ubuntu2 in amsn-data package (LP: #255437). + + -- Salvatore Palma Wed, 06 Aug 2008 21:22:14 +0200 + +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). + + -- Adrien Cunin Tue, 05 Aug 2008 17:10:29 +0200 + amsn (0.97.1~debian-1) unstable; urgency=low * New upstream release. (Closes: #488850) @@ -137,6 +320,74 @@ -- Muammar El Khatib Wed, 02 Apr 2008 00:39:55 -0430 +amsn (0.97+final-0ubuntu6) intrepid; urgency=low + + * debian/control: replace tcltls dependency with tcl-tls. + + -- Luca Falavigna Sat, 02 Aug 2008 01:48:53 +0200 + +amsn (0.97+final-0ubuntu5) hardy; urgency=low + + * debian/patches/07-fix_kde4_tray_icon.dpatch: + - Fix tray icon in kde. Patch from revision 9595 in amsn svn. + - Closes LP: #212973 + + -- Pär Andersson Sun, 06 Apr 2008 20:26:13 +0200 + +amsn (0.97+final-0ubuntu4) hardy; urgency=low + + * Renamed 04_sensible_browserKey.dpatch to 04_use_xdg-open.dpatch + * debian/patches/04_use_xdg-open.dpatch: Updated. + - Use xdg-open for file manager, and opening files - not just browser. + - Closes LP: #206639 + - Closes LP: #208816 + * debian/patches/05-disable_newVersionCheck.dpatch: Created. + - Path to disable checking of new versions on start by default. + - Closes LP: #188675 + * debian/patches/06-fix_makefile.dpatch: Created. + - Ensure proper cleanup and installation of files. + * debian/rules: + - clean: Calls to rm removed and makefile patched instead. + - install: Use dh_installdocs to install docs instead of manually copying. + - Removed spurious comments and old, commented out commands. + - General cleanup. + * debian/amsn.desktop: + - Deleted, we no longer use it. + - Closes LP: #184353 + * debian/amsn.docs: Created. + * debian/patches/00list: Regenerated. Closes LP: #208816 + + -- Cody A.W. Somerville Sat, 29 Mar 2008 23:16:00 -0300 + +amsn (0.97+final-0ubuntu3) hardy; urgency=low + + * Updated debian/patches/04_sensible_browserKey.dpatch + - use xdg-open instead of sensible-browser. (Closes lp: #206639) + * debian/control: + - Suggest firefox instead of iceweasel. (Closes lp: #184351) + - Added dependency on xdg-utils. + * Closes lp: #206896 + + -- Cody A.W. Somerville Tue, 25 Mar 2008 21:05:18 -0300 + +amsn (0.97+final-0ubuntu2) hardy; urgency=low + + * debian/patches/04_sensible_browserKey.dpatch: + - Added patch to use sensible-browser instead of mozilla as + default browser. + + -- Cody A.W. Somerville Tue, 11 Mar 2008 14:34:31 -0300 + +amsn (0.97+final-0ubuntu1) hardy; urgency=low + + * Fake sync with debian due to version issue (LP: #179008) + - Use Tcl8.5 and antialiased text (LP: #157839) + * Modify Maintainer value to match the DebianMaintainerField + specification. + * debian/rules: .desktop file already moved in the correct path + + -- Laurent Bigonville Thu, 10 Jan 2008 04:59:52 +0100 + amsn (0.97-1) unstable; urgency=low * Bump Standards-Version to 3.7.3 diff -u amsn-0.98.3/debian/patches/00list amsn-0.98.3/debian/patches/00list --- amsn-0.98.3/debian/patches/00list +++ amsn-0.98.3/debian/patches/00list @@ -5,0 +6 @@ +08_use_aplay_for_sound only in patch2: unchanged: --- amsn-0.98.3.orig/debian/patches/08_use_aplay_for_sound.dpatch +++ amsn-0.98.3/debian/patches/08_use_aplay_for_sound.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_use_aplay_for_sound.dpatch by Festor Wailon Dacoba. +## +## DP: Use "aplay" for play sounds with ALSA + +@DPATCH@ +diff -urNad amsn-0.98~debian~/config.tcl amsn-0.98~debian/config.tcl +--- amsn-0.98~debian~/config.tcl 2009-08-25 21:12:30.000000000 +0200 ++++ amsn-0.98~debian/config.tcl 2009-08-26 21:02:25.444173017 +0200 +@@ -87,7 +87,7 @@ + + ::config::setKey os "mac" + } elseif { [OnUnix] } { +- ::config::setKey soundcommand "play \$sound" ++ ::config::setKey soundcommand "aplay \$sound" + ::config::setKey browser "xdg-open \$url" + ::config::setKey notifyXoffset 0 + ::config::setKey notifyYoffset 0