From: Guus Sliepen Date: Tue, 23 Sep 2008 13:40:06 +0000 (+0200) Subject: Import Debian changes 1.14-1 X-Git-Tag: debian/1.14-1^0 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fsendxmpp.git;a=commitdiff_plain;h=40f7804e4012d30a24ee3b3da8726168ff4ddf6d;hp=-c Import Debian changes 1.14-1 sendxmpp (1.14-1) unstable; urgency=low * New upstream release. - Allow specification of alternative hostname for server. Closes: #497829 * Bump Standards-Version. * Rename build-arch to build-indep in debian/rules. --- 40f7804e4012d30a24ee3b3da8726168ff4ddf6d diff --combined debian/changelog index 847c7d6,0000000..620acc9 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,44 -1,0 +1,53 @@@ ++sendxmpp (1.14-1) unstable; urgency=low ++ ++ * New upstream release. ++ - Allow specification of alternative hostname for server. Closes: #497829 ++ * Bump Standards-Version. ++ * Rename build-arch to build-indep in debian/rules. ++ ++ -- Guus Sliepen Tue, 23 Sep 2008 15:40:06 +0200 ++ +sendxmpp (1.13-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix !$port to $port. Closes #496823 + + -- Andreas Barth Sun, 21 Sep 2008 09:08:06 +0000 + +sendxmpp (1.13-1) unstable; urgency=low + + * New upstream release. + + -- Guus Sliepen Thu, 13 Sep 2007 16:38:28 +0200 + +sendxmpp (0.0.8+cvs20061115-1) unstable; urgency=low + + * New upstream release. Closes: #356258, #397396 + + -- Guus Sliepen Wed, 15 Nov 2006 12:22:07 +0100 + +sendxmpp (0.0.8-1) unstable; urgency=low + + * New upstream release. + + -- Guus Sliepen Wed, 18 May 2005 11:21:14 +0200 + +sendxmpp (0.0.7.1-1) unstable; urgency=low + + * New upstream release. + + -- Guus Sliepen Wed, 4 May 2005 12:22:51 +0200 + +sendxmpp (0.0.5-2) unstable; urgency=low + + * It's just a script and a manpage, so set Architecture: all. + + -- Guus Sliepen Wed, 8 Dec 2004 13:18:44 +0100 + +sendxmpp (0.0.5-1) unstable; urgency=low + + * Initial Release. + * Fix NAME section in manpage. + + -- Guus Sliepen Sat, 4 Dec 2004 16:14:06 +0100 + diff --combined debian/control index 33b9aa9,0000000..809223d mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,14 -1,0 +1,14 @@@ +Source: sendxmpp +Section: net +Priority: optional +Maintainer: Guus Sliepen +Build-Depends: debhelper (>= 4.0.0), perl - Standards-Version: 3.7.2 ++Standards-Version: 3.8.0 + +Package: sendxmpp +Architecture: all +Depends: ${perl:Depends}, ${misc:Depends}, libnet-xmpp-perl +Description: commandline XMPP (jabber) utility + sendxmpp is a perl script to send XMPP (jabber) messages, similar to what + mail(1) does for mail. XMPP is an open, non-proprietary protocol for instant + messaging. See www.jabber.org for more information. diff --combined debian/rules index 932470d,0000000..3f7052b mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,102 -1,0 +1,102 @@@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + #$(MAKE) + pod2man sendxmpp > sendxmpp.1 + #docbook-to-man debian/sendxmpp.sgml > sendxmpp.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + #-$(MAKE) clean + rm -f sendxmpp.1 + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/sendxmpp. + #$(MAKE) install DESTDIR=$(CURDIR)/debian/sendxmpp + install sendxmpp debian/sendxmpp/usr/bin/ + install -m 422 sendxmpp.1 debian/sendxmpp/usr/share/man/man1/ + + +# Build architecture-independent files here. - binary-indep: build install ++binary-arch: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. - binary-arch: build install ++binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs Changes + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --combined sendxmpp index fc9d65b,3d870ef..6120777 --- a/sendxmpp +++ b/sendxmpp @@@ -16,7 -16,7 +16,7 @@@ if 0; # not running under some shel # # Released under the terms of the GNU General Public License v2 # - # $Platon: sendxmpp/sendxmpp,v 1.13 2007-09-10 19:08:35 rajo Exp $ + # $Platon: sendxmpp/sendxmpp,v 1.14 2008-08-25 09:54:12 rajo Exp $ # $Id: $ use Authen::SASL qw(Perl); # authentication broken if Authen::SASL::Cyrus module installed @@@ -44,7 -44,7 +44,7 @@@ sub terminate() sub main(); my # MakeMaker - $VERSION = [ q$Revision: 1.13 $ =~ m/(\S+)\s*$/g ]->[0]; + $VERSION = [ q$Revision: 1.14 $ =~ m/(\S+)\s*$/g ]->[0]; my $RESOURCE = 'sendxmpp'; my $VERBOSE = 0; my $DEBUG = 0; @@@ -148,8 -148,8 +148,8 @@@ sub read_config_file ($) #s/\#.*$//; # ignore comments in lines - # Hugo van der Kooij has ccount with '#' as username - if (/([\.\w_#-]+)@([-\.\w:]+)\s+(\S+)\s*(\S+)?$/) { + # Hugo van der Kooij has account with '#' as username + if (/([\.\w_#-]+)@([-\.\w:;]+)\s+(\S+)\s*(\S+)?$/) { %config = ( 'username' => $1, 'jserver' => $2, @@@ -158,15 -158,23 +158,23 @@@ 'component' => $4, ); - if ($config{'jserver'} =~ /(.*):(\d+)/) { - $config{'jserver'} = $1; - $config{'port'} = $2; - } } else { close CFG; error_exit ("syntax error in line $line of $cfg_file"); } + + # account with weird port number + if ($config{'jserver'} =~ /(.*):(\d+)/) { + $config{'jserver'} = $1; + $config{'port'} = $2; + } + + # account with specific connection host + if ($config{'jserver'} =~ /(.*);([-\.\w]+)/) { + $config{'jserver'} = $2; + $config{'username'} .= "\@$1"; + } } close CFG; @@@ -281,7 -289,7 +289,7 @@@ sub xmpp_login ($$$$$$$$) connectiontype => 'tcpip', componentname => $comp }; - $arghash->{port} = $port if (!$port); + $arghash->{port} = $port if ($port); if (!$port) { @res = $cnx->Connect(%$arghash); error_exit ("Could not connect to server '$host': $@") unless @res;