Merge lp:~tyhicks/ecryptfs/fix-ftbfs-from-105-tarball into lp:ecryptfs

[Tyler Hicks]

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-11 15:34:25 +0000
+++ debian/changelog	2015-03-11 16:42:37 +0000
@@ -1,7 +1,15 @@
 ecryptfs-utils (106) UNRELEASED; urgency=medium
 
+  [ Dustin Kirkland ]
   * UNRELEASED
 
+  [ Tyler Hicks ]
+  * tests/userspace/Makefile.am: Fix the 'make check' failure present in the
+    ecryptfs-utils-105 release tarball. The failure was due to the automake
+    file not specifying that some data files should be distributed as part
+    of the v1-to-v2-wrapped-passphrase test, causing the test to fail due to
+    the missing files.
+
  -- Dustin Kirkland <[e-mail]>  Wed, 11 Mar 2015 10:34:20 -0500
 
 ecryptfs-utils (105) utopic; urgency=low

=== modified file 'tests/userspace/Makefile.am'
--- tests/userspace/Makefile.am	2015-02-15 20:00:52 +0000
+++ tests/userspace/Makefile.am	2015-03-11 16:42:37 +0000
@@ -4,7 +4,12 @@
 dist_check_SCRIPTS = lfs.sh verify-passphrase-sig.sh wrap-unwrap.sh v1-to-v2-wrapped-passphrase.sh
 check_PROGRAMS = lfs/test verify-passphrase-sig/test wrap-unwrap/test v1-to-v2-wrapped-passphrase/test
 
-dist_noinst_DATA = tests.rc
+dist_noinst_DATA = tests.rc \
+		   v1-to-v2-wrapped-passphrase/wp01 \
+		   v1-to-v2-wrapped-passphrase/wp02 \
+		   v1-to-v2-wrapped-passphrase/wp03 \
+		   v1-to-v2-wrapped-passphrase/wp04 \
+		   v1-to-v2-wrapped-passphrase/wp05
 
 dist_noinst_SCRIPTS = $(dist_check_SCRIPTS)