From 3b78c1eb86502733fa3ad797434e0994502dbab7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 26 Aug 2021 16:26:33 +0200
Subject: [PATCH] build: sort filename alphabetically in Makefile.am and
 similar

The question is what "alphabetically" means (as it depends on
collation). To me, it means ":sort" in `LANG=en_US.UTF-8 vim`.
---
 Makefile.am               | 22 +++++++++++-----------
 docs/libnm/libnm-docs.xml |  8 ++++----
 po/POTFILES.in            |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 02aaf6a816..25ea649484 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1253,8 +1253,8 @@ src_libnm_core_impl_lib_c_settings_real = \
 	src/libnm-core-impl/nm-setting-8021x.c \
 	src/libnm-core-impl/nm-setting-adsl.c \
 	src/libnm-core-impl/nm-setting-bluetooth.c \
-	src/libnm-core-impl/nm-setting-bond.c \
 	src/libnm-core-impl/nm-setting-bond-port.c \
+	src/libnm-core-impl/nm-setting-bond.c \
 	src/libnm-core-impl/nm-setting-bridge-port.c \
 	src/libnm-core-impl/nm-setting-bridge.c \
 	src/libnm-core-impl/nm-setting-cdma.c \
@@ -5087,14 +5087,14 @@ src_nmtui_nmtui_SOURCES = \
 	src/nmtui/nmt-mac-entry.h \
 	src/nmtui/nmt-mtu-entry.c \
 	src/nmtui/nmt-mtu-entry.h \
-	src/nmtui/nmt-page-bond.c \
-	src/nmtui/nmt-page-bond.h \
 	src/nmtui/nmt-page-bond-port.c \
 	src/nmtui/nmt-page-bond-port.h \
-	src/nmtui/nmt-page-bridge.c \
-	src/nmtui/nmt-page-bridge.h \
+	src/nmtui/nmt-page-bond.c \
+	src/nmtui/nmt-page-bond.h \
 	src/nmtui/nmt-page-bridge-port.c \
 	src/nmtui/nmt-page-bridge-port.h \
+	src/nmtui/nmt-page-bridge.c \
+	src/nmtui/nmt-page-bridge.h \
 	src/nmtui/nmt-page-dsl.c \
 	src/nmtui/nmt-page-dsl.h \
 	src/nmtui/nmt-page-ethernet.c \
@@ -5109,10 +5109,10 @@ src_nmtui_nmtui_SOURCES = \
 	src/nmtui/nmt-page-ip6.h \
 	src/nmtui/nmt-page-ppp.c \
 	src/nmtui/nmt-page-ppp.h \
-	src/nmtui/nmt-page-team.c \
-	src/nmtui/nmt-page-team.h \
 	src/nmtui/nmt-page-team-port.c \
 	src/nmtui/nmt-page-team-port.h \
+	src/nmtui/nmt-page-team.c \
+	src/nmtui/nmt-page-team.h \
 	src/nmtui/nmt-page-vlan.c \
 	src/nmtui/nmt-page-vlan.h \
 	src/nmtui/nmt-page-wifi.c \
@@ -5131,12 +5131,12 @@ src_nmtui_nmtui_SOURCES = \
 	src/nmtui/nmt-route-table.h \
 	src/nmtui/nmt-slave-list.c \
 	src/nmtui/nmt-slave-list.h \
-	src/nmtui/nmt-wireguard-peer-list.c \
-	src/nmtui/nmt-wireguard-peer-list.h \
-	src/nmtui/nmt-wireguard-peer-editor.c \
-	src/nmtui/nmt-wireguard-peer-editor.h \
 	src/nmtui/nmt-utils.c \
 	src/nmtui/nmt-utils.h \
+	src/nmtui/nmt-wireguard-peer-editor.c \
+	src/nmtui/nmt-wireguard-peer-editor.h \
+	src/nmtui/nmt-wireguard-peer-list.c \
+	src/nmtui/nmt-wireguard-peer-list.h \
 	src/nmtui/nmt-widget-list.c \
 	src/nmtui/nmt-widget-list.h \
 	$(NULL)
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index cb66c17e6f..e9811c1485 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -327,20 +327,20 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-setting-gsm.xml"/>
     <xi:include href="xml/nm-setting-hostname.xml"/>
     <xi:include href="xml/nm-setting-infiniband.xml"/>
-    <xi:include href="xml/nm-setting-ip4-config.xml"/>
-    <xi:include href="xml/nm-setting-ip6-config.xml"/>
     <xi:include href="xml/nm-setting-ip-config.xml"/>
     <xi:include href="xml/nm-setting-ip-tunnel.xml"/>
+    <xi:include href="xml/nm-setting-ip4-config.xml"/>
+    <xi:include href="xml/nm-setting-ip6-config.xml"/>
     <xi:include href="xml/nm-setting-macsec.xml"/>
     <xi:include href="xml/nm-setting-macvlan.xml"/>
     <xi:include href="xml/nm-setting-match.xml"/>
     <xi:include href="xml/nm-setting-olpc-mesh.xml"/>
     <xi:include href="xml/nm-setting-ovs-bridge.xml"/>
-    <xi:include href="xml/nm-setting-ovs-interface.xml"/>
     <xi:include href="xml/nm-setting-ovs-dpdk.xml"/>
+    <xi:include href="xml/nm-setting-ovs-external-ids.xml"/>
+    <xi:include href="xml/nm-setting-ovs-interface.xml"/>
     <xi:include href="xml/nm-setting-ovs-patch.xml"/>
     <xi:include href="xml/nm-setting-ovs-port.xml"/>
-    <xi:include href="xml/nm-setting-ovs-external-ids.xml"/>
     <xi:include href="xml/nm-setting-ppp.xml"/>
     <xi:include href="xml/nm-setting-pppoe.xml"/>
     <xi:include href="xml/nm-setting-proxy.xml"/>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3d8ccafd7a..0cd24d9940 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -181,9 +181,9 @@ src/nmtui/nmt-password-fields.c
 src/nmtui/nmt-route-editor.c
 src/nmtui/nmt-route-table.c
 src/nmtui/nmt-slave-list.c
-src/nmtui/nmt-wireguard-peer-list.c
-src/nmtui/nmt-wireguard-peer-editor.c
 src/nmtui/nmt-widget-list.c
+src/nmtui/nmt-wireguard-peer-editor.c
+src/nmtui/nmt-wireguard-peer-list.c
 src/nmtui/nmtui-connect.c
 src/nmtui/nmtui-edit.c
 src/nmtui/nmtui-hostname.c