docs: Move to xml

Closes: #877322

54 files changed, 42 insertions, 42 deletions

diff --git a/docs/Makefile b/docs/Makefile
index 4fdbecee..d06f512d 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -25,9 +25,9 @@ MAN1S = \
 MAN5S = gbp.conf
 
 MANUAL=manual-html
-SGML_MANPAGES=$(patsubst %,%.1,$(MAN1S)) $(patsubst %,%.5,$(MAN5S))
+XML_MANPAGES=$(patsubst %,%.1,$(MAN1S)) $(patsubst %,%.5,$(MAN5S))
 POD_MANPAGES=git-pbuilder.1
-MANPAGES=$(SGML_MANPAGES) $(POD_MANPAGES)
+MANPAGES=$(XML_MANPAGES) $(POD_MANPAGES)
 VERSION_ENT=version.ent
 GBP_VERSION=../gbp/version.py
 DEB_VERSION=$(shell sed -ne 's/^gbp_version\s\+=\s\+"\([.a-z0-9~-]\+\)"/\1/p' $(GBP_VERSION))
@@ -37,18 +37,18 @@ IMAGES=$(wildcard images/*png)
 DEST_IMAGES=$(subst images/,$(MANUAL)/images/,$(IMAGES))
 
 # Stuff to build docs outside Debian
-HAVE_SGML2X ?= 1
-GTK_DOC_CATALOG_FILE ?= /usr/share/sgml/gtk-doc/gtk-doc.cat
+HAVE_XML2X ?= 1
+GTK_DOC_CATALOG_FILE ?= /usr/share/xml/gtk-doc/gtk-doc.cat
 
 all: manual $(MANPAGES)
 
 manual: $(MANUAL) html_images css
 
-$(MANUAL): manual.sgml chapters/*.sgml manpages/*.sgml common.ent $(VERSION_ENT)
-ifeq ($(HAVE_SGML2X),1)
+$(MANUAL): manual.xml chapters/*.xml manpages/*.xml common.ent $(VERSION_ENT)
+ifeq ($(HAVE_XML2X),1)
 	docbook-2-html -s local $<
 else
-	docbook2html -d local-nosgml2x.dsl -c $(GTK_DOC_CATALOG_FILE) -o $(MANUAL) $<
+	docbook2html -d local-noxml2x.dsl -c $(GTK_DOC_CATALOG_FILE) -o $(MANUAL) $<
 endif
 	sed -i 's/^CLASS="[A-Z0-9]\+"/\L&/' manual-html/*.html
 	cp /usr/share/gtk-doc/data/*.png $(MANUAL)
@@ -63,17 +63,17 @@ $(MANUAL)/images/%.png: images/%.png
 
 # We build manpages under 'buildxref/' just to get an updated cross-reference
 # file (manpage.refs), before building the final manpages
-BUILD_MAN_XREF_PAGES=$(patsubst %,buildxref/%,$(SGML_MANPAGES))
+BUILD_MAN_XREF_PAGES=$(patsubst %,buildxref/%,$(XML_MANPAGES))
 
-buildxref/%.1 buildxref/%.5: man.%.sgml manpages/%.sgml
-	docbook2man -o buildxref $<
+buildxref/%.1 buildxref/%.5: man.%.xml manpages/%.xml
+	docbook2x-man -o buildxref $<
 	sed -i -r "s/\"[^\"]+\"/\"$(MAN_DATE)\"/3" $@
 
 manpage.refs: $(BUILD_MAN_XREF_PAGES)
 	cp buildxref/$@ $@
 
 %.1 %.5: manpage.refs
-	docbook2man -o . man.$*.sgml
+	docbook2x-man -o . man.$*.xml
 	sed -i -r "s/\"[^\"]+\"/\"$(MAN_DATE)\"/3" $@
 
 git-pbuilder.1: ../bin/git-pbuilder
diff --git a/docs/chapters/building.sgml b/docs/chapters/building.xml
index c0d16601..c0d16601 100644
--- a/docs/chapters/building.sgml
+++ b/docs/chapters/building.xml
diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.xml
index 469fe0b1..469fe0b1 100644
--- a/docs/chapters/cfgfile.sgml
+++ b/docs/chapters/cfgfile.xml
diff --git a/docs/chapters/chapters.ent b/docs/chapters/chapters.ent
index 21fd7c92..56c59806 100644
--- a/docs/chapters/chapters.ent
+++ b/docs/chapters/chapters.ent
@@ -1,8 +1,8 @@
-<!ENTITY ch.intro SYSTEM "intro.sgml">
-<!ENTITY ch.workflow SYSTEM "workflow.sgml">
-<!ENTITY ch.import SYSTEM "import.sgml">
-<!ENTITY ch.building SYSTEM "building.sgml">
-<!ENTITY ch.patches SYSTEM "patches.sgml">
-<!ENTITY ch.releases SYSTEM "releases.sgml">
-<!ENTITY ch.cfgfile SYSTEM "cfgfile.sgml">
-<!ENTITY ch.special SYSTEM "special.sgml">
+<!ENTITY ch.intro SYSTEM "intro.xml">
+<!ENTITY ch.workflow SYSTEM "workflow.xml">
+<!ENTITY ch.import SYSTEM "import.xml">
+<!ENTITY ch.building SYSTEM "building.xml">
+<!ENTITY ch.patches SYSTEM "patches.xml">
+<!ENTITY ch.releases SYSTEM "releases.xml">
+<!ENTITY ch.cfgfile SYSTEM "cfgfile.xml">
+<!ENTITY ch.special SYSTEM "special.xml">
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.xml
index df75ce58..df75ce58 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.xml
diff --git a/docs/chapters/intro.sgml b/docs/chapters/intro.xml
index 0a53ed9e..0a53ed9e 100644
--- a/docs/chapters/intro.sgml
+++ b/docs/chapters/intro.xml
diff --git a/docs/chapters/patches.sgml b/docs/chapters/patches.xml
index c3f5f509..c3f5f509 100644
--- a/docs/chapters/patches.sgml
+++ b/docs/chapters/patches.xml
diff --git a/docs/chapters/releases.sgml b/docs/chapters/releases.xml
index 692d72bf..692d72bf 100644
--- a/docs/chapters/releases.sgml
+++ b/docs/chapters/releases.xml
diff --git a/docs/chapters/special.sgml b/docs/chapters/special.xml
index 66eaebad..66eaebad 100644
--- a/docs/chapters/special.sgml
+++ b/docs/chapters/special.xml
diff --git a/docs/copyright.sgml b/docs/copyright.xml
index dd0c9622..dd0c9622 100644
--- a/docs/copyright.sgml
+++ b/docs/copyright.xml
diff --git a/docs/man.gbp-buildpackage-rpm.sgml b/docs/man.gbp-buildpackage-rpm.xml
index 8e7bac73..8e7bac73 100644
--- a/docs/man.gbp-buildpackage-rpm.sgml
+++ b/docs/man.gbp-buildpackage-rpm.xml
diff --git a/docs/man.gbp-buildpackage.sgml b/docs/man.gbp-buildpackage.xml
index e6496696..e6496696 100644
--- a/docs/man.gbp-buildpackage.sgml
+++ b/docs/man.gbp-buildpackage.xml
diff --git a/docs/man.gbp-clone.sgml b/docs/man.gbp-clone.xml
index 6fa6f56c..6fa6f56c 100644
--- a/docs/man.gbp-clone.sgml
+++ b/docs/man.gbp-clone.xml
diff --git a/docs/man.gbp-config.sgml b/docs/man.gbp-config.xml
index b0076e8e..b0076e8e 100644
--- a/docs/man.gbp-config.sgml
+++ b/docs/man.gbp-config.xml
diff --git a/docs/man.gbp-create-remote-repo.sgml b/docs/man.gbp-create-remote-repo.xml
index f46421a3..f46421a3 100644
--- a/docs/man.gbp-create-remote-repo.sgml
+++ b/docs/man.gbp-create-remote-repo.xml
diff --git a/docs/man.gbp-dch.sgml b/docs/man.gbp-dch.xml
index a31e12c5..a31e12c5 100644
--- a/docs/man.gbp-dch.sgml
+++ b/docs/man.gbp-dch.xml
diff --git a/docs/man.gbp-export-orig.sgml b/docs/man.gbp-export-orig.xml
index b4a7fb2b..b4a7fb2b 100644
--- a/docs/man.gbp-export-orig.sgml
+++ b/docs/man.gbp-export-orig.xml
diff --git a/docs/man.gbp-import-dsc.sgml b/docs/man.gbp-import-dsc.xml
index 6e1d02d3..6e1d02d3 100644
--- a/docs/man.gbp-import-dsc.sgml
+++ b/docs/man.gbp-import-dsc.xml
diff --git a/docs/man.gbp-import-dscs.sgml b/docs/man.gbp-import-dscs.xml
index 1fb47ee3..1fb47ee3 100644
--- a/docs/man.gbp-import-dscs.sgml
+++ b/docs/man.gbp-import-dscs.xml
diff --git a/docs/man.gbp-import-orig.sgml b/docs/man.gbp-import-orig.xml
index c64bffe7..c64bffe7 100644
--- a/docs/man.gbp-import-orig.sgml
+++ b/docs/man.gbp-import-orig.xml
diff --git a/docs/man.gbp-import-srpm.sgml b/docs/man.gbp-import-srpm.xml
index 9d578c48..9d578c48 100644
--- a/docs/man.gbp-import-srpm.sgml
+++ b/docs/man.gbp-import-srpm.xml
diff --git a/docs/man.gbp-pq-rpm.sgml b/docs/man.gbp-pq-rpm.xml
index a7799dd5..a7799dd5 100644
--- a/docs/man.gbp-pq-rpm.sgml
+++ b/docs/man.gbp-pq-rpm.xml
diff --git a/docs/man.gbp-pq.sgml b/docs/man.gbp-pq.xml
index 093ce2f4..093ce2f4 100644
--- a/docs/man.gbp-pq.sgml
+++ b/docs/man.gbp-pq.xml
diff --git a/docs/man.gbp-pristine-tar.sgml b/docs/man.gbp-pristine-tar.xml
index a1659ca1..a1659ca1 100644
--- a/docs/man.gbp-pristine-tar.sgml
+++ b/docs/man.gbp-pristine-tar.xml
diff --git a/docs/man.gbp-pull.sgml b/docs/man.gbp-pull.xml
index b2dedbdf..b2dedbdf 100644
--- a/docs/man.gbp-pull.sgml
+++ b/docs/man.gbp-pull.xml
diff --git a/docs/man.gbp-push.sgml b/docs/man.gbp-push.xml
index 430f722f..430f722f 100644
--- a/docs/man.gbp-push.sgml
+++ b/docs/man.gbp-push.xml
diff --git a/docs/man.gbp-rpm-ch.sgml b/docs/man.gbp-rpm-ch.xml
index 369684d7..369684d7 100644
--- a/docs/man.gbp-rpm-ch.sgml
+++ b/docs/man.gbp-rpm-ch.xml
diff --git a/docs/man.gbp-tag.sgml b/docs/man.gbp-tag.xml
index e4c8dafd..e4c8dafd 100644
--- a/docs/man.gbp-tag.sgml
+++ b/docs/man.gbp-tag.xml
diff --git a/docs/man.gbp.conf.sgml b/docs/man.gbp.conf.xml
index c01433fe..c01433fe 100644
--- a/docs/man.gbp.conf.sgml
+++ b/docs/man.gbp.conf.xml
diff --git a/docs/man.gbp.sgml b/docs/man.gbp.xml
index 829184a0..829184a0 100644
--- a/docs/man.gbp.sgml
+++ b/docs/man.gbp.xml
diff --git a/docs/manpages/gbp-buildpackage-rpm.sgml b/docs/manpages/gbp-buildpackage-rpm.xml
index f2ea1b6b..f2ea1b6b 100644
--- a/docs/manpages/gbp-buildpackage-rpm.sgml
+++ b/docs/manpages/gbp-buildpackage-rpm.xml
diff --git a/docs/manpages/gbp-buildpackage.sgml b/docs/manpages/gbp-buildpackage.xml
index 3da4573c..3da4573c 100644
--- a/docs/manpages/gbp-buildpackage.sgml
+++ b/docs/manpages/gbp-buildpackage.xml
diff --git a/docs/manpages/gbp-clone.sgml b/docs/manpages/gbp-clone.xml
index 3a2f68ce..3a2f68ce 100644
--- a/docs/manpages/gbp-clone.sgml
+++ b/docs/manpages/gbp-clone.xml
diff --git a/docs/manpages/gbp-config.sgml b/docs/manpages/gbp-config.xml
index fa824637..fa824637 100644
--- a/docs/manpages/gbp-config.sgml
+++ b/docs/manpages/gbp-config.xml
diff --git a/docs/manpages/gbp-create-remote-repo.sgml b/docs/manpages/gbp-create-remote-repo.xml
index 89cd5998..89cd5998 100644
--- a/docs/manpages/gbp-create-remote-repo.sgml
+++ b/docs/manpages/gbp-create-remote-repo.xml
diff --git a/docs/manpages/gbp-dch.sgml b/docs/manpages/gbp-dch.xml
index f57c5a8a..f57c5a8a 100644
--- a/docs/manpages/gbp-dch.sgml
+++ b/docs/manpages/gbp-dch.xml
diff --git a/docs/manpages/gbp-export-orig.sgml b/docs/manpages/gbp-export-orig.xml
index f695cd28..f695cd28 100644
--- a/docs/manpages/gbp-export-orig.sgml
+++ b/docs/manpages/gbp-export-orig.xml
diff --git a/docs/manpages/gbp-import-dsc.sgml b/docs/manpages/gbp-import-dsc.xml
index 51b7d124..51b7d124 100644
--- a/docs/manpages/gbp-import-dsc.sgml
+++ b/docs/manpages/gbp-import-dsc.xml
diff --git a/docs/manpages/gbp-import-dscs.sgml b/docs/manpages/gbp-import-dscs.xml
index f1782e0b..f1782e0b 100644
--- a/docs/manpages/gbp-import-dscs.sgml
+++ b/docs/manpages/gbp-import-dscs.xml
diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.xml
index ed4ce43f..ed4ce43f 100644
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.xml
diff --git a/docs/manpages/gbp-import-srpm.sgml b/docs/manpages/gbp-import-srpm.xml
index 0055ed51..0055ed51 100644
--- a/docs/manpages/gbp-import-srpm.sgml
+++ b/docs/manpages/gbp-import-srpm.xml
diff --git a/docs/manpages/gbp-pq-rpm.sgml b/docs/manpages/gbp-pq-rpm.xml
index b8535e6f..b8535e6f 100644
--- a/docs/manpages/gbp-pq-rpm.sgml
+++ b/docs/manpages/gbp-pq-rpm.xml
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.xml
index 3af503c0..3af503c0 100644
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.xml
diff --git a/docs/manpages/gbp-pristine-tar.sgml b/docs/manpages/gbp-pristine-tar.xml
index 25759d82..25759d82 100644
--- a/docs/manpages/gbp-pristine-tar.sgml
+++ b/docs/manpages/gbp-pristine-tar.xml
diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.xml
index d9caf89a..d9caf89a 100644
--- a/docs/manpages/gbp-pull.sgml
+++ b/docs/manpages/gbp-pull.xml
diff --git a/docs/manpages/gbp-push.sgml b/docs/manpages/gbp-push.xml
index dfddcb3d..dfddcb3d 100644
--- a/docs/manpages/gbp-push.sgml
+++ b/docs/manpages/gbp-push.xml
diff --git a/docs/manpages/gbp-rpm-ch.sgml b/docs/manpages/gbp-rpm-ch.xml
index 4e4621b3..4e4621b3 100644
--- a/docs/manpages/gbp-rpm-ch.sgml
+++ b/docs/manpages/gbp-rpm-ch.xml
diff --git a/docs/manpages/gbp-tag.sgml b/docs/manpages/gbp-tag.xml
index 48504e2a..48504e2a 100644
--- a/docs/manpages/gbp-tag.sgml
+++ b/docs/manpages/gbp-tag.xml
diff --git a/docs/manpages/gbp.conf.sgml b/docs/manpages/gbp.conf.xml
index 6c3bacac..6c3bacac 100644
--- a/docs/manpages/gbp.conf.sgml
+++ b/docs/manpages/gbp.conf.xml
diff --git a/docs/manpages/gbp.sgml b/docs/manpages/gbp.xml
index 1a3c8e93..1a3c8e93 100644
--- a/docs/manpages/gbp.sgml
+++ b/docs/manpages/gbp.xml
diff --git a/docs/manpages/man.conffiles.sgml b/docs/manpages/man.conffiles.xml
index 7f8ef9a4..7f8ef9a4 100644
--- a/docs/manpages/man.conffiles.sgml
+++ b/docs/manpages/man.conffiles.xml
diff --git a/docs/manpages/man.seealso.sgml b/docs/manpages/man.seealso.xml
index b7af1337..b7af1337 100644
--- a/docs/manpages/man.seealso.sgml
+++ b/docs/manpages/man.seealso.xml
diff --git a/docs/manpages/manpages.ent b/docs/manpages/manpages.ent
index 29289684..452f83a5 100644
--- a/docs/manpages/manpages.ent
+++ b/docs/manpages/manpages.ent
@@ -1,25 +1,25 @@
-<!ENTITY man.gbp SYSTEM "gbp.sgml">
-<!ENTITY man.gbp.buildpackage SYSTEM "gbp-buildpackage.sgml">
-<!ENTITY man.gbp.buildpackage.rpm SYSTEM "gbp-buildpackage-rpm.sgml">
-<!ENTITY man.gbp.clone SYSTEM "gbp-clone.sgml">
-<!ENTITY man.gbp.conf SYSTEM "gbp.conf.sgml">
-<!ENTITY man.gbp.config SYSTEM "gbp-config.sgml">
-<!ENTITY man.gbp.config-files SYSTEM "man.conffiles.sgml">
-<!ENTITY man.gbp.create.remote.repo SYSTEM "gbp-create-remote-repo.sgml">
-<!ENTITY man.gbp.dch SYSTEM "gbp-dch.sgml">
-<!ENTITY man.gbp.exportorig SYSTEM "gbp-export-orig.sgml">
-<!ENTITY man.gbp.import.srpm SYSTEM "gbp-import-srpm.sgml">
-<!ENTITY man.gbp.importdsc SYSTEM "gbp-import-dsc.sgml">
-<!ENTITY man.gbp.importdscs SYSTEM "gbp-import-dscs.sgml">
-<!ENTITY man.gbp.importorig SYSTEM "gbp-import-orig.sgml">
-<!ENTITY man.gbp.pq SYSTEM "gbp-pq.sgml">
-<!ENTITY man.gbp.pq.rpm SYSTEM "gbp-pq-rpm.sgml">
-<!ENTITY man.gbp.pristine.tar SYSTEM "gbp-pristine-tar.sgml">
-<!ENTITY man.gbp.pull SYSTEM "gbp-pull.sgml">
-<!ENTITY man.gbp.push SYSTEM "gbp-push.sgml">
-<!ENTITY man.gbp.rpm.ch SYSTEM "gbp-rpm-ch.sgml">
-<!ENTITY man.gbp.tag SYSTEM "gbp-tag.sgml">
-<!ENTITY man.seealso.common SYSTEM "man.seealso.sgml">
+<!ENTITY man.gbp SYSTEM "gbp.xml">
+<!ENTITY man.gbp.buildpackage SYSTEM "gbp-buildpackage.xml">
+<!ENTITY man.gbp.buildpackage.rpm SYSTEM "gbp-buildpackage-rpm.xml">
+<!ENTITY man.gbp.clone SYSTEM "gbp-clone.xml">
+<!ENTITY man.gbp.conf SYSTEM "gbp.conf.xml">
+<!ENTITY man.gbp.config SYSTEM "gbp-config.xml">
+<!ENTITY man.gbp.config-files SYSTEM "man.conffiles.xml">
+<!ENTITY man.gbp.create.remote.repo SYSTEM "gbp-create-remote-repo.xml">
+<!ENTITY man.gbp.dch SYSTEM "gbp-dch.xml">
+<!ENTITY man.gbp.exportorig SYSTEM "gbp-export-orig.xml">
+<!ENTITY man.gbp.import.srpm SYSTEM "gbp-import-srpm.xml">
+<!ENTITY man.gbp.importdsc SYSTEM "gbp-import-dsc.xml">
+<!ENTITY man.gbp.importdscs SYSTEM "gbp-import-dscs.xml">
+<!ENTITY man.gbp.importorig SYSTEM "gbp-import-orig.xml">
+<!ENTITY man.gbp.pq SYSTEM "gbp-pq.xml">
+<!ENTITY man.gbp.pq.rpm SYSTEM "gbp-pq-rpm.xml">
+<!ENTITY man.gbp.pristine.tar SYSTEM "gbp-pristine-tar.xml">
+<!ENTITY man.gbp.pull SYSTEM "gbp-pull.xml">
+<!ENTITY man.gbp.push SYSTEM "gbp-push.xml">
+<!ENTITY man.gbp.rpm.ch SYSTEM "gbp-rpm-ch.xml">
+<!ENTITY man.gbp.tag SYSTEM "gbp-tag.xml">
+<!ENTITY man.seealso.common SYSTEM "man.seealso.xml">
 
 <!ENTITY % COMMON.OPTIONS SYSTEM "man.common-options.ent">
 %COMMON.OPTIONS;
diff --git a/docs/manual.sgml b/docs/manual.xml
index 234e55dc..82c25fba 100644
--- a/docs/manual.sgml
+++ b/docs/manual.xml
@@ -7,7 +7,7 @@
   %MANPAGES;
   <!ENTITY % CHAPTERS SYSTEM "chapters/chapters.ent">
   %CHAPTERS;
-  <!ENTITY gbp.copyright SYSTEM "copyright.sgml">
+  <!ENTITY gbp.copyright SYSTEM "copyright.xml">
 ]>
 
 <book id="gbp">