Index: contrib/ssh-copy-id
===================================================================
RCS file: /home/cjwatson/cvs/openssh/openssh/contrib/ssh-copy-id,v
retrieving revision 1.7
diff -p -u -r1.7 ssh-copy-id
--- contrib/ssh-copy-id	22 Jul 2008 19:45:18 -0000	1.7
+++ contrib/ssh-copy-id	9 Oct 2008 11:54:47 -0000
@@ -38,10 +38,10 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || 
   exit 1
 fi
 
-{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
+{ eval "$GET_ID" ; } | ssh ${1%:} "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
 
 cat <<EOF
-Now try logging into the machine, with "ssh '$1'", and check in:
+Now try logging into the machine, with "ssh '${1%:}'", and check in:
 
   .ssh/authorized_keys
 
Index: debian/changelog
===================================================================
RCS file: /home/cjwatson/cvs/openssh/openssh/debian/changelog,v
retrieving revision 1.512
diff -p -u -r1.512 changelog
--- debian/changelog	30 Sep 2008 22:17:34 -0000	1.512
+++ debian/changelog	9 Oct 2008 11:54:48 -0000
@@ -1,3 +1,10 @@
+openssh (1:5.1p1-4) UNRELEASED; urgency=low
+
+  * ssh-copy-id: Strip trailing colons from hostname (closes: #226172,
+    LP: #249706; thanks to Karl Goetz for nudging this along).
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 09 Oct 2008 12:52:34 +0100
+
 openssh (1:5.1p1-3) unstable; urgency=low
 
   * Remove unnecessary ssh-vulnkey output in non-verbose mode when no