From 6ace941e9bd7dffba427b47fc5ca9c0fde4ee0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 30 Mar 2019 10:55:45 +0100 Subject: [PATCH] DEB kvpnc: Prefer the default libgcrypt-dev instead of the specific version. This solves the conflict between packages on Ubuntu 14.04 (Trusty). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 9b52d86ec478772ff5b659eda7564a5137f1aa02) --- debian/lenny/applications/kvpnc/debian/control | 2 +- debian/squeeze/applications/kvpnc/debian/control | 2 +- ubuntu/maverick/applications/kvpnc/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/applications/kvpnc/debian/control b/debian/lenny/applications/kvpnc/debian/control index 4b8d1b19c..00e4add6b 100644 --- a/debian/lenny/applications/kvpnc/debian/control +++ b/debian/lenny/applications/kvpnc/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libgcrypt20-dev | libgcrypt11-dev +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev Standards-Version: 3.8.4 Package: kvpnc-trinity diff --git a/debian/squeeze/applications/kvpnc/debian/control b/debian/squeeze/applications/kvpnc/debian/control index 4b8d1b19c..00e4add6b 100644 --- a/debian/squeeze/applications/kvpnc/debian/control +++ b/debian/squeeze/applications/kvpnc/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libgcrypt20-dev | libgcrypt11-dev +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev Standards-Version: 3.8.4 Package: kvpnc-trinity diff --git a/ubuntu/maverick/applications/kvpnc/debian/control b/ubuntu/maverick/applications/kvpnc/debian/control index 4b8d1b19c..00e4add6b 100644 --- a/ubuntu/maverick/applications/kvpnc/debian/control +++ b/ubuntu/maverick/applications/kvpnc/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libgcrypt20-dev | libgcrypt11-dev +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev Standards-Version: 3.8.4 Package: kvpnc-trinity