Import Debian changes 1.22-1

sendxmpp (1.22-1) unstable; urgency=low

  * New upstream release. Closes: #607074
    - Fixes altering jid unnecessarily. Closes: #559716
  * Bump Standards-Version.
  * Add build-arch and build-indep targets to debian/rules.

diff --git a/debian/changelog b/debian/changelog
index e489738..a862342 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sendxmpp (1.22-1) unstable; urgency=low
+
+  * New upstream release. Closes: #607074
+    - Fixes altering jid unnecessarily. Closes: #559716
+  * Bump Standards-Version.
+  * Add build-arch and build-indep targets to debian/rules.
+
+ -- Guus Sliepen <guus@debian.org>  Mon, 14 Nov 2011 10:46:59 +0100
+
 sendxmpp (1.20-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index b22f6d9..68253e6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Guus Sliepen <guus@debian.org>
 Build-Depends: debhelper (>= 7.0.0), perl
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 
 Package: sendxmpp
 Architecture: all

diff --git a/debian/rules b/debian/rules
index e0b4109..f96d9fb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,9 @@ configure-stamp:
 
        touch configure-stamp
 
-
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir

diff --git a/sendxmpp b/sendxmpp
index 4a86f6e..b78fbc2 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.20 2010-01-18 00:54:16 rajo Exp $
+# $Platon: sendxmpp/sendxmpp,v 1.22 2010-10-03 19:36:35 rajo Exp $
 # $Id: $
 
 use Authen::SASL qw(Perl); # authentication broken if Authen::SASL::Cyrus module installed
@@ -44,7 +44,7 @@ sub terminate();
 sub main();
 
 my # MakeMaker
-$VERSION       = [ q$Revision: 1.20 $ =~ m/(\S+)\s*$/g ]->[0];
+$VERSION       = [ q$Revision: 1.22 $ =~ m/(\S+)\s*$/g ]->[0];
 my $RESOURCE = 'sendxmpp';
 my $VERBOSE  = 0;
 my $DEBUG    = 0;
@@ -178,7 +178,7 @@ sub read_config_file ($) {
                # account with specific connection host
                if ($config{'jserver'}  =~ /(.*);([-\.\w]+)/) {
                        $config{'jserver'}      = $2;
-                       $config{'username'}     .= "\@$1";
+                       $config{'username'}     .= "\@$1" unless $config{'component'};
                }
        }
 
@@ -405,7 +405,8 @@ sub xmpp_send_message ($$$$$$) {
     my ($cnx, $rcpt, $comp, $subject, $message_type, $msg) = @_;
 
     # for some reason, MessageSend does not return anything
-    $cnx->MessageSend('to'      => $rcpt . ( $comp ? "\@$comp" : '' ),
+       # mimeit01@xmpp.hs-esslingen.de: if $comp IS set, AND the rcpt DOESN'T contain an @, then @comp is added
+    $cnx->MessageSend('to'      => $rcpt . ( ($comp && index($rcpt, "@") == -1) ? "\@$comp" : '' ),
                'type'          => $message_type,
                'subject'       => $subject,
                'body'          => $msg);