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.

diff --git a/debian/changelog b/debian/changelog
index 847c7d6..620acc9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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 <guus@debian.org>  Tue, 23 Sep 2008 15:40:06 +0200
+
 sendxmpp (1.13-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.

diff --git a/debian/control b/debian/control
index 33b9aa9..809223d 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 (>= 4.0.0), perl
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
 
 Package: sendxmpp
 Architecture: all

diff --git a/debian/rules b/debian/rules
index 932470d..3f7052b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -64,11 +64,11 @@ install: build
 
 
 # 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

diff --git a/sendxmpp b/sendxmpp
index fc9d65b..6120777 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.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 @@ 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 @@ sub read_config_file ($) {
 
                #s/\#.*$//; # ignore comments in lines
 
-               # Hugo van der Kooij <hvdkooij AT vanderkooij.org> has ccount with '#' as username
-               if (/([\.\w_#-]+)@([-\.\w:]+)\s+(\S+)\s*(\S+)?$/) {
+               # Hugo van der Kooij <hvdkooij AT vanderkooij.org> has account with '#' as username
+               if (/([\.\w_#-]+)@([-\.\w:;]+)\s+(\S+)\s*(\S+)?$/) {
                        %config = (
                                'username'      => $1,
                                'jserver'       => $2, 
@@ -158,15 +158,23 @@ sub read_config_file ($) {
                                '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;