Update Debian packaging from Salsa repo

Fixes builds in Debian testing

Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

diff --git a/.obs/debian/control b/.obs/debian/control
index 2d467d57c7dec3801e6a293bec5a49e80bf93090..4c807939ca8f5e60b1dca06a9bcc7577946766e6 100644 (file)
--- a/.obs/debian/control
+++ b/.obs/debian/control
@@ -4,27 +4,32 @@ Section: net
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
                groff,
-               libgcrypt20-dev,
                libgnutls28-dev,
                libkrb5-dev,
                liblz4-dev,
                libp11-kit-dev,
                libpcsclite-dev,
                libproxy-dev,
-               libsocket-wrapper [!hurd-i386] <!nocheck>,
+#              disabled due to #1069450
+#              libsocket-wrapper [!hurd-any] <!nocheck>,
                libstoken-dev,
                libtasn1-6-dev,
-               libuid-wrapper [!alpha !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] <!nocheck>,
+               libtss2-dev [!hurd-any !kfreebsd-any],
+#              disabled due to #1069425
+#              libuid-wrapper [!alpha !hurd-any !kfreebsd-any] <!nocheck>,
                libxml2-dev,
                locales-all <!nocheck>,
-               ocserv [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] <!nocheck>,
-               openssl <!nocheck>,
-               pkg-config,
+#              disabled due to #1069450
+#              ocserv [!alpha !hurd-any !ia64 !kfreebsd-any !m68k !sh4 !sparc64] <!nocheck>,
+#              disabled due to #1069450
+#              openssl <!nocheck>,
+               pkgconf,
                python3:any,
-               softhsm2 [!hurd-i386] <!nocheck>,
+#              disabled due to #1069450
+#              softhsm2 [!hurd-any] <!nocheck>,
                xdg-utils,
                zlib1g-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.7.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/debian/openconnect
 Vcs-Git: https://salsa.debian.org/debian/openconnect.git
@@ -34,13 +39,13 @@ Package: openconnect
 Architecture: any
 Depends: libopenconnect5 (= ${binary:Version}), vpnc-scripts, ${misc:Depends}, ${shlibs:Depends}
 Recommends: python3, python3-asn1crypto, python3-mechanize, python3-netifaces,
-Suggests: bash-completion,
-Description: open multi-protocol SSL VPN client
+Suggests: bash-completion, xdg-utils,
+Description: open client for various network vendors SSL VPNs
  OpenConnect is an SSL VPN client initially created to support Cisco's
  AnyConnect SSL VPN. It has since been extended to support the Pulse Connect
  Secure VPN (formerly known as Juniper Network Connect or Junos Pulse), the Palo
  Alto Networks GlobalProtect SSL VPN, F5 Big-IP SSL VPN, Fortinet Fortigate SSL
- VPN and Array Networks SSL VPN.
+ VPN and Array Networks AG SSL VPN.
  .
  A corresponding OpenConnect VPN server implementation can be found in the
  ocserv package.
@@ -64,7 +69,7 @@ Description: open client for various network vendors SSL VPNs - development file
  AnyConnect SSL VPN. It has since been extended to support the Pulse Connect
  Secure VPN (formerly known as Juniper Network Connect or Junos Pulse), the Palo
  Alto Networks GlobalProtect SSL VPN, F5 Big-IP SSL VPN, Fortinet Fortigate SSL
- VPN and Array Networks SSL VPN.
+ VPN and Array Networks AG SSL VPN.
  .
  This package provides the header and development files.
 
@@ -80,6 +85,6 @@ Description: open client for various network vendors SSL VPNs - shared library
  AnyConnect SSL VPN. It has since been extended to support the Pulse Connect
  Secure VPN (formerly known as Juniper Network Connect or Junos Pulse), the Palo
  Alto Networks GlobalProtect SSL VPN, F5 Big-IP SSL VPN, Fortinet Fortigate SSL
- VPN and Array Networks SSL VPN.
+ VPN and Array Networks AG SSL VPN.
  .
  This package provides the shared library.

diff --git a/.obs/debian/copyright b/.obs/debian/copyright
index 3ad9a8580fbac61f9b0285352a7d372a05d5533c..5f72efb7c3f03d0adbacac7640543631318058f9 100644 (file)
--- a/.obs/debian/copyright
+++ b/.obs/debian/copyright
@@ -1,4 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OpenConnect
+Upstream-Contact: openconnect-devel@lists.infradead.org
 Source: ftp://ftp.infradead.org/pub/openconnect/
 
 Files: *

diff --git a/.obs/openconnect.dsc b/.obs/openconnect.dsc
index 95a2b9519f111831aa9ad73c0ebea6cf6558dc66..be395b1f683264f49b55cdcfe362acee7c9637f1 100644 (file)
--- a/.obs/openconnect.dsc
+++ b/.obs/openconnect.dsc
@@ -5,8 +5,8 @@ Architecture: any
 Version: 8.20-0
 Maintainer: OpenConnect Team <openconnect-devel@lists.infradead.org>
 Homepage: https://www.infradead.org/openconnect/
-Standards-Version: 4.6.0
-Build-Depends: debhelper-compat (= 12), groff, libgcrypt20-dev, libgnutls28-dev, libkrb5-dev, liblz4-dev, libp11-kit-dev, libpcsclite-dev, libproxy-dev, libsocket-wrapper [!hurd-i386] <!nocheck>, libstoken-dev, libtasn1-6-dev, libuid-wrapper [!alpha !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] <!nocheck>, libxml2-dev, locales-all <!nocheck>, ocserv [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] <!nocheck>, openssl <!nocheck>, pkg-config, python3:any, softhsm2 [!hurd-i386] <!nocheck>, xdg-utils, zlib1g-dev
+Standards-Version: 4.7.0
+Build-Depends: debhelper-compat (= 12), groff, libgnutls28-dev, libkrb5-dev, liblz4-dev, libp11-kit-dev, libpcsclite-dev, libproxy-dev, libstoken-dev, libtasn1-6-dev, libxml2-dev, locales-all <!nocheck>, pkgconf, python3:any, xdg-utils, zlib1g-dev
 Package-List:
  libopenconnect-dev deb libdevel optional arch=any
  libopenconnect5 deb libs optional arch=any