6 files changed, 5 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog
index 7a0c6c4f..6b36a4a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,8 @@ network-manager (1.10.8-1ubuntu1) UNRELEASED; urgency=medium
       + e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch
       + dns-manager-don-t-merge-split-DNS-search-domains.patch (but disabled)
     - debian/tests/urfkill-integration - don't stop/start network manager
+  * Keep libnm-glib/libnm-util a bit longer since unity-control-center
+    still needs them. See bug 1744619
 
  -- Jeremy Bicha <jbicha@debian.org>  Fri, 11 May 2018 19:00:51 -0400
 
diff --git a/debian/control b/debian/control
index e93cabbd..aff3dfb4 100644
--- a/debian/control
+++ b/debian/control
@@ -127,7 +127,6 @@ Architecture: linux-any
 Multi-Arch: same
 Depends: ${misc:Depends},
          libnm-glib4 (= ${binary:Version}),
-         gir1.2-networkmanager-1.0 (= ${binary:Version}),
          libnm-util-dev (>= ${binary:Version}),
          network-manager-dev (>= ${binary:Version}),
          libglib2.0-dev,
@@ -199,7 +198,6 @@ Architecture: linux-any
 Multi-Arch: same
 Depends: ${misc:Depends},
          libnm-util2 (= ${binary:Version}),
-         gir1.2-networkmanager-1.0 (= ${binary:Version}),
          network-manager-dev (>= ${binary:Version}),
          libglib2.0-dev,
          libdbus-glib-1-dev
@@ -247,26 +245,6 @@ Description: GObject-based client library for NetworkManager (development files)
  .
  This package contains header and development files.
 
-Package: gir1.2-networkmanager-1.0
-Section: introspection
-Architecture: linux-any
-Multi-Arch: same
-Depends: ${gir:Depends},
-         ${shlibs:Depends},
-         ${misc:Depends}
-Description: GObject introspection data for the libnm-glib/libnm-util library
- NetworkManager is a system network service that manages your network devices
- and connections, attempting to keep active network connectivity when
- available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
- devices, and provides VPN integration with a variety of different VPN
- services.
- .
- This package contains introspection data for NetworkManager using
- libnm-glib/libnm-util.
- .
- It can be used by packages using the GIRepository format to generate
- dynamic bindings.
-
 Package: gir1.2-nm-1.0
 Section: introspection
 Architecture: linux-any
diff --git a/debian/gir1.2-networkmanager-1.0.install b/debian/gir1.2-networkmanager-1.0.install
deleted file mode 100644
index 9e0de41f..00000000
--- a/debian/gir1.2-networkmanager-1.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/girepository-1.0/NMClient-1.0.typelib
-usr/lib/*/girepository-1.0/NetworkManager-1.0.typelib
diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install
index 4c15cd4a..d53cff7c 100644
--- a/debian/libnm-glib-dev.install
+++ b/debian/libnm-glib-dev.install
@@ -15,5 +15,4 @@ usr/include/libnm-glib/nm-wimax-nsp.h
 usr/include/libnm-glib/nm-secret-agent.h
 usr/include/libnm-glib/nm-glib-enum-types.h
 usr/share/gtk-doc/html/libnm-glib/
-usr/share/gir-1.0/NMClient-1.0.gir
 usr/share/vala/vapi/libnm-glib.*
diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install
index 64626616..79f78581 100644
--- a/debian/libnm-util-dev.install
+++ b/debian/libnm-util-dev.install
@@ -6,5 +6,4 @@ usr/include/NetworkManager/nm-setting.h
 usr/include/NetworkManager/nm-setting-*.h
 usr/include/NetworkManager/nm-utils-enum-types.h
 usr/share/gtk-doc/html/libnm-util/
-usr/share/gir-1.0/NetworkManager-1.0.gir
 usr/share/vala/vapi/libnm-util.*
diff --git a/debian/rules b/debian/rules
index 119c2946..df6cbdb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,9 @@ override_dh_auto_configure:
 
 override_dh_install:
 	find debian/tmp -name '*.la' -print -delete
+	# Drop gir1.2-networkmanager-1.0 now
+	find debian/tmp -name NMClient-1.0.* -print -delete
+	find debian/tmp -name NetworkManager-1.0.* -print -delete
 	rm debian/tmp/usr/share/doc/NetworkManager/examples/server.conf
 	rm -vf $(CURDIR)/debian/tmp/etc/init.d/NetworkManager
 	dh_install