Revert "Go ahead and drop gir1.2-networkmanager-1.0"

This reverts commit 0b286d6fc70334fa5fb6eb7bd3cc51285a3b8c15.

6 files changed, 26 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 71d56127..805fa67b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,8 +46,6 @@ network-manager (1.10.8-1ubuntu1) cosmic; 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@ubuntu.com>  Fri, 11 May 2018 19:52:40 -0400
 
diff --git a/debian/control b/debian/control
index 486c7794..1ed109bf 100644
--- a/debian/control
+++ b/debian/control
@@ -127,6 +127,7 @@ 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,
@@ -198,6 +199,7 @@ 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
@@ -245,6 +247,26 @@ 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
new file mode 100644
index 00000000..9e0de41f
--- /dev/null
+++ b/debian/gir1.2-networkmanager-1.0.install
@@ -0,0 +1,2 @@
+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 d53cff7c..4c15cd4a 100644
--- a/debian/libnm-glib-dev.install
+++ b/debian/libnm-glib-dev.install
@@ -15,4 +15,5 @@ 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 79f78581..64626616 100644
--- a/debian/libnm-util-dev.install
+++ b/debian/libnm-util-dev.install
@@ -6,4 +6,5 @@ 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 df6cbdb6..119c2946 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,9 +56,6 @@ 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