Merge lp:~tyhicks/ecryptfs/fix-deps into lp:ecryptfs

[Tyler Hicks]

Fix the dependencies in the Debian packaging. It contained many unneeded dependencies.

[lp:~tyhicks/ecryptfs/fix-deps]

880. By Tyler Hicks on 2016-02-23

debian: Fix up changelog and add bug reference

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-22 16:08:04 +0000
+++ debian/changelog	2016-02-23 20:13:31 +0000
@@ -1,7 +1,29 @@
 ecryptfs-utils (110) UNRELEASED; urgency=medium
 
+  [ Dustin Kirkland ]
   * UNRELEASED
 
+  [ Tyler Hicks ]
+  * Remove unnecessary dependencies in the Debian packaging (LP: #1548975)
+    - debian/control: Remove opencryptoki from ecryptfs-utils
+      Suggests and libopencryptoki-dev from libecryptfs-dev Depends as
+      openCryptoki is not a dependency of eCryptfs.
+    - debian/rules: Remove openCryptoki related logic since it was not being
+      used and is no longer needed
+    - debian/control: Remove libtspi-dev from libecryptfs-dev Depends since
+      --disable-tspi is passed to the configure script
+    - debian/control: Remove libpkcs11-helper1-dev from libecryptfs-dev
+      Depends since --disable-pkcs11-helper is passed to the configure script
+    - debian/control: Remove libgpg-error-dev and libgpgme11-dev from
+      libecryptfs-dev Depends since --disable-gpg is passed to the configure
+      script
+    - debian/control: Remove libgcrypt11-dev from Build-Depends and
+      libecryptfs-dev Depends since --enable-nss is passed to the configure
+      script to use NSS instead of Libgcrypt
+    - debian/control: Remove libkeyutils-dev and libpam0g-dev from
+      libecryptfs-dev Depends since these are build-time dependencies and not
+      run-time dependencies
+
  -- Dustin Kirkland <[e-mail]>  Fri, 22 Jan 2016 10:08:02 -0600
 
 ecryptfs-utils (109) xenial; urgency=medium

=== modified file 'debian/control'
--- debian/control	2015-08-06 15:37:11 +0000
+++ debian/control	2016-02-23 20:13:31 +0000
@@ -9,7 +9,6 @@
  dh-autoreconf,
  dh-python,
  intltool,
- libgcrypt11-dev,
  libglib2.0-dev,
  libkeyutils-dev,
  libnss3-dev,
@@ -37,7 +36,6 @@
  lsof,
  rsync
 Suggests:
- opencryptoki,
  zescrow-client
 Description: ecryptfs cryptographic filesystem (utilities)
  eCryptfs is a POSIX-compliant enterprise-class stacked cryptographic filesystem
@@ -89,15 +87,7 @@
 Architecture: any
 Depends:
  ${misc:Depends},
- libecryptfs1 (= ${binary:Version}),
- libgcrypt11-dev,
- libgpg-error-dev,
- libgpgme11-dev,
- libkeyutils-dev,
- libopencryptoki-dev [alpha amd64 arm armel hppa ia64 i386 m68k mips mipsel powerpc sparc],
- libpam0g-dev,
- libpkcs11-helper1-dev,
- libtspi-dev [alpha amd64 arm armel hppa ia64 i386 m68k mips mipsel powerpc sparc]
+ libecryptfs1 (= ${binary:Version})
 Description: ecryptfs cryptographic filesystem (development)
  eCryptfs is a POSIX-compliant enterprise-class stacked cryptographic filesystem
  for Linux.

=== modified file 'debian/rules'
--- debian/rules	2013-10-25 23:28:39 +0000
+++ debian/rules	2016-02-23 20:13:31 +0000
@@ -2,10 +2,6 @@
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-ifneq ($(DEB_BUILD_ARCH),s390)
-	TPMFLAGS = --enable-opencryptoki
-endif
-
 %:
 	dh ${@} --with autoreconf,python2
 
@@ -13,7 +9,7 @@
 	dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-static --disable-gpg --enable-nss  --disable-gui --enable-pam --disable-openssl --disable-pkcs11-helper --disable-tspi $(TPMFLAGS) $(shell dpkg-buildflags --export=configure)
+	dh_auto_configure -- --enable-static --disable-gpg --enable-nss  --disable-gui --enable-pam --disable-openssl --disable-pkcs11-helper --disable-tspi $(shell dpkg-buildflags --export=configure)
 
 override_dh_auto_install:
 	dh_auto_install