Import Debian changes 1.18-1

sendxmpp (1.18-1) unstable; urgency=low

  * New upstream release.
    - Sets correct message type. Closes: #520110

diff --git a/debian/changelog b/debian/changelog
index 2adf6aa..89c92cd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sendxmpp (1.18-1) unstable; urgency=low
+
+  * New upstream release.
+    - Sets correct message type. Closes: #520110
+
+ -- Guus Sliepen <guus@debian.org>  Wed, 10 Jun 2009 17:20:25 +0200
+
 sendxmpp (1.15-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index 809223d..21e13fc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: sendxmpp
 Section: net
 Priority: optional
 Maintainer: Guus Sliepen <guus@debian.org>
-Build-Depends: debhelper (>= 4.0.0), perl
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.0), perl
+Standards-Version: 3.8.1
 
 Package: sendxmpp
 Architecture: all

diff --git a/debian/rules b/debian/rules
index 3f7052b..e0b4109 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,9 @@
 #!/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)))
@@ -23,7 +15,6 @@ endif
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       # Add here commands to configure the package.
 
        touch configure-stamp
 
@@ -33,10 +24,7 @@ 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
 
@@ -45,8 +33,6 @@ clean:
        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 
@@ -54,11 +40,9 @@ clean:
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_prep
        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/
 
@@ -74,24 +58,12 @@ binary-indep: build install
        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

diff --git a/sendxmpp b/sendxmpp
index d5546ce..d20f56b 100755 (executable)
--- a/sendxmpp
+++ b/sendxmpp
@@ -16,7 +16,7 @@ if 0; # not running under some shell
 #
 # Released under the terms of the GNU General Public License v2
 #
-# $Platon: sendxmpp/sendxmpp,v 1.15 2008-10-21 21:31:53 rajo Exp $
+# $Platon: sendxmpp/sendxmpp,v 1.18 2009-01-10 11:40:14 rajo Exp $
 # $Id: $
 
 use Authen::SASL qw(Perl); # authentication broken if Authen::SASL::Cyrus module installed
@@ -44,12 +44,13 @@ sub terminate();
 sub main();
 
 my # MakeMaker
-$VERSION       = [ q$Revision: 1.15 $ =~ m/(\S+)\s*$/g ]->[0];
+$VERSION       = [ q$Revision: 1.18 $ =~ m/(\S+)\s*$/g ]->[0];
 my $RESOURCE = 'sendxmpp';
 my $VERBOSE  = 0;
 my $DEBUG    = 0;
-my @suppported_message_types   = qw( message chat headline );
-my $message_type                               = 'message'; # default message type
+# http://tools.ietf.org/html/rfc3921#section-2  section 2.1.1 - Types of Message
+my @suppported_message_types   = qw( chat error groupchat headline );
+my $message_type                               = 'chat'; # default message type
 
 # start!
 &main;
@@ -307,13 +308,14 @@ sub xmpp_login ($$$$$$$$) {
                connectiontype  => 'tcpip',
                componentname   => $comp
        };
-       $arghash->{port} = $port if ($port);
-       if (!$port) {
+
+       delete $arghash->{port} unless $port; 
+       if ($arghash->{port}) {
                @res = $cnx->Connect(%$arghash);
-               error_exit ("Could not connect to server '$host': $@") unless @res;
+               error_exit ("Could not connect to '$host' on port $port: $@") unless @res;
        } else {
                @res = $cnx->Connect(%$arghash);
-               error_exit ("Could not connect to '$host' on port $port: $@") unless @res;
+               error_exit ("Could not connect to server '$host': $@") unless @res;
        }
 
     xmpp_check_result("Connect",\@res,$cnx);