Hi mike On Sat, 14 Apr 2018 00:45:10 -0700 Mike Miller <mtmil...@debian.org> wrote: > On Sat, Apr 14, 2018 at 01:02:45 +0200, Michael Biebl wrote: > > I intend to upload a new version of network-manager soonish which will > > drop libnm-glib/libnm-util. I'm thus bumping this issue to RC in > > preparation for that. > > Thanks for the reminder and lighting a fire, will do.
To finish off the libnm-glib transition (nm-openconnect being the last package at [1]), I decided to prepare an NMU and upload to DELAYED/7 While at it, I've also included the changes for #852705 and #852706. Full debdiff attached. Please holler if you want me to cancel the NMU and you want to make a maintainer upload instead. Regards, Michael [1] https://bugs.debian.org/cgi-bin/pkgreport.cgi?users=pkg-utopia-maintain...@lists.alioth.debian.org;tag=libnm -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru network-manager-openconnect-1.2.4/debian/changelog
network-manager-openconnect-1.2.4/debian/changelog
--- network-manager-openconnect-1.2.4/debian/changelog 2016-12-09
06:05:50.000000000 +0100
+++ network-manager-openconnect-1.2.4/debian/changelog 2018-08-11
16:34:05.000000000 +0200
@@ -1,3 +1,13 @@
+network-manager-openconnect (1.2.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Disable libnm-glib support (Closes: #862884, #898661)
+ * Install AppData file (Closes: #852705)
+ * Move libnm-vpn-plugin-openconnect and translations into main package
+ (Closes: #852706)
+
+ -- Michael Biebl <bi...@debian.org> Sat, 11 Aug 2018 16:34:05 +0200
+
network-manager-openconnect (1.2.4-1) unstable; urgency=medium
* New upstream version 1.2.4
diff -Nru network-manager-openconnect-1.2.4/debian/control
network-manager-openconnect-1.2.4/debian/control
--- network-manager-openconnect-1.2.4/debian/control 2016-12-09
06:00:27.000000000 +0100
+++ network-manager-openconnect-1.2.4/debian/control 2018-08-11
16:34:05.000000000 +0200
@@ -6,14 +6,10 @@
intltool,
libglib2.0-dev,
libgtk-3-dev,
- libnm-dev,
- libnm-glib-dev (>= 1.2.0),
- libnm-glib-vpn-dev (>= 1.2.0),
- libnm-util-dev (>= 1.2.0),
+ libnm-dev (>= 1.2.0),
libopenconnect-dev,
libsecret-1-dev,
- libxml2-dev,
- network-manager-dev (>= 1.2.0)
+ libxml2-dev
Standards-Version: 3.9.8
Vcs-Browser:
https://anonscm.debian.org/cgit/collab-maint/network-manager-openconnect.git
Vcs-Git:
https://anonscm.debian.org/git/collab-maint/network-manager-openconnect.git
@@ -26,6 +22,8 @@
openconnect,
${misc:Depends},
${shlibs:Depends}
+Breaks: network-manager-openconnect-gnome (<< 1.2.4-1.1)
+Replaces: network-manager-openconnect-gnome (<< 1.2.4-1.1)
Description: network management framework (OpenConnect plugin core)
NetworkManager is a system network service that manages your network devices
and connections, attempting to keep active network connectivity when
diff -Nru
network-manager-openconnect-1.2.4/debian/network-manager-openconnect-gnome.install
network-manager-openconnect-1.2.4/debian/network-manager-openconnect-gnome.install
---
network-manager-openconnect-1.2.4/debian/network-manager-openconnect-gnome.install
2016-12-09 06:00:27.000000000 +0100
+++
network-manager-openconnect-1.2.4/debian/network-manager-openconnect-gnome.install
2018-08-11 16:34:05.000000000 +0200
@@ -1,4 +1,4 @@
-usr/lib/*/NetworkManager/*.so
+usr/lib/*/NetworkManager/libnm-vpn-plugin-openconnect-editor.so
usr/lib/NetworkManager/nm-openconnect-auth-dialog
+usr/share/appdata/network-manager-openconnect.metainfo.xml
usr/share/gnome-vpn-properties
-usr/share/locale
diff -Nru
network-manager-openconnect-1.2.4/debian/network-manager-openconnect.install
network-manager-openconnect-1.2.4/debian/network-manager-openconnect.install
---
network-manager-openconnect-1.2.4/debian/network-manager-openconnect.install
2016-12-09 06:00:27.000000000 +0100
+++
network-manager-openconnect-1.2.4/debian/network-manager-openconnect.install
2018-08-11 16:34:05.000000000 +0200
@@ -1,3 +1,5 @@
etc
usr/lib/NetworkManager/VPN/nm-openconnect-service.name
usr/lib/NetworkManager/nm-openconnect-service*
+usr/lib/*/NetworkManager/libnm-vpn-plugin-openconnect.so
+usr/share/locale
diff -Nru
network-manager-openconnect-1.2.4/debian/network-manager-openconnect.maintscript
network-manager-openconnect-1.2.4/debian/network-manager-openconnect.maintscript
---
network-manager-openconnect-1.2.4/debian/network-manager-openconnect.maintscript
1970-01-01 01:00:00.000000000 +0100
+++
network-manager-openconnect-1.2.4/debian/network-manager-openconnect.maintscript
2018-08-11 16:34:05.000000000 +0200
@@ -0,0 +1 @@
+rm_conffile /etc/NetworkManager/VPN/nm-openconnect-service.name 1.2.4-1.1~
diff -Nru network-manager-openconnect-1.2.4/debian/rules
network-manager-openconnect-1.2.4/debian/rules
--- network-manager-openconnect-1.2.4/debian/rules 2016-12-08
21:05:27.000000000 +0100
+++ network-manager-openconnect-1.2.4/debian/rules 2018-08-11
16:33:50.000000000 +0200
@@ -15,7 +15,8 @@
override_dh_auto_configure:
dh_auto_configure -- \
--libexecdir=/usr/lib/NetworkManager \
- --disable-static
+ --disable-static \
+ --without-libnm-glib
override_dh_auto_install:
dh_auto_install
signature.asc
Description: OpenPGP digital signature
