Merge lp:~noskcaj/ubuntu/trusty/python-scrypt/ftbfs into lp:ubuntu/trusty-proposed/python-scrypt

[Jackson Doak]

Fix FTBFS

[Marc Deslauriers (mdeslaur)]

Looks good, uploaded to trusty. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-22 16:01:24 +0000
+++ debian/changelog	2013-11-08 08:46:27 +0000
@@ -1,3 +1,10 @@
+python-scrypt (0.6.1-5ubuntu1) UNRELEASED; urgency=low
+
+  * Add build-dependancy on libssl-dev. Fixes FTBFS on all arches
+    - Debian bug 724158
+
+ -- Jackson Doak <[e-mail]>  Fri, 08 Nov 2013 19:27:47 +1100
+
 python-scrypt (0.6.1-5) unstable; urgency=low
 
   * Remove dependency on libscrypt0, it requires porting

=== modified file 'debian/control'
--- debian/control	2013-08-22 16:01:24 +0000
+++ debian/control	2013-11-08 08:46:27 +0000
@@ -1,8 +1,9 @@
 Source: python-scrypt
-Maintainer: Micah Anderson <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Micah Anderson <[e-mail]>
 Section: python
 Priority: optional
-Build-Depends: python-all-dev (>= 2.6.6-3), debhelper (>= 9)
+Build-Depends: python-all-dev (>= 2.6.6-3), debhelper (>= 9), libssl-dev
 Standards-Version: 3.9.4
 
 Package: python-scrypt