From 2c1ce150f717e5ef31e413e1f9f8edb4936c1a0d Mon Sep 17 00:00:00 2001 From: Walter Lapchynski Date: Wed, 10 Oct 2018 20:27:36 -0500 Subject: [PATCH] Explicitly enable encryption (thanks marneu!) & remove unnecessary postinst. Summary: When I was putting together the packaging, I used @agaida's brilliant idea to explicitly express the configuration options in debian/rules. Unfortunately, I neglected to notice the fact that his packaging had turned off encryption support, so I turned it back on. I also got rid of the kind of pointless postinst that was in there, as vorlon had pointed out. Test Plan: Do some encryption :) Reviewers: tsimonq2 Reviewed By: tsimonq2 Subscribers: agaida Differential Revision: https://phab.lubuntu.me/D34 --- debian/changelog | 7 +++++++ debian/rules | 4 ++-- debian/trojita.postinst | 25 ------------------------- 3 files changed, 9 insertions(+), 27 deletions(-) delete mode 100755 debian/trojita.postinst diff --git a/debian/changelog b/debian/changelog index 82a0527..b5dc8b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +trojita (0.7-0ubuntu2) cosmic; urgency=medium + + * Fix debian/rules to explciitly allow for encryption support. + * Remove pointless postinst. + + -- Walter Lapchynski Wed, 10 Oct 2018 09:22:18 -0700 + trojita (0.7-0ubuntu1) cosmic; urgency=medium * Initial release. diff --git a/debian/rules b/debian/rules index 1895e6d..b79162c 100755 --- a/debian/rules +++ b/debian/rules @@ -23,11 +23,11 @@ override_dh_auto_configure: -DWITH_SHARED_PLUGINS=ON \ -DWITH_TESTS=OFF \ -DWITH_MIMETIC=ON \ - -DWITH_GPGMEPP=OFF \ + -DWITH_GPGMEPP=ON \ -DWITH_ABOOKADDRESSBOOK_PLUGIN=ON \ -DWITH_CLEARTEXT_PLUGIN=ON \ -DWITH_QTKEYCHAIN_PLUGIN=ON \ - -DWITH_CRYPTO_MESSAGES=OFF + -DWITH_CRYPTO_MESSAGES=ON override_dh_auto_test: dh_auto_test || return 0 diff --git a/debian/trojita.postinst b/debian/trojita.postinst deleted file mode 100755 index a1095a1..0000000 --- a/debian/trojita.postinst +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# postinst script for #PACKAGE# -# -# see: dh_installdeb(1) - -set -e - -case "$1" in - configure) - # not needed: ldconfig /usr/lib/x86_64-linux-gnu/libtrojita_plugins.so - true - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0