Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Hi, I'd like to make stable upload for network-manager-applet fixing the GObject-Introspection bindings for libnma. While we don't have any software in stretch which uses those bindings, there are 3rd party packages and downstream distros like Linux Mint which want to make use of those bindings e.g. in Cinnamon. (See also the related #910628). The package is a cherry-pick/backport from upstream master and already part of buster/sid. Full debdiff is attached. Thanks for considering, Michael -- System Information: Debian Release: buster/sid APT prefers unstable APT policy: (500, 'unstable'), (200, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.18.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff --git a/debian/changelog b/debian/changelog index ad533660..985df157 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +network-manager-applet (1.4.4-1+deb9u1) stretch; urgency=medium + + * libnma/pygobject: libnma/NMA must use libnm/NM instead of legacy + libraries. + libnma uses libnm, and not libnm-util/libnm-glib. Hence, the python + bindings must load "NM" and not "NMClient"/"NetworkManager". As it was, + the generated bindings for libnma were unusable and loading them + would fail. (Closes: #896818) + + -- Michael Biebl <bi...@debian.org> Tue, 09 Oct 2018 00:59:55 +0200 + network-manager-applet (1.4.4-1) unstable; urgency=medium * New upstream release. diff --git a/debian/gbp.conf b/debian/gbp.conf index 478d845c..55b2a3d6 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,4 @@ [DEFAULT] pristine-tar = True patch-numbers = False -debian-branch = master +debian-branch = stretch diff --git a/debian/patches/libnma-pygobject-libnma-NMA-must-use-libnm-NM-instead-of-.patch b/debian/patches/libnma-pygobject-libnma-NMA-must-use-libnm-NM-instead-of-.patch new file mode 100644 index 00000000..55736529 --- /dev/null +++ b/debian/patches/libnma-pygobject-libnma-NMA-must-use-libnm-NM-instead-of-.patch @@ -0,0 +1,34 @@ +From: Thomas Haller <thal...@redhat.com> +Date: Tue, 7 Mar 2017 09:43:03 +0100 +Subject: libnma/pygobject: libnma/NMA must use libnm/NM instead of legacy + libraries + +libnma uses libnm, and not libnm-util/libnm-glib. Hence, the python bindings +must load "NM" and not "NMClient"/"NetworkManager". + +As it was, the generated bindings for libnma were unusable and loading +them would fail with + + libnm-ERROR **: libnm-util symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported + +https://bugzilla.gnome.org/show_bug.cgi?id=779153 + +Fixes: 76a12beac4e8692f30071169e11e2b521ec4eab7 +(cherry picked from commit 7a59d41e5f6666d0da51f1f7aae7518befdb1182) +--- + src/libnma/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libnma/Makefile.am b/src/libnma/Makefile.am +index b861db6..950b9fc 100644 +--- a/src/libnma/Makefile.am ++++ b/src/libnma/Makefile.am +@@ -66,7 +66,7 @@ if HAVE_INTROSPECTION + introspection_sources = $(libnma_HEADERS) $(libnma_la_SOURCES) + + NMA-1.0.gir: libnma.la +-NMA_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0 ++NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0 + NMA_1_0_gir_EXPORT_PACKAGES = libnma + NMA_1_0_gir_CFLAGS = $(libnma_la_CFLAGS) + NMA_1_0_gir_LIBS = libnma.la diff --git a/debian/patches/series b/debian/patches/series index baed4ac7..72821c91 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ Allow-to-create-connections-without-admin-privileges.patch Force-online-state-with-unmanaged-devices.patch +libnma-pygobject-libnma-NMA-must-use-libnm-NM-instead-of-.patch
