From: Julien Cristau <jcristau@debian.org>
Date: Sun, 3 May 2015 13:24:32 +0000 (+0200)
Subject: prefer pinentry-curses to -gtk2
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=20635924793ba0d4c0c312621ef60068c4ee395f

prefer pinentry-curses to -gtk2

gnupg-agent in jessie depends on pinentry-gtk2 | pinentry-curses |
pinentry.  Install -curses beforehand so the upgrade doesn't pull in
-gtk2 with a pile of X libs we don't need.
---

diff --git a/input/howto/upgrade-to-jessie.mdwn b/input/howto/upgrade-to-jessie.mdwn
index c2863bd..717f3ea 100644
--- a/input/howto/upgrade-to-jessie.mdwn
+++ b/input/howto/upgrade-to-jessie.mdwn
@@ -21,7 +21,7 @@ commands:
 		sed -i "s#squeeze#wheezy#g" /etc/apt/sources.list.d/buildd.debian.org.list
 	fi &&
 	apt-get update &&
-	apt-get install dpkg apt samhain &&
+	apt-get install dpkg apt samhain pinentry-curses &&
 	service samhain stop &&
 	apt-get dist-upgrade &&
 	rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file &&