--- a/.hgignore Mon Oct 18 02:40:39 2021 -0500
+++ b/.hgignore Mon Oct 18 21:09:08 2021 -0500
@@ -7,6 +7,7 @@
^packaging\/debian\/tmp\/
^packaging\/debian\/(.+\.)?(substvars|debhelper\.log)$
^packaging\/debian\/build.*\/
@@ -18,6 +19,6 @@
^packaging\/debian\/files$
--- a/convey.yml Mon Oct 18 02:40:39 2021 -0500
+++ b/convey.yml Mon Oct 18 21:09:08 2021 -0500
@@ -1,7 +1,7 @@
- REGISTRY_HOST=docker.io
- - REPOSITORY=docker.io/talkatu/builders
+ - REPOSITORY=talkatu/builders - DOCS_BUILD_IMAGE=docker.io/talkatu/builders:debian-bullseye-amd64
@@ -12,12 +12,11 @@
- - debian-bullseye-amd64
+ - debian-bookworm-amd64 + - debian-bookworm-arm64 + - debian-bookworm-armhf @@ -47,16 +46,20 @@
files: build-docs/talkatu/reference/talkatu:talkatu-docs
- environment: TARGET=debian-bullseye-amd64
+ environment: TARGET=debian-bookworm-i386 - tasks: [import, build, export]
- environment: TARGET=debian-buster-amd64
+ environment: TARGET=debian-bookworm-amd64 - tasks: [import, build, export]
- environment: TARGET=debian-buster-i386
+ environment: TARGET=debian-bookworm-arm64 + - tasks: [import, build, export] + environment: TARGET=debian-bookworm-armhf - tasks: [import, build, export]
@@ -64,16 +67,8 @@
- tasks: [docs-clean, import, docs-build, docs-export]
- environment: TARGET=fedora-31-amd64
- - tasks: [import, build, export]
- environment: TARGET=fedora-32-amd64
- - tasks: [import, build, export]
- environment: TARGET=fedora-33-amd64
+ environment: TARGET=fedora-34-amd64 - tasks: [import, build, export]
--- a/packaging/debian/libtalkatu-doc.install Mon Oct 18 02:40:39 2021 -0500
+++ b/packaging/debian/libtalkatu-doc.install Mon Oct 18 21:09:08 2021 -0500
@@ -1,1 +1,1 @@
--- a/packaging/talkatu.spec.in Mon Oct 18 02:40:39 2021 -0500
+++ b/packaging/talkatu.spec.in Mon Oct 18 21:09:08 2021 -0500
@@ -18,9 +18,9 @@
BuildRequires: glade-devel
BuildRequires: cmark-devel
+BuildRequires: gi-docgen BuildRequires: gumbo-parser-devel
BuildRequires: gspell-devel
%if 0%{?suse_version} > 0
@@ -67,7 +67,6 @@
-rm -rf %{buildroot}%{_datadir}/doc/talkatu/
rm -rf %{buildroot}%{_datadir}/talkatu/
@@ -100,8 +99,8 @@
%{_libdir}/libtalkatu.so.0
%{_libdir}/pkgconfig/talkatu.pc
%{_libdir}/girepository-1.0/Talkatu-0.0.typelib
+%{_datadir}/doc/talkatu/ %{_datadir}/gir-1.0/Talkatu-0.0.gir
-%{_datadir}/gtk-doc/html/talkatu/
%{_datadir}/glade/catalogs/talkatu.xml