diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 11:35:14 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 11:52:25 +0200 |
| commit | c6c4e39b012d544c1f1ed816686c8ae1599da793 (patch) | |
| tree | 094d5e07c1d135d0ee67d99e051fd6a9a367a6a4 /configure.ac | |
| parent | 7368e45ff5b3b8b328d55408bcd403e4d6c564d0 (diff) | |
| parent | acd7b014c72673f5b0c0b91309e27028886da167 (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index cff7a03b..26223fce 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [24]) -m4_define([nm_micro_version], [2]) +m4_define([nm_minor_version], [25]) +m4_define([nm_micro_version], [91]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -1284,13 +1284,15 @@ if test "$build_docs" != "yes" -a \ \ -f "$srcdir"/man/nm-openvswitch.7 -a \ \ + -f "$srcdir"/man/nm-settings-dbus.5 -a \ -f "$srcdir"/man/nm-settings-ifcfg-rh.5 -a \ -f "$srcdir"/man/nm-settings-keyfile.5 -a \ - -f "$srcdir"/man/nm-settings.5 -a \ + -f "$srcdir"/man/nm-settings-nmcli.5 -a \ \ - -f "$srcdir"/man/nm-settings.xml -a \ - -f "$srcdir"/man/nm-settings-keyfile.xml -a \ + -f "$srcdir"/man/nm-settings-dbus.xml -a \ -f "$srcdir"/man/nm-settings-ifcfg-rh.xml -a \ + -f "$srcdir"/man/nm-settings-keyfile.xml -a \ + -f "$srcdir"/man/nm-settings-nmcli.xml -a \ \ -f "$srcdir"/docs/api/settings-spec.xml; then use_pregen_docs=yes |