doc, maint: Publishing DTDs requires a MR to xdg-specs

We can no longer upload to specifications.freedesktop.org directly.
Instead, that area of the freedesktop.org web space is updated by
sending merge requests to the xdg/xdg-specs> project.

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/doc/maintainer-upload-docs.sh b/doc/maintainer-upload-docs.sh
index f090cf461fa5b8c8738ee0a911d1fc9ac4a763ca..2e839149c2e47d723f7bad166eb3a2cfe0cf7b6b 100755 (executable)
--- a/doc/maintainer-upload-docs.sh
+++ b/doc/maintainer-upload-docs.sh
@@ -25,9 +25,6 @@ set -eux
 : "${DOC_SERVER:=dbus.freedesktop.org}"
 : "${DOC_WWW_DIR:=/srv/dbus.freedesktop.org/www}"
 
-: "${SPECIFICATION_SERVER:=specifications.freedesktop.org}"
-: "${SPECIFICATION_PATH:=/srv/specifications.freedesktop.org/www/dbus/1.0}"
-
 if [ -n "${MESON_BUILD_ROOT-}" ]; then
     cd "${MESON_BUILD_ROOT}"
 fi
@@ -49,5 +46,3 @@ tar --xz -c -f dbus-docs.tar.xz dbus-docs
 
 scp dbus-docs.tar.xz "$DOC_SERVER:$DOC_WWW_DIR/"
 rsync -rpvzP --chmod=Dg+s,ug+rwX,o=rX dbus-docs/ "$DOC_SERVER:$DOC_WWW_DIR/doc/"
-
-scp -p "$top_srcdir"/doc/*.dtd "$SPECIFICATION_SERVER:$SPECIFICATION_PATH/"

diff --git a/maint/release-checklist.md b/maint/release-checklist.md
index f2234be83f54ba02db2b7830832111b142b7875f..73eb83ba7b49ffd69c4334e3d059384d246c4f1a 100644 (file)
--- a/maint/release-checklist.md
+++ b/maint/release-checklist.md
@@ -55,6 +55,11 @@ To make a release of D-Bus, do the following:
  - Update the online documentation with
      `ninja -C ${builddir} maintainer-upload-docs`.
 
+ - If `doc/busconfig.dtd` and/or `doc/introspect.dtd` have changed, send
+   a merge request to `xdg-specs` similar to
+   <https://gitlab.freedesktop.org/xdg/xdg-specs/90> to get the new
+   version published
+
  - post to dbus@lists.freedesktop.org announcing the release.
 
 ## Making a ".0" stable release