diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/libnm0.symbols | 3 | ||||
| -rw-r--r-- | debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch | 100 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 11 insertions, 101 deletions
diff --git a/debian/changelog b/debian/changelog index 676b8873..c4218eab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.42.2-1) unstable; urgency=medium + + * New upstream version 1.42.2 + * Drop patches merged upstream + * Update symbols file for libnm0 + + -- Michael Biebl <biebl@debian.org> Thu, 23 Feb 2023 17:53:42 +0100 + network-manager (1.42.0-1ubuntu1) lunar; urgency=medium * Resynchronize on Debian, remaining changes: diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols index 947f3520..ce5311d1 100644 --- a/debian/libnm0.symbols +++ b/debian/libnm0.symbols @@ -33,6 +33,7 @@ libnm.so.0 libnm0 #MINVER# libnm_1_40_0@libnm_1_40_0 1.40.0 libnm_1_40_4@libnm_1_40_4 1.40.4 libnm_1_42_0@libnm_1_42_0 1.42.0 + libnm_1_42_2@libnm_1_42_2 1.42.2 libnm_1_4_0@libnm_1_4_0 1.4.0 libnm_1_6_0@libnm_1_6_0 1.6.0 libnm_1_8_0@libnm_1_8_0 1.8.0 @@ -56,6 +57,7 @@ libnm.so.0 libnm0 #MINVER# nm_activation_state_flags_get_type@libnm_1_10_0 1.10.0 nm_active_connection_get_connection@libnm_1_0_0 1.0.0 nm_active_connection_get_connection_type@libnm_1_0_0 1.0.0 + nm_active_connection_get_controller@libnm_1_42_2 1.42.2 nm_active_connection_get_default6@libnm_1_0_0 1.0.0 nm_active_connection_get_default@libnm_1_0_0 1.0.0 nm_active_connection_get_devices@libnm_1_0_0 1.0.0 @@ -1054,6 +1056,7 @@ libnm.so.0 libnm0 #MINVER# nm_setting_ip_config_get_num_dns_searches@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_num_routes@libnm_1_0_0 1.0.0 nm_setting_ip_config_get_num_routing_rules@libnm_1_18_0 1.18.0 + nm_setting_ip_config_get_replace_local_rule@libnm_1_42_2 1.42.2 nm_setting_ip_config_get_required_timeout@libnm_1_30_8 1.34.0 nm_setting_ip_config_get_required_timeout@libnm_1_32_4 1.32.12 nm_setting_ip_config_get_route@libnm_1_0_0 1.0.0 diff --git a/debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch b/debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch deleted file mode 100644 index afb66d14..00000000 --- a/debian/patches/libnm-docs-fix-gtk-doc-generation-for-settings.patch +++ /dev/null @@ -1,100 +0,0 @@ -From: Thomas Haller <thaller@redhat.com> -Date: Fri, 10 Feb 2023 16:31:50 +0100 -Subject: libnm/docs: fix gtk-doc generation for settings - -Marking "nm-core-types.h" as to be ignored by gtk-doc, causes many files -to have the wrong names: - - /docs/libnm/html/{NMConnection.html => libnm-NMConnection.html} - /docs/libnm/html/{NMSetting.html => libnm-NMSetting.html} - /docs/libnm/html/{NMSetting6Lowpan.html => libnm-NMSetting6Lowpan.html} - /docs/libnm/html/{NMSetting8021x.html => libnm-NMSetting8021x.html} - /docs/libnm/html/{NMSettingAdsl.html => libnm-NMSettingAdsl.html} - /docs/libnm/html/{NMSettingBluetooth.html => libnm-NMSettingBluetooth.html} - /docs/libnm/html/{NMSettingBond.html => libnm-NMSettingBond.html} - /docs/libnm/html/{NMSettingBondPort.html => libnm-NMSettingBondPort.html} - /docs/libnm/html/{NMSettingBridge.html => libnm-NMSettingBridge.html} - /docs/libnm/html/{NMSettingBridgePort.html => libnm-NMSettingBridgePort.html} - /docs/libnm/html/{NMSettingCdma.html => libnm-NMSettingCdma.html} - /docs/libnm/html/{NMSettingConnection.html => libnm-NMSettingConnection.html} - /docs/libnm/html/{NMSettingDcb.html => libnm-NMSettingDcb.html} - /docs/libnm/html/{NMSettingDummy.html => libnm-NMSettingDummy.html} - /docs/libnm/html/{NMSettingEthtool.html => libnm-NMSettingEthtool.html} - /docs/libnm/html/{NMSettingGeneric.html => libnm-NMSettingGeneric.html} - /docs/libnm/html/{NMSettingGsm.html => libnm-NMSettingGsm.html} - /docs/libnm/html/{NMSettingHostname.html => libnm-NMSettingHostname.html} - /docs/libnm/html/{NMSettingIP4Config.html => libnm-NMSettingIP4Config.html} - /docs/libnm/html/{NMSettingIP6Config.html => libnm-NMSettingIP6Config.html} - /docs/libnm/html/{NMSettingIPConfig.html => libnm-NMSettingIPConfig.html} - /docs/libnm/html/{NMSettingIPTunnel.html => libnm-NMSettingIPTunnel.html} - /docs/libnm/html/{NMSettingInfiniband.html => libnm-NMSettingInfiniband.html} - /docs/libnm/html/{NMSettingMacsec.html => libnm-NMSettingMacsec.html} - /docs/libnm/html/{NMSettingMacvlan.html => libnm-NMSettingMacvlan.html} - /docs/libnm/html/{NMSettingMatch.html => libnm-NMSettingMatch.html} - /docs/libnm/html/{NMSettingOlpcMesh.html => libnm-NMSettingOlpcMesh.html} - /docs/libnm/html/{NMSettingOvsBridge.html => libnm-NMSettingOvsBridge.html} - /docs/libnm/html/{NMSettingOvsDpdk.html => libnm-NMSettingOvsDpdk.html} - /docs/libnm/html/{NMSettingOvsExternalIDs.html => libnm-NMSettingOvsExternalIDs.html} - /docs/libnm/html/{NMSettingOvsInterface.html => libnm-NMSettingOvsInterface.html} - /docs/libnm/html/{NMSettingOvsPatch.html => libnm-NMSettingOvsPatch.html} - /docs/libnm/html/{NMSettingOvsPort.html => libnm-NMSettingOvsPort.html} - /docs/libnm/html/{NMSettingPpp.html => libnm-NMSettingPpp.html} - /docs/libnm/html/{NMSettingPppoe.html => libnm-NMSettingPppoe.html} - /docs/libnm/html/{NMSettingProxy.html => libnm-NMSettingProxy.html} - /docs/libnm/html/{NMSettingSerial.html => libnm-NMSettingSerial.html} - /docs/libnm/html/{NMSettingSriov.html => libnm-NMSettingSriov.html} - /docs/libnm/html/{NMSettingTCConfig.html => libnm-NMSettingTCConfig.html} - /docs/libnm/html/{NMSettingTeam.html => libnm-NMSettingTeam.html} - /docs/libnm/html/{NMSettingTeamPort.html => libnm-NMSettingTeamPort.html} - /docs/libnm/html/{NMSettingTun.html => libnm-NMSettingTun.html} - /docs/libnm/html/{NMSettingUser.html => libnm-NMSettingUser.html} - /docs/libnm/html/{NMSettingVeth.html => libnm-NMSettingVeth.html} - /docs/libnm/html/{NMSettingVlan.html => libnm-NMSettingVlan.html} - /docs/libnm/html/{NMSettingVpn.html => libnm-NMSettingVpn.html} - /docs/libnm/html/{NMSettingVrf.html => libnm-NMSettingVrf.html} - /docs/libnm/html/{NMSettingVxlan.html => libnm-NMSettingVxlan.html} - /docs/libnm/html/{NMSettingWifiP2P.html => libnm-NMSettingWifiP2P.html} - /docs/libnm/html/{NMSettingWimax.html => libnm-NMSettingWimax.html} - /docs/libnm/html/{NMSettingWireGuard.html => libnm-NMSettingWireGuard.html} - /docs/libnm/html/{NMSettingWired.html => libnm-NMSettingWired.html} - /docs/libnm/html/{NMSettingWireless.html => libnm-NMSettingWireless.html} - /docs/libnm/html/{NMSettingWirelessSecurity.html => libnm-NMSettingWirelessSecurity.html} - /docs/libnm/html/{NMSettingWpan.html => libnm-NMSettingWpan.html} - /docs/libnm/html/{NMSimpleConnection.html => libnm-NMSimpleConnection.html} - -Revert that part of the change. Even if this regresses other problems. - -Fixes: 1330292d057c ('docs/libnm: fix gtkdoc-scan ignore lists') -(cherry picked from commit f0e3ca09c9d3a3196bee232307e42f008eb4baf2) -(cherry picked from commit 51b67d43275af5d7ab50d9b293b60d425925ac9b) ---- - docs/libnm/Makefile.am | 2 -- - docs/libnm/meson.build | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am -index 928ea5e..7a10848 100644 ---- a/docs/libnm/Makefile.am -+++ b/docs/libnm/Makefile.am -@@ -38,8 +38,6 @@ CFILE_GLOB=$(top_srcdir)/src/libnm-core-impl/*.c $(top_srcdir)/src/libnm-client- - - # Header files to ignore when scanning. - IGNORE_HFILES= \ -- nm-core-types.h \ -- \ - nm-dbus-helpers.h \ - nm-default-libnm.h \ - nm-device-private.h \ -diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build -index 5e742b6..01c9b66 100644 ---- a/docs/libnm/meson.build -+++ b/docs/libnm/meson.build -@@ -1,8 +1,6 @@ - # SPDX-License-Identifier: LGPL-2.1-or-later - - private_headers = [ -- 'nm-core-types.h', -- - 'nm-dbus-helpers.h', - 'nm-default-libnm.h', - 'nm-device-private.h', diff --git a/debian/patches/series b/debian/patches/series index ba6f6133..c2344eb9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ Force-online-state-with-unmanaged-devices.patch -libnm-docs-fix-gtk-doc-generation-for-settings.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch |