--- tkabber-0.11.1.orig/debian/changelog +++ tkabber-0.11.1/debian/changelog @@ -0,0 +1,203 @@ +tkabber (0.11.1-2) unstable; urgency=low + + * Add jlib-disconnect.patch (fixes error in [jlib::disconnect] + which can be triggered when this command in called on an already + teared down connection). + * Add roster-import-rfc3921bis.patch (sends each roster contact + being imported from a backup file each in its own IQ stanza + as required by RFC 3921bis, closes: #567628). + * Add German, Polish and Spanish desktop file translations. + * Add ${misc:Depends} to the Depends field (fixes Lintian warning). + + -- Konstantin Khomoutov Fri, 26 Feb 2010 03:14:41 +0300 + +tkabber (0.11.1-1) unstable; urgency=low + + * New upstream release. + * Remove obsolete patches. + * Fix bashism in Makefile install-bin target. + * Move to debhelper 7, standards 3.8.3. + * Depend on tk | wish. + * Add README.source. + * Add tkabber.desktop. + * Bump version of suggested tkabber-plugins to 0.11.1. + * Add libsnack2 to the list of suggested packages. + * Add Vcs-git, Vcs-browser and Homepage fields to control file. + + -- Konstantin Khomoutov Sat, 31 Oct 2009 16:50:42 +0300 + +tkabber (0.11.0-3) unstable; urgency=low + + * Integrated patch fixing problem with connecting to + Google Talk servers (closes: #505103). + + -- Konstantin Khomoutov Sun, 09 Nov 2008 16:28:45 +0300 + +tkabber (0.11.0-2) unstable; urgency=low + + * Integrated upstream fix for the error in the implementation + of BASIC HTTP proxy authentication mechanism (closes: #492929). + * Integrated upstream fix for the "sticky proxy server settings" + (closes: #493010). + + -- Konstantin Khomoutov Tue, 29 Jul 2008 23:51:13 +0000 + +tkabber (0.11.0-1) unstable; urgency=low + + * New maintainer: Konstantin Khomoutov + (closes: #465690). + * New upstream release. + * Introduced build dependency on quilt. + * Added patches which fix two major bugs crept into the new release: + incorrect processing of xmpp:urn:time IQ requests and typo in + the HTTP proxy basic authentication code resulted in runtime error. + * Simplified debian/rules to make more use of the Tkabber's own Makefile. + * tkabber.html is now installed as part of the documentation instead + of tkabber.xml; also it's registered with doc-base, if available. + * Removed tkabber.sgml in favor of more simplistic tkabber.1 nroff file. + * Changed descriptions of package in debian/control to make them + more informative; "tkabber-plugins" package is mentioned. + * Manual page corrected: some wording changed, provided more links + to other documentation sources. + + -- Konstantin Khomoutov Sun, 22 Jun 2008 02:53:58 +0400 + +tkabber (0.10.0-3) unstable; urgency=low + + * Allow tk8.5 and tcl8.5 as alternatives in depends. Thanks to Alexander + Galanin . (closes: #465787) + * Bump standards-version to 3.7.3 + - Change menu section from Apps/Net to Applications/Network/Communication + * Do some debian/rules cleanup + * Update debian/copyright to actually mention copyright and to reflect the + upstream license (GPL, not limited to version 2.1) + + -- Jonas Meurer Wed, 19 Mar 2008 01:24:44 +0100 + +tkabber (0.10.0-2) unstable; urgency=low + + * Minor improvements and fixes suggested by Sergei Golovan, closes: #423161 + - fix upstream url in copyright and watch file + - add long title to menu file + - add -X.tcl -X.xrdb to dh_compress to prevent these files from being + compressed in the examples directory. + - add a new tkabber.xpm from Sergei Golovan + * Minor improvements for the manpage. + + -- Jonas Meurer Wed, 16 May 2007 19:12:44 +0200 + +tkabber (0.10.0-1) unstable; urgency=low + + * New upstream release. (closes: #421067) + + -- Jonas Meurer Fri, 27 Apr 2007 14:02:06 +0200 + +tkabber (0.9.9-2) unstable; urgency=low + + * use upstream Makefile for build process + * reintroduce binary-arch and binary-indep targets in debian/rules. + Thanks to Aurelien Jarno . (closes: #395811) + * urgency=HIGH as this indeed is a rc bug. + + -- Jonas Meurer Mon, 30 Oct 2006 16:02:34 +0100 + +tkabber (0.9.9-1) unstable; urgency=low + + * new upstream release (closes: #373891) + * bump standards-version to 3.7.2 + * bump debhelper compat and build-depends to 5 + + -- Jonas Meurer Fri, 16 Jun 2006 14:53:23 +0200 + +tkabber (0.9.8-1) unstable; urgency=low + + * new upstream release + * bumped standards-version to 3.6.2 + * updated FSF address + * set architecture to all, make package arch-independant + + -- Jonas Meurer Mon, 26 Sep 2005 00:07:12 +0200 + +tkabber (0.9.7-5) unstable; urgency=low + + * remove duplicate in documentation (closes: #293400) + * updated debian/watch file + + -- Jonas Meurer Mon, 11 Apr 2005 15:59:30 +0200 + +tkabber (0.9.7-4) unstable; urgency=low + + * use dh_link to create links (closes: #274207) + * addition for 0.9.7-3: upstream Makefile has been quite modified + to move arch-dependant files to /usr/lib/tkabber. + + -- Jonas Meurer Thu, 30 Sep 2004 18:12:25 +0200 + +tkabber (0.9.7-3) unstable; urgency=low + + * moved libtk-img to Recommends, as it's used for + displaying photos in users vCards. (closes: #268244) + * patched ifacetk/iface.tcl to enable wm-quit (closes: #266782) + * patched tkabber.tcl to support a -splash option (closes: #272811) + this patch adds the -splash command-line option to tkabber + valid arguments are yes, no, y, n, 1 and 0. + * splitted /usr/share/tkabber: + -> *.tcl moved to /usr/lib/tkabber as it's arch-dependant + -> arch-independant subdirs left in /usr/share/tkabber, linked in + /usr/lib/tkabber + + -- Jonas Meurer Wed, 29 Sep 2004 11:21:25 +0200 + +tkabber (0.9.7-2) unstable; urgency=low + + * hopefully fixed debian/watch file + * removed ckabber.tcl, as it's garbage + + -- Jonas Meurer Mon, 2 Aug 2004 00:23:51 +0200 + +tkabber (0.9.7-1) unstable; urgency=low + + * New Upstream Release (closes: #255851) + * added debian/watch file + * added libtk-img to suggests + + -- Jonas Meurer Wed, 28 Jul 2004 16:49:27 +0200 + +tkabber (0.9.6beta-1) unstable; urgency=low + + * New upstream release. + * added tcltls to Recommends (closes: #213642) + * depend on tk8.4 now (closes: #208088) + + -- Jonas Meurer Thu, 6 May 2004 16:37:03 +0200 + +tkabber (0.9.5beta-1) unstable; urgency=low + + * New upstream release. (closes: #181601) + * Added a menu entry. (closes: #198482) + + -- Jonas Meurer Mon, 23 Jun 2003 18:02:22 +0200 + +tkabber (0.9.4beta-1) unstable; urgency=low + + * New upstream release. + + -- Jonas Meurer Sun, 9 Mar 2003 13:31:54 +0100 + +tkabber (0.9.3beta-2) unstable; urgency=low + + * Fixed depends + + -- Jonas Meurer Mon, 23 Dec 2002 12:05:47 +0100 + +tkabber (0.9.3beta-1) unstable; urgency=low + + * New upstream release. + + -- Jonas Meurer Thu, 12 Dec 2002 13:43:11 +0100 + +tkabber (0.9.2beta-1) unstable; urgency=low + + * Initial Release. + + -- Jonas Meurer Mon, 2 Dec 2002 23:56:57 +0100 --- tkabber-0.11.1.orig/debian/tkabber.desktop +++ tkabber-0.11.1/debian/tkabber.desktop @@ -0,0 +1,18 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Tkabber +GenericName=GUI client for XMPP (Jabber) instant messaging +GenericName[es]=Cliente gráfico de mensajería instantánea XMPP (Jabber) +GenericName[de]=GUI-Client für die XMPP-Nachrichtenübermittlung (Jabber) +GenericName[pl]=Graficzny klient do wymiany wiadomości błyskawicznych XMPP (Jabber) +GenericName[ru]=GUI клиент для мгновенного обмена сообщениями XMPP (Jabber) +Comment=Communicate via XMPP (Jabber) protocol +Comment[es]=Comunicación usando el protocolo XMPP (Jabber) +Comment[de]=Über das XMPP-Protokoll (Jabber) kommunizieren +Comment[pl]=Komunikuj się za pomocą protokołu XMPP (Jabber) +Comment[ru]=Общаться с помощью протокола XMPP (Jabber) +Icon=/usr/share/icons/tkabber.xpm +Exec=/usr/bin/tkabber +Terminal=false +Categories=Network;InstantMessaging; --- tkabber-0.11.1.orig/debian/rules +++ tkabber-0.11.1/debian/rules @@ -0,0 +1,52 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +manpages = debian/tkabber.1 + +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh_testdir + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + dh_clean build-stamp install-stamp + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_prep + dh_installdirs + make PREFIX=/usr DESTDIR=$(CURDIR)/debian/tkabber install-bin install-examples + cp debian/tkabber.xpm $(CURDIR)/debian/tkabber/usr/share/pixmaps + chmod 644 $(CURDIR)/debian/tkabber/usr/share/tkabber/tkabber.tcl + touch $@ + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_install + dh_installdocs + dh_installchangelogs ChangeLog + dh_installman $(manpages) + dh_installexamples examples/* + dh_installmenu + + dh_compress -X.tcl -X.xrdb + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep + +.PHONY: build clean install binary-indep binary + --- tkabber-0.11.1.orig/debian/tkabber.xpm +++ tkabber-0.11.1/debian/tkabber.xpm @@ -0,0 +1,249 @@ +/* XPM */ +static char * tkabber_xpm[] = { +"32 32 214 2", +" c None", +". c #156FFF", +"+ c #0072FF", +"@ c #2273FF", +"# c #0068FF", +"$ c #56D220", +"% c #76E42D", +"& c #97F44C", +"* c #5BA6EF", +"= c #5C9CFF", +"- c #5695FF", +"; c #4D8EFF", +"> c #2D84FF", +", c #3698BD", +"' c #137FDF", +") c #0064FF", +"! c #43C239", +"~ c #73CD73", +"{ c #8FCEB8", +"] c #A1D7C3", +"^ c #8CB6FF", +"/ c #80B1FF", +"( c #6EA6FF", +"_ c #689EFE", +": c #4890EC", +"< c #56C15F", +"[ c #349B94", +"} c #046DF7", +"| c #3CB24A", +"1 c #74D269", +"2 c #9BD9A3", +"3 c #91BFFF", +"4 c #96BAFE", +"5 c #56B78A", +"6 c #51C545", +"7 c #0E89A1", +"8 c #006BE6", +"9 c #0B957A", +"0 c #63BA8F", +"a c #89CEA4", +"b c #91C4EA", +"c c #99C0FD", +"d c #AECBFD", +"e c #C1D4EE", +"f c #71A8FF", +"g c #61A3FF", +"h c #5CC750", +"i c #47BC3D", +"j c #30AD36", +"k c #019177", +"l c #3A7FFE", +"m c #7DACFF", +"n c #C5D9FF", +"o c #D7E3F1", +"p c #62AAE0", +"q c #6ECB77", +"r c #60CB53", +"s c #46BF47", +"t c #37B33B", +"u c #21A738", +"v c #0060FF", +"w c #5192FE", +"x c #79BDC6", +"y c #83DE6E", +"z c #74D55E", +"A c #53C252", +"B c #39B746", +"C c #179450", +"D c #0066F6", +"E c #81B2FF", +"F c #77BCD2", +"G c #98E568", +"H c #83DB65", +"I c #019F37", +"J c #0177AF", +"K c #4A8CFE", +"L c #8FB9FF", +"M c #98D2C3", +"N c #92DB96", +"O c #A4EC77", +"P c #7ADC64", +"Q c #69D152", +"R c #54C14A", +"S c #36B544", +"T c #259D2F", +"U c #1D66F9", +"V c #9DCEDB", +"W c #A9E4A7", +"X c #A3E795", +"Y c #94D79A", +"Z c #98EC66", +"` c #80D481", +" . c #75CC80", +".. c #70D858", +"+. c #55C848", +"@. c #008768", +"#. c #378AFF", +"$. c #90BDFF", +"%. c #8ABBF5", +"&. c #82B7EA", +"*. c #6BBCB0", +"=. c #5EB5AF", +"-. c #5CCD45", +";. c #2FA436", +">. c #1675CE", +",. c #0070C8", +"'. c #93C0FF", +"). c #AEE0B2", +"!. c #ADEB8C", +"~. c #9DE384", +"{. c #76C2B1", +"]. c #5098EE", +"^. c #4292DA", +"/. c #5FD43B", +"(. c #56CD32", +"_. c #42AA84", +":. c #39AC66", +"<. c #2AAB51", +"[. c #26AA3A", +"}. c #0962FC", +"|. c #3079FF", +"1. c #75AEFF", +"2. c #A4D6C9", +"3. c #A9EB7E", +"4. c #94E862", +"5. c #7BDC45", +"6. c #67D544", +"7. c #2993B1", +"8. c #2AA470", +"9. c #0D84C8", +"0. c #0077FF", +"a. c #2A938C", +"b. c #006BFF", +"c. c #076DFF", +"d. c #95CADD", +"e. c #93E96A", +"f. c #83E05A", +"g. c #75D94A", +"h. c #5AD036", +"i. c #67D23A", +"j. c #52C92F", +"k. c #0085B5", +"l. c #2CA767", +"m. c #42BE2C", +"n. c #128CBD", +"o. c #1F7EFF", +"p. c #81B6FD", +"q. c #79D650", +"r. c #56C535", +"s. c #4BC327", +"t. c #41BB1D", +"u. c #0971D0", +"v. c #4587FF", +"w. c #006AFF", +"x. c #5494FF", +"y. c #4CB480", +"z. c #48C331", +"A. c #33B21E", +"B. c #31A91F", +"C. c #1FA81D", +"D. c #3DA08D", +"E. c #2B6CF8", +"F. c #30A36A", +"G. c #28AE24", +"H. c #29A526", +"I. c #37939A", +"J. c #1B7DBC", +"K. c #119C25", +"L. c #4F8FFF", +"M. c #287CD6", +"N. c #005EF7", +"O. c #5875F2", +"P. c #7287F2", +"Q. c #788FF4", +"R. c #6785F6", +"S. c #2F5EC1", +"T. c #0049F4", +"U. c #3345E5", +"V. c #3647E7", +"W. c #574AE3", +"X. c #6559E4", +"Y. c #7966E6", +"Z. c #6053E5", +"`. c #536DBA", +" + c #696D70", +".+ c #4866AB", +"++ c #3051D1", +"@+ c #545CE9", +"#+ c #5C64EB", +"$+ c #5165E9", +"%+ c #5363D3", +"&+ c #6678AE", +"*+ c #898B88", +"=+ c #6C6E6B", +"-+ c #6F716E", +";+ c #7A7F82", +">+ c #7A8189", +",+ c #7C8895", +"'+ c #828991", +")+ c #878986", +"!+ c #8A8C89", +"~+ c #757774", +"{+ c #787A77", +"]+ c #828481", +"^+ c #636562", +"/+ c #737572", +"(+ c #7C7E7B", +"_+ c #535452", +":+ c #5D5F5C", +"<+ c #696B68", +"[+ c #181917", +"}+ c #333432", +"|+ c #40413F", +"1+ c #2B2C2A", +" . + @ + . # ", +" $ % & * = - ; > , ' # ) ", +" ! ~ { ] ^ / ( _ - : < [ } ) ", +" | 1 2 3 4 ^ ^ / ( = ; 5 6 | 7 8 ", +" 9 0 a b 3 c d e / f g - 0 h i j k ) ", +" # l = m 4 c n o d m m ( p q r s t u 8 v ", +" @ w ( ^ 4 c ^ ^ / m ( x y z r A B u C D ", +" @ > - E 3 c 3 4 / / ( F G H z 1 A | | I J v ", +" ) K _ E 3 4 L ^ M { N O P P Q r R S | T J v ", +" U K m L 4 3 V W X Y Z ` ...Q +.R | I I @.) ", +" ) #.m 3 4 $.%.&.g = *.=.q -.-.6 i t ;.>.,.v ", +" # > E 4 '.).!.~.{.].#.^./.(._.! :.<.[.# }.) ", +" ) |.1.c 2.!.3.G 4.5.6._.7.$ 8.9.@ 0.a.b.) v ", +" @ c.- L d.3.e.f.g.h.i.j.k.l.m.n.|.o.' o.# ) ", +" ) > m p.a G q.q.r.s.t.j u.' o.v.#.v.o.) ", +" ) w.- _ x.: y.z.m.A.B.C.u D.; - = - o.) ", +" v |.v.o.|.E.F.i G.B.H.I.- _ _ g - . ", +" ) # } @ . # J.B.H.K.;.: ( E / ( o.) ", +" v ) ) # ) D C T ;.[ g E 4 m L.) ", +" v ) ) v }.) ,.M.L.^ 4 E = ) ", +" v v v v N.v # l _ 3 ^ _ |.v ", +" v ) ) v ) @ v.g ^ 1.- ) ", +" v v v ) . 0.v._ m ( o.) ", +" v v v ) ) E.O.P.Q.R.U N. ", +" S.T.T.U.V.W.X.Y.Y.Z.U.`. ", +" +.+++U.V.Z.@+#+$+%+&+*+ ", +" =+-+;+;+>+,+'+)+!+)+!+!+ ", +" + +~+{+;+]+;+!+'+'+!+!+ ", +" ^+ +/+{+(+;+)+*+'+;+ ", +" _+:+ +-+/+{+/+<+ ", +" [+}+|+_+_+1+ ", +" [+1+|+1+ "}; --- tkabber-0.11.1.orig/debian/tkabber.install +++ tkabber-0.11.1/debian/tkabber.install @@ -0,0 +1 @@ +debian/tkabber.desktop usr/share/applications/ --- tkabber-0.11.1.orig/debian/dirs +++ tkabber-0.11.1/debian/dirs @@ -0,0 +1 @@ +usr/share/pixmaps --- tkabber-0.11.1.orig/debian/watch +++ tkabber-0.11.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://files.jabber.ru/tkabber/tkabber.*-([\d+\.]+|\d+).tar.gz debian uupdate --- tkabber-0.11.1.orig/debian/copyright +++ tkabber-0.11.1/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Jonas Meurer on +Mon, 2 Dec 2002 23:55:34 +0100. + +It was downloaded from http://tkabber.jabber.ru/download + +Upstream Author: Alexey Shchepin + +Copyright (c) 2002-2008 Alexey Shchepin + + + + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL'. --- tkabber-0.11.1.orig/debian/tkabber.1 +++ tkabber-0.11.1/debian/tkabber.1 @@ -0,0 +1,58 @@ +.TH "TKABBER" "1" +.SH "NAME" +Tkabber \(em a GUI client for XMPP (Jabber) instant messaging protocol + +.SH "SYNOPSIS" +.PP +\fBtkabber\fR [\fBoptions\fP] + +.SH "DESCRIPTION" +.PP +Tkabber is a GUI client for XMPP (Jabber) instant messaging +protocol. It provides full support for basic XMPP specifications +as well as many extensions (XEPs) including multi-user conferencing, +file transfers, extensive handling of privacy lists and much more. +Tkabber is written in Tcl/Tk and thus is easily extensible. +.PP +This manual page was written for the \fBDebian\fP distribution +because the original program does not have a manual page. + +.SH "OPTIONS" +.IP "\fB\-colormap\fP" 10 +Colormap for main window +.IP "\fB\-display\fP" 10 +Display to use +.IP "\fB\-geometry\fP" 10 +Initial geometry for window +.IP "\fB\-name\fP" 10 +Name to use for application (default: tkabber) +.IP "\fB\-splash\fP" 10 +Display the initial splash screen (default: yes) +.IP "\fB\-sync\fP" 10 +Use synchronous mode for display server +.IP "\fB\-visual\fP" 10 +Visual for main window +.IP "\fB\-use\fP" 10 +Id of window in which to embed application +.IP "\fB\-\-\fP" 10 +Pass all remaining arguments through to script + +.SH "SEE ALSO" +.PP +Tkabber reference manual: /usr/share/doc/tkabber/tkabber.html + +Tkabber WWW site: http://tkabber.jabber.ru/ + +Tkabber wiki pages: http://tkabber.jabe.ru/ + +.BR tkabber-plugins (7) + +.SH "AUTHOR" +.PP +This manual page was written by Jonas Meurer for +the \fBDebian\fP system (but may be used by others). Permission is +granted to copy, distribute and/or modify this document under +the terms of the GNU Free Documentation +License, Version 1.1 or any later version published by the Free +Software Foundation; with no Invariant Sections, no Front-Cover +Texts and no Back-Cover Texts. --- tkabber-0.11.1.orig/debian/docs +++ tkabber-0.11.1/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +doc/tkabber.html --- tkabber-0.11.1.orig/debian/compat +++ tkabber-0.11.1/debian/compat @@ -0,0 +1 @@ +7 --- tkabber-0.11.1.orig/debian/menu +++ tkabber-0.11.1/debian/menu @@ -0,0 +1,7 @@ +?package(tkabber): \ + needs="X11" \ + section="Applications/Network/Communication" \ + title="Tkabber" \ + command="/usr/bin/tkabber" \ + longtitle="XMPP (Jabber) Instant Messaging Client" \ + icon="/usr/share/pixmaps/tkabber.xpm" --- tkabber-0.11.1.orig/debian/control +++ tkabber-0.11.1/debian/control @@ -0,0 +1,24 @@ +Source: tkabber +Section: net +Priority: optional +Maintainer: Konstantin Khomoutov +Build-Depends: debhelper (>= 7.0.0), quilt (>= 0.40) +Standards-Version: 3.8.4 +Homepage: http://tkabber.jabber.ru +Vcs-git: git://git.debian.org/collab-maint/tkabber.git +Vcs-browser: http://git.debian.org/?p=collab-maint/tkabber.git + +Package: tkabber +Architecture: all +Depends: tk | wish, bwidget, tcllib, ${misc:Depends} +Recommends: tcl-tls, libtk-img, libudp-tcl +Suggests: tkabber-plugins (>= 0.11.1), libsnack2 +Description: GUI client for XMPP (Jabber) instant messaging protocol + Tkabber is a GUI client for XMPP (Jabber) instant messaging protocol. + It provides full support of basic XMPP specifications as well as many + protocol extensions (XEPs), such as multi-user conferencing, + file transfers, extensive handling of privacy lists and much more. + Tkabber is written in Tcl/Tk and thus is easily extensible. + . + Also a rich set of Tkabber external plugins is available + in the package named "tkabber-plugins". --- tkabber-0.11.1.orig/debian/README.source +++ tkabber-0.11.1/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt for its patch management, see +/usr/share/doc/quilt/README.source if you are unfamiliar with it. --- tkabber-0.11.1.orig/debian/tkabber.doc-base +++ tkabber-0.11.1/debian/tkabber.doc-base @@ -0,0 +1,15 @@ +Document: tkabber +Title: Manual for Tkabber, an XMPP client +Author: Various +Abstract: Tkabber is a GUI client for XMPP (Jabber) instant messaging protocl. + This document describes how to use Tkabber and configure all aspects + of its behaviour, including advanced topics. +Section: Network/Communication + +Format: text +Files: /usr/share/doc/tkabber/README.gz + +Format: HTML +Index: /usr/share/doc/tkabber/tkabber.html +Files: /usr/share/doc/tkabber/tkabber.html + --- tkabber-0.11.1.orig/debian/patches/Makefile.patch +++ tkabber-0.11.1/debian/patches/Makefile.patch @@ -0,0 +1,24 @@ +Remove bashism in install-bin target: "echo" can be either +builtin or external command, and being implemented as a builtin +in certain shells, like dash, it doesn't support the "-e" option. +So we resort to using three calls to "echo". + +This is fixed in upstrem revision 1849. + +diff --git a/Makefile b/Makefile +index 1371c94..be1efc2 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,8 +22,10 @@ install-bin: + mkdir -p $(DESTDIR)/$(TKABBERDIR) + cp -r *.tcl $(SUBDIRS) $(DESTDIR)/$(TKABBERDIR) + mkdir -p $(DESTDIR)/$(BINDIR) +- echo -e "#!/bin/sh\nexec wish $(TKABBERDIR)/tkabber.tcl -name tkabber \"\$$@\"\n" \ +- >$(DESTDIR)/$(BINDIR)/tkabber ++ echo '#!/bin/sh' >$(DESTDIR)/$(BINDIR)/tkabber ++ echo "exec wish $(TKABBERDIR)/tkabber.tcl -name tkabber \"\$$@\"" \ ++ >>$(DESTDIR)/$(BINDIR)/tkabber ++ echo >>$(DESTDIR)/$(BINDIR)/tkabber + chmod 755 $(DESTDIR)/$(BINDIR)/tkabber + + install-doc: --- tkabber-0.11.1.orig/debian/patches/roster-import-rfc3921bis.patch +++ tkabber-0.11.1/debian/patches/roster-import-rfc3921bis.patch @@ -0,0 +1,97 @@ +This patch enables sending roster contacts to the server +each in its own stanza, as RFC 3921bis requires. + +This is a backport of the change introduced upstream +in the revision 1921 of http://svn.xmpp.ru/repos/tkabber/trunk/tkabber + +This closes Debian bug #567628. + +Index: tkabber-0.11.1/plugins/roster/backup.tcl +=================================================================== +--- tkabber-0.11.1.orig/plugins/roster/backup.tcl 2010-02-26 02:52:33.000000000 +0300 ++++ tkabber-0.11.1/plugins/roster/backup.tcl 2010-02-26 03:06:26.000000000 +0300 +@@ -240,20 +240,29 @@ + proc rosterbackup::send_contacts {connid contacts continuation} { + global NS + ++ set contact [lindex $contacts 0] + jlib::send_iq set \ + [jlib::wrapper:createtag query \ + -vars [list xmlns $NS(roster)] \ +- -subtags $contacts] \ ++ -subtags [list $contact]] \ + -connection $connid \ +- -command [namespace code [list process_send_result $continuation]] ++ -command [namespace code [list process_send_result $connid \ ++ [lrange $contacts 1 end] \ ++ [get_item_jid $contact] \ ++ $continuation]] + } + + ############################################################################### + +-proc rosterbackup::process_send_result {continuation result xmldata} { ++proc rosterbackup::process_send_result {connid contacts jid ++ continuation result xmldata} { + switch -- $result { + OK { +- eval $continuation ++ if {[llength $contacts] > 0} { ++ send_contacts $connid $contacts $continuation ++ } else { ++ eval $continuation ++ } + } + default { + # TODO check whether do we need to handle TIMEOUT specially +@@ -261,8 +270,8 @@ + -aspect 50000 \ + -icon error \ + -title [::msgcat::mc "Error"] \ +- -message [::msgcat::mc "Error restoring roster contacts: %s" \ +- [error_to_string $xmldata]] ++ -message [::msgcat::mc "Error importing roster contact %s: %s" \ ++ $jid [error_to_string $xmldata]] + } + } + } +Index: tkabber-0.11.1/msgs/de.msg +=================================================================== +--- tkabber-0.11.1.orig/msgs/de.msg 2010-02-26 02:52:33.000000000 +0300 ++++ tkabber-0.11.1/msgs/de.msg 2010-02-26 03:06:26.000000000 +0300 +@@ -1698,7 +1698,7 @@ + ::msgcat::mcset de "Storing roster notes failed: %s" "Sichern der Roster-Notizen misslungen: %s" + + # .../plugins/roster/backup.tcl +-::msgcat::mcset de "Error restoring roster contacts: %s" "Fehler bei der Wiederherstellung der Roster-Kontakte: %s" ++::msgcat::mcset de "Error importing roster contact %s: %s" "Fehler beim Import des Roster-Kontaktes %s: %s" + ::msgcat::mcset de "Roster restoration completed" "Roster-Wiederherstellung abgeschlossen" + + # .../plugins/roster/bkup_annotations.tcl +Index: tkabber-0.11.1/msgs/ru.msg +=================================================================== +--- tkabber-0.11.1.orig/msgs/ru.msg 2010-02-26 02:52:33.000000000 +0300 ++++ tkabber-0.11.1/msgs/ru.msg 2010-02-26 03:06:26.000000000 +0300 +@@ -609,8 +609,8 @@ + заметок: %s" + ::msgcat::mcset ru "Error restoring conference bookmarks: %s" "Ошибка\ + восстановления закладок на конференции: %s" +-::msgcat::mcset ru "Error restoring roster contacts: %s" "Ошибка\ +- восстановления содержимого списка контактов: %s" ++::msgcat::mcset ru "Error importing roster contact %s: %s" "Ошибка\ ++ восстановления элемента списка контактов %s: %s" + ::msgcat::mcset ru "Error while converting screenname: %s." "Ошибка при\ + преобразовании экранного имени: %s" + ::msgcat::mcset ru "Error:" "Ошибка:" +Index: tkabber-0.11.1/msgs/es.msg +=================================================================== +--- tkabber-0.11.1.orig/msgs/es.msg 2010-02-26 03:06:34.000000000 +0300 ++++ tkabber-0.11.1/msgs/es.msg 2010-02-26 03:07:54.000000000 +0300 +@@ -367,6 +367,7 @@ + ::msgcat::mcset es "Error restoring annotations: %s" "Error restaurando las anotaciones: %s" + ::msgcat::mcset es "Error restoring conference bookmarks: %s" "Error restaurando marcadores de conferencias: %s" + ::msgcat::mcset es "Error restoring roster contacts: %s" "Error restaurando la lista de contactos: %s" ++::msgcat::mcset es "Error importing roster contact %s: %s" "Error restaurando el contacto %s del roster: %s" + ::msgcat::mcset es "Error while converting screenname: %s." "Error al convertir la dirección de contacto: %s." + ::msgcat::mcset es "Error" "Error" + ::msgcat::mcset es "Error:" "Error:" --- tkabber-0.11.1.orig/debian/patches/jlib-disconnect.patch +++ tkabber-0.11.1/debian/patches/jlib-disconnect.patch @@ -0,0 +1,18 @@ +Fixes error which is triggered when [jlib::disconnect] is called +on an already disconnected $connid. +This bug was able to manifect itself in certain cases when +disconnecting occurs on failed login attempt. + +diff --git a/jabberlib/jabberlib.tcl b/jabberlib/jabberlib.tcl +index 7d00040..4ba8afb 100644 +--- a/jabberlib/jabberlib.tcl ++++ b/jabberlib/jabberlib.tcl +@@ -425,7 +425,7 @@ proc jlib::disconnect {connid} { + ::LOG "(jlib::disconnect) $connid" + + set idx [lsearch -exact $lib(connections) $connid] +- if {$idx < 0} continue ++ if {$idx < 0} return + + set lib(connections) [lreplace $lib(connections) $idx $idx] + --- tkabber-0.11.1.orig/debian/patches/ssl-gtalk-workaround.patch +++ tkabber-0.11.1/debian/patches/ssl-gtalk-workaround.patch @@ -0,0 +1,18 @@ +Fixed problem with connecting to Google Talk servers the implementation +of which seems to deviate from the TLS/SSL protocol standards. + +This patch turns off forced selection of particular TLS/SSL protorol +versions relying of OpenSSL to select the best version that works. + +--- tkabber/jabberlib/transports.tcl.orig 2008-11-09 16:04:09.000000000 +0300 ++++ tkabber/jabberlib/transports.tcl 2008-11-09 16:04:19.000000000 +0300 +@@ -348,9 +348,6 @@ + + eval [list tls::import $sock \ + -command [list client:tls_callback $connid] \ +- -ssl2 false \ +- -ssl3 true \ +- -tls1 true \ + -request true \ + -require false \ + -server false] $args --- tkabber-0.11.1.orig/debian/patches/series +++ tkabber-0.11.1/debian/patches/series @@ -0,0 +1,4 @@ +ssl-gtalk-workaround.patch +Makefile.patch +jlib-disconnect.patch +roster-import-rfc3921bis.patch