diff options
| author | Simon McVittie <smcv@debian.org> | 2022-11-22 10:38:25 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2022-11-22 10:38:25 +0000 |
| commit | 336bc265b67a00939fda7fa5b16b1ed97d847214 (patch) | |
| tree | a43281176cd999745e840d0e7ef446d9291001bf | |
| parent | fc89af9a716c48c342cfac753c81aa66104055f9 (diff) | |
Drop a patch that broke the build
| -rw-r--r-- | debian/patches/meson-copy-the-extra-html-files-into-our-builddir-too.patch | 36 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 37 deletions
diff --git a/debian/patches/meson-copy-the-extra-html-files-into-our-builddir-too.patch b/debian/patches/meson-copy-the-extra-html-files-into-our-builddir-too.patch deleted file mode 100644 index c3bbc4a..0000000 --- a/debian/patches/meson-copy-the-extra-html-files-into-our-builddir-too.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu, 25 Aug 2022 16:10:30 +1000 -Subject: meson: copy the extra html files into our builddir too - -This way all our documentation is in the builddir. - -Origin: upstream, 1.15.1, commit:0db2d66d18cfc7248468ea2b4706f2794522e94b ---- - doc/meson.build | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/doc/meson.build b/doc/meson.build -index 9cc590e..37cac0d 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -23,5 +23,17 @@ if build_docbook - install: true, - install_dir: docs_dir, - ) -- install_data('docbook.css', install_dir: docs_dir) --endif -\ No newline at end of file -+ doc_extra = files( -+ 'docbook.css', -+ 'redirect.html' -+ ) -+ foreach f : doc_extra -+ configure_file( -+ input: f, -+ output: '@PLAINNAME@', -+ copy: true, -+ install: true, -+ install_dir: docs_dir, -+ ) -+ endforeach -+endif diff --git a/debian/patches/series b/debian/patches/series index f0e55d3..c61115a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ Move-xdg-permission-store-to-session-slice.patch Add-PartOf-to-all-systemd-units.patch -meson-copy-the-extra-html-files-into-our-builddir-too.patch file-transfer-Fix-documentation-on-options-vardicts.patch file-transfer-Fix-documentation-using-old-names-for-what-.patch screenshot-Add-Impl-version-property-and-query-it-766.patch |