diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-03-30 10:55:45 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-03-30 10:55:45 +0100 |
| commit | 6ace941e9bd7dffba427b47fc5ca9c0fde4ee0f8 (patch) | |
| tree | b9541c41f2ff77899ba007b623e4181a962ab9d8 | |
| parent | 9b64d388277dba9cf6d06ddb53b5e7d7f6bd5a1a (diff) | |
| download | tde-packaging-6ace941e9bd7dffba427b47fc5ca9c0fde4ee0f8.tar.gz tde-packaging-6ace941e9bd7dffba427b47fc5ca9c0fde4ee0f8.zip | |
DEB kvpnc: Prefer the default libgcrypt-dev instead of the specific version.r14.0.6
This solves the conflict between packages on Ubuntu 14.04 (Trusty).
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9b52d86ec478772ff5b659eda7564a5137f1aa02)
| -rw-r--r-- | debian/lenny/applications/kvpnc/debian/control | 2 | ||||
| -rw-r--r-- | debian/squeeze/applications/kvpnc/debian/control | 2 | ||||
| -rw-r--r-- | 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 <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -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 <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -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 <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -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 |