Bug#862677: Should be ported from libnm-util/libnm-glib/libnm-gtk to libnm/libnma

[Michael Biebl]

Source: gnome-shell
Version: 3.22.3-3
Severity: normal
User: pkg-utopia-maintainers at lists.alioth.debian.org
Usertags: libnm
Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=779776

Like other GNOME components such as gnome-control-center [1] or
gnome-intial-setup [2], gnome-shell should be ported from
libnm-glib/libnm-gtk to libnm/libnm

This affects
configure.ac
src/shell-network-agent.[ch]
js/ui/status/network.js
js/ui/components/networkAgent.js
js/misc/modemManager.js

A corresponding upstream upstream bug report has been filed already.
The packaging related changes are as trivial as the attached patch.


[1] https://git.gnome.org/browse/gnome-control-center/commit/?id=9183d3494788486600856df5115f11486ecb20a8
[2] https://git.gnome.org/browse/gnome-initial-setup/commit/?id=c1d702360dbe9075e6ab2215bc01d5c9fd3451ed



-- System Information:
Debian Release: 9.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64
 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-- no debconf information
-------------- next part --------------
Index: debian/control
===================================================================
--- debian/control	(Revision 52312)
+++ debian/control	(Arbeitskopie)
@@ -33,10 +33,8 @@
                libgtk-3-dev (>= 3.21.6),
                libibus-1.0-dev,
                libmutter-dev (>= 3.22.1),
-               libnm-glib-dev (>= 0.9.8) [linux-any],
-               libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
-               libnm-gtk-dev (>= 0.9.8) [linux-any],
-               libnm-util-dev (>= 0.9.8) [linux-any],
+               libnm-dev [linux-any],
+               libnma-dev [linux-any],
                libpolkit-agent-1-dev (>= 0.100),
                libpulse-dev (>= 2.0),
                libsecret-1-dev,
@@ -74,8 +72,8 @@
          gir1.2-gweather-3.0,
          gir1.2-ibus-1.0 (>= 1.5.2),
          gir1.2-mutter-3.0 (>= 3.22.1),
-         gir1.2-networkmanager-1.0 [linux-any],
-         gir1.2-nmgtk-1.0 (>= 0.9.8) [linux-any],
+         gir1.2-nm-1.0 [linux-any],
+         gir1.2-nma-1.0 [linux-any],
          gir1.2-pango-1.0,
          gir1.2-polkit-1.0,
          gir1.2-soup-2.4 (>= 2.40.1),
Index: debian/control.in
===================================================================
--- debian/control.in	(Revision 52312)
+++ debian/control.in	(Arbeitskopie)
@@ -29,10 +29,8 @@
                libgtk-3-dev (>= 3.21.6),
                libibus-1.0-dev,
                libmutter-dev (>= 3.22.1),
-               libnm-glib-dev (>= 0.9.8) [linux-any],
-               libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
-               libnm-gtk-dev (>= 0.9.8) [linux-any],
-               libnm-util-dev (>= 0.9.8) [linux-any],
+               libnm-dev [linux-any],
+               libnma-dev [linux-any],
                libpolkit-agent-1-dev (>= 0.100),
                libpulse-dev (>= 2.0),
                libsecret-1-dev,
@@ -70,8 +68,8 @@
          gir1.2-gweather-3.0,
          gir1.2-ibus-1.0 (>= 1.5.2),
          gir1.2-mutter-3.0 (>= 3.22.1),
-         gir1.2-networkmanager-1.0 [linux-any],
-         gir1.2-nmgtk-1.0 (>= 0.9.8) [linux-any],
+         gir1.2-nm-1.0 [linux-any],
+         gir1.2-nma-1.0 [linux-any],
          gir1.2-pango-1.0,
          gir1.2-polkit-1.0,
          gir1.2-soup-2.4 (>= 2.40.1),