diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:00:09 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:06:47 +0200 |
| commit | b7db94545968c37886b7111d8c85f62eb063fbb4 (patch) | |
| tree | 7c2aedd497b1fdcb26bf9d49f98cc63a530baf2e /docs/api/meson.build | |
| parent | 9d5cdc3adde9e7e57bf5a0e754e563b6a9e8e513 (diff) | |
| parent | caf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff) | |
Import Debian changes 1.12.2-0ubuntu3
network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium
* debian/rules:
- use --with-libnm-glib, the default reversed since that's a legacy
library but we still need it for unity-control-center
network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium
* debian/patches/git-newglib-test.patch:
- backport upstream commit to fix the tests with the new glib
network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium
* New upstream version
* d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
d/p/git_thunderbolt_connect.patch:
- removed, those changes are in the new version
* Backport Debian changes
* Update symbols file for libnm0
* Enable iwd support
* Drop version requirements when oldstable ships a newer version
* Drop dh_strip override, the dbgsym migration is done
* Rebase patches
* Make sure the example server.conf is actually installed
* Update install path for plugins, it now includes a version number
* Drop libnl3 build dependency.
Upstream has copied the code directly from libnl3 for the few functions it
needs with a few small modifications.
* Drop libiw build dependency.
Hasn't been needed for a long time and was simply a left over from older
releases.
* Bump Standards-Version to 4.1.5
* Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)
Diffstat (limited to 'docs/api/meson.build')
| -rw-r--r-- | docs/api/meson.build | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/docs/api/meson.build b/docs/api/meson.build new file mode 100644 index 00000000..d0cc3ac8 --- /dev/null +++ b/docs/api/meson.build @@ -0,0 +1,31 @@ +doc_module = nm_name + +settings = 'settings-spec' +output = settings + '.xml' + +if enable_introspection + settings_xml = custom_target( + output, + input: nm_settings_docs, + output: output, + command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), '@INPUT@'], + # FIXME: there is no target depending on this, so it will not be built + build_by_default: true + ) +endif + +configure_file( + input: version_xml + '.in', + output: version_xml, + configuration: version_conf +) + +content_files += join_paths(meson.source_root(), 'COPYING') + +gnome.gtkdoc( + doc_module, + main_xml: 'network-manager-docs.xml', + src_dir: meson.current_source_dir(), + content_files: content_files, + install: true +) |