about summary refs log tree commit diff
path: root/debian/control
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-02-26 16:32:44 +0100
committerSebastien Bacher <seb128@ubuntu.com>2020-02-26 16:32:44 +0100
commit447eb1ee6c50e2cac4009e66add3c1d449822589 (patch)
tree7bc7db8f5d7e12137e758ea03ebe5c1eb8b07a23 /debian/control
parent0b818c504ebbb9454b501c532be8603bf383e37a (diff)
parent3cbb3d6ecfef1076fc757632ee8327935250afee (diff)
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control9
1 files changed, 3 insertions, 6 deletions
diff --git a/debian/control b/debian/control
index 83f30dc6..149bb07b 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Build-Depends: debhelper-compat (= 12),
                valac (>= 0.17.1.24),
                dbus <!nocheck>,
                python3-dbus <!nocheck>
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 XS-Debian-Vcs-Git: https://salsa.debian.org/utopia-team/network-manager.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/utopia-team/network-manager
@@ -92,12 +92,9 @@ Description: network management framework (daemon and userspace tools)
 
 Package: network-manager-dev
 Section: devel
-Architecture: linux-any
-Multi-Arch: same
+Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
-Conflicts: libnm-glib-dev,
-           libnm-glib-vpn-dev,
-           libnm-util-dev,
 Description: network management framework (development files)
  This package provides documentation of the NetworkManager D-Bus API, the
  configuration formats and command line utilities.