--- ssh-import-id-3.13.orig/ssh_import_id.egg-info/SOURCES.txt
+++ ssh-import-id-3.13/ssh_import_id.egg-info/SOURCES.txt
@@ -0,0 +1,9 @@
+setup.py
+bin/ssh-import-id
+bin/ssh-import-id-gh
+bin/ssh-import-id-lp
+ssh_import_id.egg-info/PKG-INFO
+ssh_import_id.egg-info/SOURCES.txt
+ssh_import_id.egg-info/dependency_links.txt
+ssh_import_id.egg-info/requires.txt
+ssh_import_id.egg-info/top_level.txt
\ No newline at end of file
--- ssh-import-id-3.13.orig/ssh_import_id.egg-info/dependency_links.txt
+++ ssh-import-id-3.13/ssh_import_id.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
--- ssh-import-id-3.13.orig/ssh_import_id.egg-info/top_level.txt
+++ ssh-import-id-3.13/ssh_import_id.egg-info/top_level.txt
@@ -0,0 +1 @@
+
--- ssh-import-id-3.13.orig/ssh_import_id.egg-info/PKG-INFO
+++ ssh-import-id-3.13/ssh_import_id.egg-info/PKG-INFO
@@ -0,0 +1,81 @@
+Metadata-Version: 1.0
+Name: ssh-import-id
+Version: 3.13
+Summary: Authorize SSH public keys from trusted online identities
+Home-page: https://launchpad.net/ssh-import-id
+Author: Casey Marshall, Dustin Kirkland
+Author-email: casey.marshall@gmail.com, dustin.kirkland@gmail.com
+License: GPLv3
+Description: 
+        ssh-import-id
+        ===========
+        
+        You're logged onto a cloud instance working on a problem with your fellow devs, and you want to invite them to log in and take a look at these crazy log messages. What do?
+        
+        Oh. You have to ask them to cat their public SSH key, paste it into IRC (wait, no, it's id\_rsa.pub, not id\_rsa silly!) then you copy it and cat it to the end of authorized\_hosts.
+        
+        That's where ssh-import-id comes in. With ssh-import-id, you can add the public SSH keys from a known, trusted online identity to grant SSH access.
+        
+        Currently supported identities include Github and Launchpad.
+        
+        Usage
+        -----
+        
+        ssh-import-id uses short prefix to indicate the location of the online identity. For now, these are:
+        
+        	'gh:' for Github
+        	'lp:' for Launchpad
+        
+        Command line help:
+        
+        	usage: ssh-import-id [-h] [-o FILE] USERID [USERID ...]
+        
+        	Authorize SSH public keys from trusted online identities.
+        
+        	positional arguments:
+          	USERID                User IDs to import
+        
+        	optional arguments:
+          	-h, --help            show this help message and exit
+          	-o FILE, --output FILE
+                                	Write output to file (default ~/.ssh/authorized_keys)
+        
+        Example
+        -------
+        
+        If you wanted me to be able to ssh into your server, as the desired user on that machine you would use:
+        
+        	$ ssh-import-id gh:cmars
+        
+        You can also import multiple users on the same line, even from different key services, like so:
+        
+        	$ ssh-import-id gh:cmars lp:kirkland
+        
+        Used with care, it's a great collaboration tool!
+        
+        Installing
+        ----------
+        
+        ssh-import-id can be installed on Python >= 2.6 with a recent version of pip:
+        
+        	$ pip install ssh-import-id
+        
+        ssh-import-id requires a recent version of Requests (>=1.1.0) for verified SSL/TLS connections.
+        
+        Extending
+        ---------
+        
+        You can add support for your own SSH public key providers by creating a script named ssh-import-id-*prefix*. Make the script executable and place it in the same bin directory as ssh-import-id.
+        
+        The script should accept the identity username for the service it connects to, and output lines in the same format as an ~/.ssh/authorized\_keys file.
+        
+        If you do develop such a handler, I recommend that you connect to the service with SSL/TLS, and require a valid certificate and matching hostname. Use Requests.get(url, verify=True), for example.
+        
+        Credits
+        -------
+        
+        This project is authored and maintained by Dustin Kirkland, Scott Moser, and Casey Marshall.
+        
+        
+Keywords: ssh public key
+Platform: any
--- ssh-import-id-3.13.orig/ssh_import_id.egg-info/requires.txt
+++ ssh-import-id-3.13/ssh_import_id.egg-info/requires.txt
@@ -0,0 +1,2 @@
+argparse
+Requests>=1.1.0
\ No newline at end of file
--- ssh-import-id-3.13.orig/debian/changelog
+++ ssh-import-id-3.13/debian/changelog
@@ -0,0 +1,312 @@
+ssh-import-id (3.13-0ubuntu1) raring; urgency=low
+
+  * debian/rules:
+    - fix FTBFS, no need to syntax check setup.py
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 15 Feb 2013 15:03:55 -0600
+
+ssh-import-id (3.12-0ubuntu1) raring; urgency=low
+
+  * debian/control:
+    - note github.com in the package description
+  * bin/ssh-import-id, ssh-import-id.1:
+    - rename the --revoke option to --remove
+    - we're not really "revoking" keys, but rather just removing them
+      from the authorized_keys file
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 15 Feb 2013 15:03:53 -0600
+
+ssh-import-id (3.11-0ubuntu1) raring; urgency=low
+
+  * bin/ssh-import-id:
+    - cleanup tempfiles left around in case we die() early
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 08 Feb 2013 12:35:13 -0600
+
+ssh-import-id (3.10-0ubuntu1) raring; urgency=low
+
+  * bin/ssh-import-id:
+    - show key type in info messages
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 07 Feb 2013 17:45:18 -0600
+
+ssh-import-id (3.9-0ubuntu1) raring; urgency=low
+
+  * bin/ssh-import-id-lp:
+    - ensure that URL is not None before using it
+    - fixes exception when URL is not defined in config file and not in
+      the environment
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 07 Feb 2013 11:33:29 -0600
+
+ssh-import-id (3.8-0ubuntu1) raring; urgency=low
+
+  * No change release; our Python and Debian/Ubuntu version numbers got
+    out of sync due to a bug in my release script
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 07 Feb 2013 11:20:40 -0600
+
+ssh-import-id (3.7-0ubuntu1) raring; urgency=low
+
+  * bin/ssh-import-id-lp:
+    - another fix for Mac OS X
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 07 Feb 2013 10:16:59 -0600
+
+ssh-import-id (3.6-0ubuntu1) raring; urgency=low
+
+  * setup.py:
+    - fix pip install on Mac
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 07 Feb 2013 09:52:36 -0600
+
+ssh-import-id (3.5-0ubuntu1) raring; urgency=low
+
+  * bin/ssh-import-id, ssh-import-id.1:
+    - support key revocation through a -r|--revoke option
+    - only revokes keys that we label as adding (starting with this release)
+  * debian/control, debian/rules, setup.py:
+    - fix lintian warnings
+    - clean up pypi pkginfo
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 06 Feb 2013 16:39:54 -0600
+
+ssh-import-id (3.4-0ubuntu1) raring; urgency=low
+
+  * setup.py:
+    - bump version
+  * debian/control, debian/rules:
+    - run pep8 at build for python syntax checking
+    - still trying to fix 10.04 build
+  * bin/ssh-import-id-lp:
+    - fix pep8 warning
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 05 Feb 2013 17:37:53 -0600
+
+ssh-import-id (3.3-0ubuntu1) raring; urgency=low
+
+  * debian/control, debian/rules:
+    - get this building on 10.04/lucid, borrowed build logic from swift
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 05 Feb 2013 12:42:21 -0600
+
+ssh-import-id (3.2-0ubuntu1) raring; urgency=low
+
+  * debian/control:
+    - need setuptools for compilation
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 05 Feb 2013 11:53:45 -0600
+
+ssh-import-id (3.1-0ubuntu1) raring; urgency=low
+
+  * debian/control:
+    - ensure we have python packaging build dependencies
+  * debian/control, debian/rules:
+    - clean up python build dependencies, fix problem where
+      dh_pysupport pulls in python-support as a dependency
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 05 Feb 2013 10:05:21 -0600
+
+ssh-import-id (3.0-0ubuntu1) raring; urgency=low
+
+  [ Dustin Kirkland ]
+  * setup.py:
+    - bump major version to 3.x since this is a complete rewrite in Python
+    - add support for gh:username (github) as well as lp:username (launchpad)
+  * bin/ssh-auth-id => bin/ssh-import-id, bin/ssh-auth-id-gh => bin/ssh-
+    import-id-gh, bin/ssh-auth-id-lp => bin/ssh-import-id-lp, README.md,
+    setup.py:
+    - rename Casey's ssh-auth-id command to ssh-import-id with this merge
+  * bin/ssh-import-id, bin/ssh-import-id-gh, bin/ssh-import-id-lp,
+    setup.py:
+    - get these pep8 clean with
+       pep8 --verbose --repeat --ignore W191,E501
+  * bin/ssh-import-id, bin/ssh-import-id-gh, bin/ssh-import-id-lp:
+    - drop the "starts with ssh-" check
+    - bad assumption, since my ecdsa key starts with "ecdsa-sha2-nistp256"
+    - if it's a bad key, then ssh-keygen -l -f will shake that out
+    - support wget as a fallback, when python requests module is not available
+    - loop over each id in argv
+    - import subprocess
+  * === added directory attic, debian/control, ssh-import-id =>
+    attic/ssh-import-id, ssh-import-id.py => attic/ssh-import-id.py:
+    - relocate the old shell utility and the monolithic python utility to
+      the attic for now; these should be removed entirely from the source
+      tree in due time
+  * debian/install:
+    - remove binaries from the install, let setup.py handle these for us
+  * bin/ssh-import-id:
+    - support -o|--output - for stdout
+    - return all parts of the fingerprint on validation (size, hash, name, type)
+    - index into the fingerprint for the hash
+    - print all parts of the fingerprint in info messages
+      + this is essential to the security of ssh-import-id, for key fingerprint
+        collision avoidance
+    - use a helper function to print to stdout just as easily a filename
+    - identify keys by their tuple, [length, hash, type]
+  * debian/links, README.md, ssh-import-id.1:
+    - update documentation
+  * bin/ssh-import-id-lp, debian/postinst, ssh_import_id:
+    - support URL environment variable and system-wide URL definition in conf
+      file
+    - port conf file from shell to JSON syntax
+    - add a postinst script to smooth migration from ssh-import-id < 3.0
+    - ignore errors in postinst script (nothing more we can do, really)
+  * bin/ssh-import-id-gh, bin/ssh-import-id-lp, debian/postinst,
+    ssh_import_id:
+    - use wget --no-verbose rather than --quiet, so that error messages from
+      wget (such as SSL cert errors) get propagated
+    - use json syntax for configuration file
+  * bin/ssh-import-id:
+    - stdout file descriptor cannot be opened multiple times cleanly
+
+  [ Casey Marshall and Dustin Kirkland ]
+  * === added directory bin, bin/ssh-auth-id, bin/ssh-auth-id-gh,
+    bin/ssh-auth-id-lp, LICENSE, README.md, setup.py:
+    - import Casey's subcommands implementation from his ssh-auth-id fork
+      on github
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 05 Feb 2013 01:38:31 -0600
+
+ssh-import-id (2.13-0ubuntu1) raring; urgency=low
+
+  * ssh-import-id:
+    - completely rewrite the validate_keys function
+    - fix our broken, crappy regular expressions, and instead, rely on
+      SSH's ssh-keygen -l to validate keys by calculating fingerprints
+    - display fingerprints on stderr, such that users can verify those
+      or discard it
+  * debian/control:
+    - depend on openssh-client, which provides the ssh-keygen command
+    - bump standards
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 23 Oct 2012 17:31:55 -0500
+
+ssh-import-id (2.12-0ubuntu1) quantal; urgency=low
+
+  [ Jani Uusitalo ]
+  * ssh_import_id: LP: #997143
+    - fix typo in comment
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sat, 12 May 2012 19:58:12 -0700
+
+ssh-import-id (2.11-0ubuntu1) quantal; urgency=low
+
+  [ Dražen Lučanin ]
+  * ssh-import-id: LP: #990501
+    - ensure there are newlines at the end of keys
+    - add 2 blank lines between each key for readability
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 06 May 2012 10:46:33 -0500
+
+ssh-import-id (2.10-0ubuntu1) precise; urgency=low
+
+  * === added directory img, img/ssh-import-id_14.png, img/ssh-import-
+    id_192.png, img/ssh-import-id_64.png, img/ssh-import-id.png:
+    - add logos to revision control
+  * ssh-import-id, ssh-import-id.1: LP: #944367
+    - add -e parameter, which says "don't clean my environment"
+    - helps if someone needs to set $https_proxy
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sat, 03 Mar 2012 08:32:25 -0600
+
+ssh-import-id (2.9-0ubuntu1) precise; urgency=low
+
+  * debian/control:
+    - we don't technically break openssh-server;  this could cause
+      openssh-server to be removed;  that's bad
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 31 Jan 2012 16:01:56 -0600
+
+ssh-import-id (2.8-0ubuntu1) precise; urgency=low
+
+  [ Soren Hansen ]
+  * ssh-import-id: LP: #918131
+    - Sequences of a's were getting filtered from public keys
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 18 Jan 2012 09:48:23 -0600
+
+ssh-import-id (2.7-0ubuntu1) precise; urgency=low
+
+  * ssh-import-id: LP: #885205, LP: #702932
+    - fix bug where lines are merged if they don't include a "= "
+    - instead, check for lines that begin with "^ssh-"
+  * ssh-import-id:
+    - line up sed whitespace
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 16 Jan 2012 17:42:51 -0600
+
+ssh-import-id (2.6-0ubuntu1) precise; urgency=low
+
+  * Revert the last commit, removing the ssh-import-lp-id link, as this
+    breaks tab completion.  Instead, let's fix the ssh-import-lp-id
+    caller and SRU it;  LP: #870112
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 14 Dec 2011 09:07:00 -0600
+
+ssh-import-id (2.5-0ubuntu2) oneiric; urgency=low
+
+  * provide a symlink so ssh-import-id can be invoked as
+    ssh-import-lp-id (LP: #870112)
+
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 07 Oct 2011 13:08:44 -0400
+
+ssh-import-id (2.5-0ubuntu1) natty; urgency=low
+
+  * ssh-import-id: enable users to override URL with a per-use
+    environment variable
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 20 Apr 2011 15:38:50 -0400
+
+ssh-import-id (2.4-0ubuntu1) natty; urgency=low
+
+  [ Scott Moser ]
+  * ssh-import-id:
+    - fix import of users whose keys have blank lines and dos EOL
+    - do not require /etc/ssh/ssh_import_id to be present
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 15 Apr 2011 09:48:30 -0500
+
+ssh-import-id (2.3-0ubuntu1) natty; urgency=low
+
+  * ssh-import-id: ensure that ~/.ssh is created, fix regression
+    introduced by smoser ;-)
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 11 Jan 2011 11:12:40 -0600
+
+ssh-import-id (2.2-0ubuntu1) natty; urgency=low
+
+  [ Scott Moser ]
+  * use getopt, send 'info' to stderr, add '--output', LP: #688574
+    - support '--help'
+    - add '--output' or '-o' option to write downloaded and
+      verified data to a named file (supporting '-' for stdout) rather
+      that writing to users .ssh/authorized_keys
+    - send 'info' output to standard error rather than standard out
+      This is required to deal with '--output -'
+  * remove carriage returns from key strings (LP: #651698)
+
+  [ Dustin Kirkland ]
+  * ssh-import-id.1: updated to reflect smoser's changes
+  * debian/install, ssh_import_id, ssh-import-id: allow for URL to be
+    admin-configurable, to point to other SSH public key stores besides
+    Launchpad.net
+  * ssh-import-id.1: document /etc/ssh/ssh_import_id
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 10 Jan 2011 12:56:32 -0600
+
+ssh-import-id (2.1-0ubuntu1) natty; urgency=low
+
+  * debian/control: change the Conflicts to a Breaks, as pointed out
+    by cjwatson, per Debian policy section 7.6
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 05 Jan 2011 08:59:24 -0600
+
+ssh-import-id (2.0-0ubuntu1) natty; urgency=low
+
+  * Split the ssh-import-id utility out of the openssh package;
+    cjwatson doesn't want to see bugs about the tool, nor be bothered
+    with the maintenance thereof, hence a new package
+  * Relicensing the code and documentation from BSD -> GPLv3
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 04 Jan 2011 16:16:30 -0600
--- ssh-import-id-3.13.orig/debian/manpages
+++ ssh-import-id-3.13/debian/manpages
@@ -0,0 +1 @@
+ssh-import-id.1
--- ssh-import-id-3.13.orig/debian/compat
+++ ssh-import-id-3.13/debian/compat
@@ -0,0 +1 @@
+7
--- ssh-import-id-3.13.orig/debian/copyright
+++ ssh-import-id-3.13/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Dustin Kirkland <kirkland@ubuntu.com>
+Wed, 15 Dec 2010 12:08:23 -0600
+
+It was downloaded from: http://launchpad.net/ssh-import-id
+
+Upstream Authors:
+ Dustin Kirkland <kirkland@ubuntu.com>
+ Scott Moser <smoser@ubuntu.com>
+
+Copyright:
+ Copyright (C) 2010 Canonical Ltd.
+
+ All rights reserved.
+
+License:
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation version 3 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 3, can be found in /usr/share/common-licenses/GPL-3.
+
+The Ubuntu packaging:
+ Copyright (C) 2010 Canonical Ltd.
+ released under the GPL-3.
--- ssh-import-id-3.13.orig/debian/install
+++ ssh-import-id-3.13/debian/install
@@ -0,0 +1 @@
+ssh_import_id etc/ssh
--- ssh-import-id-3.13.orig/debian/postinst
+++ ssh-import-id-3.13/debian/postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+# Migrate from shell syntax configuration file to JSON
+sed -i -e "/^#/d" -e "s/^URL=\"\(.*\)\"/{\"URL\": \"\1\"}/" /etc/ssh/ssh_import_id || true
+
+#DEBHELPER#
--- ssh-import-id-3.13.orig/debian/links
+++ ssh-import-id-3.13/debian/links
@@ -0,0 +1,2 @@
+usr/share/man/man1/ssh-import-id.1 usr/share/man/man1/ssh-import-id-lp.1
+usr/share/man/man1/ssh-import-id.1 usr/share/man/man1/ssh-import-id-gh.1
--- ssh-import-id-3.13.orig/debian/rules
+++ ssh-import-id-3.13/debian/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+# Lucid does not have dh_python2, but we would like to be able to use this
+# rules file to build on lucid as well. Thus the branching logic.
+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+
+override_dh_auto_build:
+	# Check syntax
+	pep8 --verbose --repeat --ignore W191,E501,E121 bin/*
+	dh_auto_build
+
+%:
+	dh $@ ${WITH_PYTHON2}
--- ssh-import-id-3.13.orig/debian/control
+++ ssh-import-id-3.13/debian/control
@@ -0,0 +1,21 @@
+Source: ssh-import-id
+Section: misc
+Priority: extra
+Maintainer: Dustin Kirkland <kirkland@ubuntu.com>
+Build-Depends: debhelper (>= 7.0.50~),
+ pep8,
+ python-all (>= 2.6),
+ python-setuptools
+Standards-Version: 3.9.3
+Homepage: http://launchpad.net/ssh-import-id
+
+Package: ssh-import-id
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, wget, ca-certificates, openssh-client
+Recommends: openssh-server, python-requests
+Breaks: ssh-import
+Replaces: ssh-import
+Description: securely retrieve an SSH public key and install it locally
+ This utility will securely contact a public keyserver (Launchpad.net by
+ default, but Github.com is also supported), retrieve one or more user's
+ public keys, and append these to the current user's ~/.ssh/authorized_keys file.
