Clean up build scripts

Signed-off-by: Osamu Aoki <osamu@debian.org>
2026-01-16 23:14:19 +00:00 · 2021-05-31 22:17:51 +09:00 · 2021-05-31 22:17:51 +09:00 · 0de57b638a
commit 0de57b638a
parent dbb2f2600f
21 changed files with 361 additions and 2465 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,23 +1,29 @@
+*.po.*
+*.po-*
 *.mo
 *.swp
 *.tmp
 *~
 .git
-.gitignore
+all-popcon-date.txt
 all-popcon-pkgs.txt
 all-popcon-results.txt
 all-popcon-submissions.txt
+build
+common.ent
 debian-reference.*.xml
 debian-reference.*.xmlt
+debian-reference.rawxml
+fuzzy.log
 header.rawxml
-packages.bkup.txt
 packages.contrib
+packages.experimental.txt
 packages.main
 packages.non-free
+packages.oldstable.txt
+packages.stable.txt
 packages.txt
 pkg.lst
-rawxml/debian-reference.rawxml
+templates.pot
 tmp
-fuzzy.log
-po/templates.pot

--- a/397
+++ b/397
@ -2,8 +2,9 @@
 # Build debian-reference (v2)
 # vim: set ts=8:
 #######################################################################
-### key adjustable parameters
-#######################################################################
+#======================================================================
+# ===== Adjustable parameters =========================================
+#======================================================================
 # base file name excluding file extension
 MANUAL	:=	debian-reference
 # languages translated with PO files
@ -14,21 +15,33 @@ NOPDF	:=
 # languages to build document
 LANGALL	=	en $(LANGPO)

-# Change at the last moment (this package is part of web page)
+# Packages uploaded to unstable repo generate official Debian web pages
+# Change these to post-release state when Debian is under soft freeze
+#
+# current "stable" release name
+RELEASE_NAME0L := bullseye
+RELEASE_NAME0C := Bullseye
+# next "stable" / "testing" release name
+RELEASE_NAME1L := bookworm
+RELEASE_NAME1C := Bookworm
+# next next "stable" / next "testing" release name
+RELEASE_NAME2L := trixie
+RELEASE_NAME2C := Trixie
+# release name considered outdated (Release_Date-EOL_for_LTS)
+RELEASE_NAMEXX := Jessie 8 (2015-2020)
+# release names when this document was last updated
+RELEASE_DOC_1  := Bullseye (=<literal>stable</literal>)
+RELEASE_DOC_2  := Bookworm (=<literal>testing</literal>)

-# "stable" release name in document matches current "stable" release name
-# * This is used for unstable upload well before almost freeze
-# * This is used for post *.2 release updates
-#RELEASE_STATE := normal
+# version in changelog
+DR_VERSION :=	$(shell dpkg-parsechangelog --show-field Version)
+# set SOURCE_DATE_EPOCH if unset (when not called from debhelper)
+SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
+# date in changelog
+SOURCE_DATE := $(shell date -u +'%F %T %Z' --date=@$(SOURCE_DATE_EPOCH))

-# "stable" release name in document matches current "testing" release name
-# * This is used for unstable upload after almost freeze before *.1 release
-RELEASE_STATE := freeze
-
-# TMP_DIR_DR is not mean to be set to generic TMPDIR like /tmp ~/.tmp
-ifndef TMP_DIR_DR
-TMP_DIR_DR	:= $(CURDIR)/tmp
-endif
+# BUILD_DIR is not mean to be set to generic TMPDIR
+BUILD_DIR	:= $(CURDIR)/build

 # Change $(DRAFTMODE) from "yes" to "maybe" when this document
 # should go into production mode
@ -59,9 +72,19 @@ GETTEXT	:=	po4a-gettextize -M utf-8 -L utf-8 --format docbook
 UPDATEPO:=	msgmerge --update --previous
 MSGATTR	:=	msgattrib
 MSGCAT	:=	msgcat
+MSGUNIQ	:=	msguniq --use-first
 DBLATEX	:=	dblatex
+SED	:=	sed

-# Debian package archive URL
+# Source files
+SRC_XML :=	$(wildcard $(DRAW)/*_*.rawxml)
+SRC_ENT:=	remote.ent common.ent
+# source PO files for all languages (build prcess requires these)
+SRC_PO :=	$(addsuffix .po, $(addprefix  $(DPO)/, $(LANGPO)))
+# sed script for replace
+SEDF ?= $(DBIN)/replace0
+
+# Remote file source (related to Debian package archive URLs)
 #DEBM	:=	http://ftp.us.debian.org/debian/dists
 #DEBM	:=	http://ftp.jp.debian.org/debian/dists
 DEBM	:=	http://deb.debian.org/debian/dists
@ -74,7 +97,17 @@ UDEBA	:=	$(DEBM)/$(CODE)
 UDEBB	:=	$(DEBM)/experimental
 UDEBC	:=	$(DEBM)/stable
 UDEBD	:=	$(DEBM)/oldstable
-DR_VERSION :=	$(shell dpkg-parsechangelog --show-field Version)
+# processed remote data
+PACKAGES_DATA := packages.main packages.contrib packages.non-free \
+		packages.txt packages.experimental.txt \
+		packages.stable.txt packages.oldstable.txt
+POPCON_DATA :=  all-popcon-results.txt \
+		all-popcon-date.txt \
+		all-popcon-submissions.txt \
+		all-popcon-pkgs.txt
+PKG_LIST :=	pkg.lst
+REMOTE_DATA :=	$(PACKAGES_DATA) $(POPCON_DATA)
+

 #######################################################################
 # Used as $(call check-command, <command>, <package>)
@ -84,6 +117,16 @@ set -e; if ! which $(1) >/dev/null; then \
  false; \
 fi
 endef
+# Used as $(call check-file, <file>)
+define check-file
+set -e; if ! [ -r $(1) ]; then \
+  echo "Missing file: $(1)"; \
+  false; \
+fi
+endef
+#======================================================================
+# ===== Build targets =================================================
+#======================================================================
 #######################################################################
 # $ make all       # build all
 #######################################################################
@ -97,19 +140,27 @@ all: css html txt epub pdf
 #######################################################################
 .PHONY: test
 test: html css
+	cat fuzzy.log
+
+#######################################################################
+# $ make entity    # refresh remote.ent (Need remote access)
+#######################################################################
+# For major English update, run this and commit updated data
+.PHONY: entity
+entity:
+	$(MAKE) entityclean
+	$(MAKE) remote.ent
+#######################################################################
+# $ make en      # build html for testing (for English)
+#######################################################################
+.PHONY: en
+en:
+	$(MAKE) entity
+	$(MAKE) html css LANGPO=

 #######################################################################
 # Phase 1 (pre-build): Debian archive stat data
 #######################################################################
-# fetch remote data (not for every build) and cached these data
-PACKAGES_DATA := packages.main packages.contrib packages.non-free \
-		packages.txt packages.bkup.txt \
-		packages.stable.txt packages.oldstable.txt
-POPCON_DATA :=  all-popcon-results.txt \
-		all-popcon-submissions.txt \
-		all-popcon-pkgs.txt pkg.lst
-REMOTE_DATA :=	$(PACKAGES_DATA) $(POPCON_DATA)
-
 .PHONY: remote
 remote: $(REMOTE_DATA)

@ -137,17 +188,17 @@ packages.non-free:
 	grep-dctrl -e -sPackage,Installed-Size -P "." packages.non-free.tmp > packages.non-free
 	rm packages.non-free.tmp

-packages.txt: packages.main packages.contrib packages.non-free
-	# FETCH PACKAGE (sid)
-	cat packages.main packages.contrib packages.non-free >packages.txt
-
-packages.bkup.txt:
+packages.experimental.txt:
 	# FETCH PACKAGE (experimental main)
 	@$(call check-command, wget, wget)
 	@$(call check-command, grep-dctrl, dctrl-tools)
-	wget -O - $(UDEBB)/main/binary-$(ARCH)/Packages.xz      | xzcat - > packages.bkup.tmp
-	grep-dctrl -e -sPackage,Installed-Size -P "." packages.bkup.tmp > packages.bkup.txt
-	rm packages.bkup.tmp
+	wget -O - $(UDEBB)/main/binary-$(ARCH)/Packages.xz      | xzcat - > packages.experimental.tmp
+	grep-dctrl -e -sPackage,Installed-Size -P "." packages.experimental.tmp > packages.experimental.txt
+	rm packages.experimental.tmp
+
+packages.txt: packages.main packages.contrib packages.non-free
+	# FETCH PACKAGE (sid)
+	cat packages.main packages.contrib packages.non-free >packages.txt

 packages.stable.txt:
 	# FETCH PACKAGE (stable main)
@ -173,10 +224,13 @@ all-popcon-results.txt:
 	wget -O - $(UPOPC) | zcat - > all-popcon-results.txt

 all-popcon-submissions.txt: all-popcon-results.txt
-	sed -n -e 's/^Submissions: *\([^ ]*\) *$$/\1/p' < all-popcon-results.txt >all-popcon-submissions.txt
+	sed -n -e 's/^Submissions: *\([^ ]*\) *$$/\1/p' < all-popcon-results.txt > all-popcon-submissions.txt
+
+all-popcon-date.txt: all-popcon-results.txt
+	echo "<!ENTITY pop-date \"$(shell date -u +'%F %T %Z')\">"	>  all-popcon-date.txt

 all-popcon-pkgs.txt: all-popcon-results.txt
-	grep --binary-files=text -e '^Package: [a-z0-9][-+a-z0-9.]*[ 0-9]*$$' < all-popcon-results.txt >all-popcon-pkgs.txt
+	grep --binary-files=text -e '^Package: [a-z0-9][-+a-z0-9.]*[ 0-9]*$$' < all-popcon-results.txt > all-popcon-pkgs.txt

 # RAWXML (with @emacs@ etc.) to PACKAGE LIST
 pkg.lst: $(DRAW)/$(MANUAL).rawxml
@ -185,88 +239,52 @@ pkg.lst: $(DRAW)/$(MANUAL).rawxml
 	$(XPNO) $(DXSL)/pkg.xsl $(DRAW)/$(MANUAL).rawxml > pkg.lst

 # ENTITY DATA
-# source XML inclusion files (excluding common.ent)
-ENT_STAT:=	datadatepop.ent datadatesize.ent popcon.ent pkgsize.ent common.ent
+# source XML inclusion file (pre-commited since this needs remote access)
+remote.ent:
+	$(MAKE) $(REMOTE_DATA) $(PKG_LIST)
+	cat all-popcon-date.txt													>  remote.ent
+	echo "<!ENTITY all-packages \"$$(grep -e '^Package:' packages.txt | wc -l)\">"						>> remote.ent
+	echo "<!ENTITY main-packages \"$$( grep -e '^Package:' packages.main | wc -l)\">"					>> remote.ent
+	echo "<!ENTITY contrib-packages \"$$(grep -e '^Package:' packages.contrib | wc -l)\">"					>> remote.ent
+	echo "<!ENTITY non-free-packages \"$$(grep -e '^Package:' packages.non-free | wc -l)\">"				>> remote.ent
+	sort pkg.lst | uniq | $(DBIN)/sizeent packages.txt packages.experimental.txt packages.stable.txt packages.oldstable.txt	>> remote.ent
+	echo "<!ENTITY pop-submissions \"$$(sed -n -e 's/^Submissions: *\([^ ]*\) *$$/\1/p' < all-popcon-results.txt)\">"	>> remote.ent
+	echo "<!ENTITY pop-architectures \"$$(grep --binary-files=text -e '^Architecture:' all-popcon-results.txt | wc -l)\">"	>> remote.ent
+	echo "<!ENTITY pop-packages \"$$(grep -e '^Package:' all-popcon-pkgs.txt | wc -l)\">"					>> remote.ent
+	grep -e '^Package:' all-popcon-pkgs.txt | grep -f pkg.lst | $(DBIN)/popconent `cat all-popcon-submissions.txt`		>> remote.ent

-datadatesize.ent: packages.txt packages.main packages.contrib packages.non-free
-	# GENERATE datesize.ent
-	echo "<!ENTITY all-packages \"$$(grep -e '^Package:' packages.txt | wc -l)\">"			>  datadatesize.ent
-	echo "<!ENTITY main-packages \"$$( grep -e '^Package:' packages.main | wc -l)\">"		>> datadatesize.ent
-	echo "<!ENTITY contrib-packages \"$$(grep -e '^Package:' packages.contrib | wc -l)\">"		>> datadatesize.ent
-	echo "<!ENTITY non-free-packages \"$$(grep -e '^Package:' packages.non-free | wc -l)\">"	>> datadatesize.ent
-	echo "<!ENTITY pkgsize-date \"$(shell date -u +'%F %T %Z')\">"					>> datadatesize.ent
-
-
-datadatepop.ent:
-	# GENERATE datadatepop.ent
-	echo "<!ENTITY pop-date \"$(shell date -u +'%F %T %Z')\">" > datadatepop.ent
-
-popcon.ent: all-popcon-results.txt all-popcon-pkgs.txt all-popcon-submissions.txt pkg.lst
-	# GENERATE datadatepop.ent
-	echo "<!ENTITY pop-submissions \"$$(sed -n -e 's/^Submissions: *\([^ ]*\) *$$/\1/p' < all-popcon-results.txt)\">"	>  popcon.ent
-	echo "<!ENTITY pop-architectures \"$$(grep --binary-files=text -e '^Architecture:' all-popcon-results.txt | wc -l)\">"	>> popcon.ent
-	echo "<!ENTITY pop-packages \"$$(grep -e '^Package:' all-popcon-pkgs.txt | wc -l)\">"				>> popcon.ent
-	grep -e '^Package:' all-popcon-pkgs.txt | grep -f pkg.lst | $(DBIN)/popconent `cat all-popcon-submissions.txt`	>> popcon.ent
-
-pkgsize.ent: pkg.lst packages.txt packages.bkup.txt packages.stable.txt packages.oldstable.txt
-	# GENERATE pkgsize.ent
-	sort pkg.lst | uniq | $(DBIN)/sizeent packages.txt packages.bkup.txt packages.stable.txt packages.oldstable.txt > pkgsize.ent
-
-	# POPCON
-	wget -O - $(UPOPC) | zcat - > all-popcon-results.txt
-	sed -n -e 's/^Submissions: *\([^ ]*\) *$$/\1/p' < all-popcon-results.txt >all-popcon-submissions.txt
-	grep --binary-files=text -e '^Package: [a-z0-9][-+a-z0-9.]*[ 0-9]*$$' < all-popcon-results.txt >all-popcon-pkgs.txt
-
-common.ent:
-	# GENERATE common.ent
-	# Release for package match with actual situation
-	echo "<!ENTITY build-date \"$(shell date -u +'%F %T %Z')\">"	>  common.ent
-	echo "<!ENTITY arch \"$(ARCH)\">"				>> common.ent
+# GENERATE
+# source XML inclusion file updated for normal build (no remote access)
+common.ent: Makefile debian/changelog
+	echo "<!ENTITY build-date \"$(SOURCE_DATE)\">"			>  common.ent
 	echo "<!ENTITY dr-version \"$(DR_VERSION)\">"			>> common.ent
-ifeq ($(RELEASE_STATE),normal)
-	# Build for web to match current reality
-	echo "<!ENTITY codename-stable  \"bookworm\">"			>> common.ent
-	echo "<!ENTITY Codename-stable  \"Bookworm\">"			>> common.ent
-	echo "<!ENTITY codename-testing  \"trixie\">"			>> common.ent
-	echo "<!ENTITY codename-testing  \"trixie\">"			>> common.ent
-	echo "<!ENTITY Codename-nexttesting  \"Trixie+1\">"		>> common.ent
-	echo "<!ENTITY Codename-nexttesting  \"Trixie+1\">"		>> common.ent
-else
-	# For post-almost-freeze upload to match post-release reality
-	echo "<!ENTITY codename-stable  \"bullseye\">"			>> common.ent
-	echo "<!ENTITY Codename-stable  \"Bullseye\">"			>> common.ent
-	echo "<!ENTITY codename-testing  \"bookworm\">"			>> common.ent
-	echo "<!ENTITY Codename-testing  \"Bookworm\">"			>> common.ent
-	echo "<!ENTITY codename-nexttesting  \"trixie\">"		>> common.ent
-	echo "<!ENTITY Codename-nexttesting  \"Trixie\">"		>> common.ent
-endif
+	echo "<!ENTITY arch \"$(ARCH)\">"				>> common.ent
+	echo "<!ENTITY codename-stable  \"$(RELEASE_NAME0L)\">"		>> common.ent
+	echo "<!ENTITY Codename-stable  \"$(RELEASE_NAME0C)\">"		>> common.ent
+	echo "<!ENTITY codename-testing  \"$(RELEASE_NAME1L)\">"	>> common.ent
+	echo "<!ENTITY Codename-testing  \"$(RELEASE_NAME1C)\">"	>> common.ent
+	echo "<!ENTITY codename-nexttesting  \"$(RELEASE_NAME2L)\">"	>> common.ent
+	echo "<!ENTITY Codename-nexttesting  \"$(RELEASE_NAME2C)\">"	>> common.ent
 	echo "<!ENTITY codename-unstable \"sid\">"			>> common.ent
 	echo "<!ENTITY Codename-unstable \"Sid\">"                      >> common.ent
+	echo "<!ENTITY release-outdated  \"$(RELEASE_NAMEXX)\">"	>> common.ent
+	echo "<!ENTITY Codename-doc-1    \"$(RELEASE_DOC_1)\">"		>> common.ent
+	echo "<!ENTITY Codename-doc-2    \"$(RELEASE_DOC_2)\">"		>> common.ent

-# For major English update, run this and commit data
-.PHONY: entity
-entity:
-	$(MAKE) distclean
-	$(MAKE) $(ENT_STAT)
-	$(MAKE) clean
-	# PLEASE MAKE SURE TO COMMIT TO VCS

 #######################################################################
-# Phase 2(build): RAWXML (template) -> XML -> All formats
+# Phase 2(build): RAWXML (template) -> English XML
 #######################################################################

-.PHONY: rawxml
-rawxml: $(DRAW)/$(MANUAL).rawxml
-
-$(DRAW)/$(MANUAL).rawxml: $(wildcard $(DRAW)/*_*.rawxml)
+$(DRAW)/$(MANUAL).rawxml: $(SRC_XML)
 	#echo $^
 	cd $(DRAW) ; ./merge.sh

 # Update URL list header from $(MANUAL).rawxml
-$(DRAW)/header.rawxml: $(DRAW)/header1.rawxml $(DRAW)/header2.rawxml
+$(DRAW)/header.rawxml: $(DRAW)/header1.rawxml $(DRAW)/header2.rawxml $(DRAW)/$(MANUAL).rawxml
 	cat $(DRAW)/header1.rawxml >  $(DRAW)/header.rawxml
 	$(XPNO) $(DXSL)/urls.xsl $(DRAW)/$(MANUAL).rawxml | sort | uniq |\
-	sed -e "s/&/\&amp;/g"   >> $(DRAW)/header.rawxml
+	sed -e "s/&/\&amp;/g"   |  fgrep -v -e '<!ENTITY  "">' >> $(DRAW)/header.rawxml
 	cat $(DRAW)/header2.rawxml >> $(DRAW)/header.rawxml

 # Replace table contents with @-@popcon*@-@ and @@@psize*@-@ and
@ -279,7 +297,7 @@ $(MANUAL).en.xml: $(DRAW)/$(MANUAL).rawxml $(DRAW)/header.rawxml
 	sed -e 's/@-@amp@-@/\&/g' -e 's/@-@\([^@]\+\)@-@/\&\1;/g' > $@

 # Replace table contents with dummy text and
-# fix URL referencees and table ID as the template for translation.
+# fix URL references and table ID as the template for translation.
 # This avoids bloated PO/POT files. (tablet.xsl used instead of table.xsl)
 $(MANUAL).en.xmlt: $(DRAW)/$(MANUAL).rawxml $(DRAW)/header.rawxml
 	# GENERATE $(MANUAL).en.xmlt (TEMPLATE to avoid bloated PO/POT files)
@ -291,10 +309,8 @@ $(MANUAL).en.xmlt: $(DRAW)/$(MANUAL).rawxml $(DRAW)/header.rawxml
 	sed -e 's/@-@amp@-@/\&/g' -e 's/@-@\([^@]\+\)@-@/\&\1;/g' > $@

 #######################################################################
-# Phase 7 build : POT/PO/XML non-ENGLISH (with template XML)
+# Phase 3 build : English XML -> POT/PO/XML non-ENGLISH
 #######################################################################
-# source PO files for all languages (build prcess requires these)
-SRC_PO	:=	$(addsuffix .po, $(addprefix  $(DPO)/, $(LANGPO)))
 .PHONY: po pot
 pot: $(DPO)/templates.pot
 po: $(SRC_PO)
@ -324,89 +340,88 @@ $(DPO)/%.po: $(DPO)/templates.pot FORCE
 	$(DBIN)/fuzzypo $(DPO)/$*.po >>fuzzy.log

 FORCE:
+	@: "FORCE target"

-# source XML files for all languages (build prcess requires these)
-SRC_XML	:=	$(addsuffix .xml, $(addprefix  $(MANUAL)., $(LANGALL)))
+# base XML files for all languages
 .PHONY: xml
-xml: $(SRC_XML)
+xml: $(addsuffix .xml, $(addprefix  $(MANUAL)., $(LANGALL)))

 $(MANUAL).%.xml: $(DPO)/%.po $(MANUAL).en.xml
 	@$(call check-command, po4a-translate, po4a)
 	@$(call check-command, msgcat, gettext)
 	$(DBIN)/genxml $*

-
 #######################################################################
-# Phase 8 build : Formatted conversion from XML
+# Phase 4 build : Formatted conversion from XML
 #######################################################################

 #######################################################################
-# $ make css       # update CSS and DIMG in $(TMP_DIR_DR)
+# $ make css       # update CSS and DIMG in $(BUILD_DIR)
 #######################################################################
 .PHONY: css
 css:
-	-rm -rf $(TMP_DIR_DR)/images
-	mkdir -p $(TMP_DIR_DR)/images
-	cp -f $(DXSL)/$(MANUAL).css $(TMP_DIR_DR)/$(MANUAL).css
-	echo "AddCharset UTF-8 .txt" > $(TMP_DIR_DR)/.htaccess
-	#cd $(DIMG) ; cp caution.png home.png important.png next.png note.png prev.png tip.png up.gif warning.png $(TMP_DIR_DR)/images
-	cd $(DIMG) ; cp caution.png important.png note.png tip.png up.gif warning.png $(TMP_DIR_DR)/images
-	cd png ; cp home.png next.png prev.png $(TMP_DIR_DR)/images
+	-rm -rf $(BUILD_DIR)/images
+	mkdir -p $(BUILD_DIR)/images
+	cp -f $(DXSL)/$(MANUAL).css $(BUILD_DIR)/$(MANUAL).css
+	echo "AddCharset UTF-8 .txt" > $(BUILD_DIR)/.htaccess
+	#cd $(DIMG) ; cp caution.png home.png important.png next.png note.png prev.png tip.png up.gif warning.png $(BUILD_DIR)/images
+	cd $(DIMG) ; cp caution.png important.png note.png tip.png up.gif warning.png $(BUILD_DIR)/images
+	cd png ; cp home.png next.png prev.png $(BUILD_DIR)/images

 #######################################################################
-# $ make html      # update all HTML in $(TMP_DIR_DR)
+# $ make html      # update all HTML in $(BUILD_DIR)
 #######################################################################
 .PHONY: html
-html:	$(foreach LX, $(LANGALL), $(TMP_DIR_DR)/index.$(LX).html)
+html:	$(foreach LX, $(LANGALL), $(BUILD_DIR)/index.$(LX).html)

-$(TMP_DIR_DR)/index.%.html: $(MANUAL).%.xml
+$(BUILD_DIR)/index.%.html: $(MANUAL).%.xml $(SRC_ENT)
 	@$(call check-command, xsltproc, xsltproc)
-	-mkdir -p $(TMP_DIR_DR)
-	$(XPINC)   --stringparam base.dir $(TMP_DIR_DR)/ \
+	-mkdir -p $(BUILD_DIR)
+	$(XPINC)   --stringparam base.dir $(BUILD_DIR)/ \
                --stringparam html.ext .$*.html \
                $(DXSL)/style-html.xsl $<

 #######################################################################
-# $ make txt       # update all Plain TEXT in $(TMP_DIR_DR)
+# $ make txt       # update all Plain TEXT in $(BUILD_DIR)
 #######################################################################
 .PHONY: txt
-txt:	$(foreach LX, $(LANGALL), $(TMP_DIR_DR)/$(MANUAL).$(LX).txt.gz)
+txt:	$(foreach LX, $(LANGALL), $(BUILD_DIR)/$(MANUAL).$(LX).txt.gz)

 # style-txt.xsl provides work around for hidden URL links by appending them explicitly.
-$(TMP_DIR_DR)/$(MANUAL).%.txt.gz: $(MANUAL).%.xml
+$(BUILD_DIR)/$(MANUAL).%.txt.gz: $(MANUAL).%.xml $(SRC_ENT)
 	@$(call check-command, w3m, w3m)
 	@$(call check-command, xsltproc, xsltproc)
-	-mkdir -p $(TMP_DIR_DR)
+	-mkdir -p $(BUILD_DIR)
 	@test -n "`which w3m`"  || { echo "ERROR: w3m not found. Please install the w3m package." ; false ;  }
 	$(XPINC) $(DXSL)/style-txt.xsl $< | LC_ALL=en_US.UTF-8 \
 	  w3m -o display_charset=UTF-8 -cols 70 -dump -no-graph -T text/html | \
 	  gzip -n -9 - > $@

 #######################################################################
-# $ make pdf       # update all PDF in $(TMP_DIR_DR)
+# $ make pdf       # update all PDF in $(BUILD_DIR)
 #######################################################################
 .PHONY: pdf
-pdf:	$(foreach LX, $(LANGALL), $(TMP_DIR_DR)/$(MANUAL).$(LX).pdf)
+pdf:	$(foreach LX, $(LANGALL), $(BUILD_DIR)/$(MANUAL).$(LX).pdf)

-nopdf: $(TMP_DIR_DR)/nopdf.pdf
+nopdf: $(BUILD_DIR)/nopdf.pdf

-$(TMP_DIR_DR)/nopdf.pdf: nopdf.tex
+$(BUILD_DIR)/nopdf.pdf: nopdf.tex
 	-mkdir -p $(CURDIR)/tmp
 	cd "$(CURDIR)/tmp/"; \
 	xelatex ../nopdf.tex

-$(foreach LX, $(NOPDF), $(TMP_DIR_DR)/$(MANUAL).$(LX).pdf): $(TMP_DIR_DR)/nopdf.pdf
-	-mkdir -p $(TMP_DIR_DR)
-	cp $(TMP_DIR_DR)/nopdf.pdf $@
+$(foreach LX, $(NOPDF), $(BUILD_DIR)/$(MANUAL).$(LX).pdf): $(BUILD_DIR)/nopdf.pdf
+	-mkdir -p $(BUILD_DIR)
+	cp $(BUILD_DIR)/nopdf.pdf $@

 # dblatex.xsl provide work around for hidden URL links by appending them explicitly.
-$(TMP_DIR_DR)/$(MANUAL).%.pdf: $(MANUAL).%.xml
+$(BUILD_DIR)/$(MANUAL).%.pdf: $(MANUAL).%.xml $(SRC_ENT)
 	@$(call check-command, dblatex, dblatex)
 	@$(call check-command, xsltproc, xsltproc)
 	-mkdir -p $(CURDIR)/tmp
 	@test -n "`which $(DBLATEX)`"  || { echo "ERROR: dblatex not found. Please install the dblatex package." ; false ;  }
 	export TEXINPUTS=".:"; \
-	export TMP_DIR_DR="$(CURDIR)/tmp/"; \
+	export BUILD_DIR="$(CURDIR)/tmp/"; \
 	$(XPINC) $(DXSL)/dblatex.xsl $<  | \
 	$(DBLATEX) --style=native \
 		--debug \
@ -418,17 +433,17 @@ $(TMP_DIR_DR)/$(MANUAL).%.pdf: $(MANUAL).%.xml
 		--output=$@ - || { echo "OMG!!!!!! XXX_CHECK_XXX ... Do not worry ..."; true ; }

 #######################################################################
-# $ make tex       # update all TeX source in $(TMP_DIR_DR)
+# $ make tex       # update all TeX source in $(BUILD_DIR)
 #######################################################################
 .PHONY: tex
-tex:	$(foreach LX, $(LANGALL), $(TMP_DIR_DR)/$(MANUAL).$(LX).tex)
+tex:	$(foreach LX, $(LANGALL), $(BUILD_DIR)/$(MANUAL).$(LX).tex)

 # dblatex.xsl provide work around for hidden URL links by appending them explicitly.
-$(TMP_DIR_DR)/$(MANUAL).%.tex: $(MANUAL).%.xml
+$(BUILD_DIR)/$(MANUAL).%.tex: $(MANUAL).%.xml $(SRC_ENT)
 	-mkdir -p $(CURDIR)/tmp
 	@test -n "`which $(DBLATEX)`"  || { echo "ERROR: dblatex not found. Please install the dblatex package." ; false ;  }
 	export TEXINPUTS=".:"; \
-	export TMP_DIR_DR="$(CURDIR)/tmp/"; \
+	export BUILD_DIR="$(CURDIR)/tmp/"; \
 	$(XPINC) $(DXSL)/dblatex.xsl $<  | \
 	$(DBLATEX) --style=native \
 		--debug \
@ -441,54 +456,71 @@ $(TMP_DIR_DR)/$(MANUAL).%.tex: $(MANUAL).%.xml
 		--output=$@ - || { echo "OMG!!!!!! XXX_CHECK_XXX ... Do not worry ..."; true ; }

 #######################################################################
-# $ make epub      # update all epub in $(TMP_DIR_DR)
+# $ make epub      # update all epub in $(BUILD_DIR)
 #######################################################################
 .PHONY: epub
-epub:	$(foreach LX, $(LANGALL), $(TMP_DIR_DR)/$(MANUAL).$(LX).epub)
+epub:	$(foreach LX, $(LANGALL), $(BUILD_DIR)/$(MANUAL).$(LX).epub)

-$(TMP_DIR_DR)/$(MANUAL).%.epub: $(MANUAL).%.xml
+$(BUILD_DIR)/$(MANUAL).%.epub: $(MANUAL).%.xml $(SRC_ENT)
 	@$(call check-command, xsltproc, xsltproc)
-	-mkdir -p $(TMP_DIR_DR)/$*/
-	cd $(TMP_DIR_DR)/$*/ ; $(XPINC) $(CURDIR)/$(DXSL)/style-epub.xsl $(CURDIR)/$<
-	cp -f $(DXSL)/mimetype $(TMP_DIR_DR)/$*/mimetype
-	cp -f $(DXSL)/debian-reference.css $(TMP_DIR_DR)/$*/OEBPS/debian-reference.css
-	cp -f $(DXSL)/debian-openlogo.png $(TMP_DIR_DR)/$*/OEBPS/debian-openlogo.png
-	cd $(TMP_DIR_DR)/$*/ ; zip -r $@ ./
+	-mkdir -p $(BUILD_DIR)/$*/
+	cd $(BUILD_DIR)/$*/ ; $(XPINC) $(CURDIR)/$(DXSL)/style-epub.xsl $(CURDIR)/$<
+	cp -f $(DXSL)/mimetype $(BUILD_DIR)/$*/mimetype
+	cp -f $(DXSL)/debian-reference.css $(BUILD_DIR)/$*/OEBPS/debian-reference.css
+	cp -f $(DXSL)/debian-openlogo.png $(BUILD_DIR)/$*/OEBPS/debian-openlogo.png
+	cd $(BUILD_DIR)/$*/ ; zip -r $@ ./

 #######################################################################
-# Phase 9 post/pre build: clean and distclean
+# Phase 5 cleans
 #######################################################################
 #######################################################################
 # $ make clean     # clean files ready for tar
+#                  (override_dh_auto_clean call this)
 #######################################################################
 .PHONY: clean
-clean:
-	# CLEAN
-	-rm -f *.swp *~ *.tmp
-	-rm -f $(DPO)/*~ $(DPO)/*.mo $(DPO)/*.po.*
-	-rm -rf tmp debian/tmp $(PUBLISHDIR)/$(MANUAL)
-	-rm -f $(addsuffix .xml, $(addprefix $(MANUAL)., $(LANGALL)))
-	-rm -f $(MANUAL).en.xml $(MANUAL).en.xmlt header.rawxml
-	-rm -f $(REMOTE_DATA)
-
-#######################################################################
-# $ make distclean # clean files to reset RAWXML/ENT/POT
-#######################################################################
+clean: localclean remoteclean
 .PHONY: distclean
 distclean: clean
-	# DISTCLEAN
-	-rm -f $(ENT_STAT)
+#######################################################################
+# $ make localclean   # clean locally generated files
+#######################################################################
+.PHONY: localclean
+localclean:
+	# CLEAN
+	-rm -rf $(BUILD_DIR)
+	-rm -rf debian/tmp
+	-rm -f *.swp *~ *.tmp
+	-rm -f $(DPO)/*~ $(DPO)/*.mo $(DPO)/*.po.*
+	-rm -f common.ent
+	-rm -f $(addsuffix .xml, $(addprefix $(MANUAL)., $(LANGALL)))
+	-rm -f $(addsuffix .xmlt, $(addprefix $(MANUAL)., $(LANGALL)))
+	-rm -f $(DRAW)/$(MANUAL).rawxml
+	-rm -f $(DRAW)/header.rawxml
 	-rm -f $(DPO)/*.pot
 	-rm -f fuzzy.log

 #######################################################################
-### Utility targets
+# $ make remoteclean # clean remote data to generate entity files
 #######################################################################
+.PHONY: remoteclean
+remoteclean:
+	-rm -f $(REMOTE_DATA)
+
+#######################################################################
+# $ make entityclean # clean entity files generated from remote data
+#######################################################################
+.PHONY: entityclean
+entityclean:
+	-rm -f remote.ent
+
+#======================================================================
+# ===== Utility targets ===============================================
+#======================================================================

 #######################################################################
 # $ make wrap       # wrap all PO
 #######################################################################
-.PHONY: wrap nowrap wip
+.PHONY: wrap nowrap wip replace
 wrap:
 	@$(call check-command, msgcat, gettext)
 	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
@ -500,6 +532,22 @@ nowrap:
 	$(MSGCAT) -o $$XX --no-wrap $$XX ;\
 	done

+replace:
+	@$(call check-file, $(SEDF))
+	@$(call check-command, msgcat, gettext)
+	@$(call check-command, msguniq, gettext)
+	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
+	$(MSGCAT) -o $$XX --no-wrap $$XX ;\
+	done
+	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
+	cat $$XX >$$XX.sed ;\
+	$(SED) -f $(SEDF) <$$XX | sed -n -e '/^msgid "[^"]/,$$p' >>$$XX.sed ;\
+	$(MSGUNIQ) -o $$XX.uniq $$XX.sed ;\
+	done
+	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
+	$(MSGCAT) -o $$XX $$XX.uniq ;\
+	done
+
 wip:
 	@$(call check-command, msgattrib, gettext)
 	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
@ -513,7 +561,7 @@ wip:
 #######################################################################
 .PHONY: rsync
 rsync: all
-	rsync -avz $(TMP_DIR_DR)/ osamu@people.debian.org:public_html/debian-reference/
+	rsync -avz $(BUILD_DIR)/ osamu@people.debian.org:public_html/debian-reference/

 #######################################################################
 # $ make url       # check duplicate URL references
@ -524,14 +572,3 @@ url: $(MANUAL).en.xml
 	-sed -ne "/^<\!ENTITY/s/<\!ENTITY \([^ ]*\) .*$$/\" \1 \"/p"  < $< | uniq -d | xargs -n 1 grep $< -e  | grep -e "^<\!ENTITY"
 	@echo "----- Duplicate URL references (end) -----"

-#######################################################################
-# Translate all
-#######################################################################
-$(DPO)/wikipedia.%.pot: $(DPO)/wikipedia.list
-	$(DBIN)/interwiki $* "PRINT" < $< > $@
-
-#######################################################################
-# Translate untranslated
-#######################################################################
-$(DPO)/wikipedia.%.po: $(DPO)/wikipedia.%.list
-	$(DBIN)/interwiki $* "NO"   < $< > $@
--- a/README.md
+++ b/README.md
@ -82,10 +82,9 @@ this debian-reference salsa repository.  If you are a non-Debian Developer
 with `*-guest` account on salsa who needs write access to this
 debian-reference salsa repository, you can inform your `*-guest` account to me
 (or any DD) with clear intent and reasonable rationale and let me (or any DD)
-invite you to the write access with the "Developer" status from [the main
-debian-reference project
-page](https://salsa.debian.org/debian/debian-reference) via Setting-Member
-menu.
+invite you to the write access with the "Developer" status from
+[the main debian-reference project page](https://salsa.debian.org/debian/debian-reference)
+via Setting-Member menu.

 See https://wiki.debian.org/Salsa/Doc for how to use this site.

@ -358,43 +357,88 @@ The English source is kept as rawxml/*_*.rawxml files under rawxml/.
 The translation source is kept as PO files under po/.

 ```
-  >>> rawxml/*_*.rawxml
-        |
-  >>> debian-reference.rawxml ------>  (make entity) <=> remotely fetched
-        |          |   |                              :    data files (+)
-        |          |   +---------------------+        :
-        |          |                         |        :
-        |          v                         v        v
-        |   debian-reference.en.xml   common.ent   url.ent and *.ent files
-        |          : (**)        |           |        |
-        v          v             |           |        |
-      debian-reference.en.xmlt   |           |        |
-        |                        |           |        |
-        v                        |           |        |
-      templates.pot              |           |        |
-        |                        |           |        |
-        v (make po)              |           |        |
-  >>> ja.po                      |           |        |
-        |    fuzzy.log (++)      |           |        |
-        v                        |           |        |
-      debian-reference.ja.xml    |           |        |
-        |                        |           |        |
-        v                        v           v        v
-        +----------+-------------+-----------+--------+
-                   |(make all), (make test),
-                   |(make html), (make txt), (make pdf), ...
-                   v
+  >>> rawxml/*_*.rawxml                          remotely fetched data files
+      $(RAWXML)                                               $(REMOTE_DATA)
+      =========                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        |                                                         :
+        |                                                         :
+      debian-reference.rawxml                                     :
+        |                                                         :
+        |                                                         :
+        +---> pkg.lst -------------------> pkgsize.ent, popcon.ent, common.ent
+        |                                                     $(RAWENT)    (+)
+        |                                                      ========
+        |                                                         |
+        +---> $(DRAW)/header.rawxml                               |
+        |         |                                               |
+        +<--------+                                               |
+        |                                                         |
+        |                                                         |
+        +---------------------------+                             |
+        |                           |                             |
+        |                           |                             |
+        debian-reference.en.xmlt    debian-reference.en.xml       |
+        |                   (**)    |                  |          |
+        |                           |                  |          |
+        templates.pot               |                  |          |
+        |                           |                  |          |
+        |                           |                  |          |
+        ja.po                       |                  |          |
+        $(PO)                       |                  |          |
+        =====                       |                  |          |
+        |                           |                  |          |
+        |                           |                  |          |
+        +---------------------------+                  |          |
+        |                                              |          |
+        |                                              |          |
+        debian-reference.ja.xml                        |          |
+        | (fuzzy.log)  (++)                            |          |
+        |                                              |          |
+        |                                              |          |
+        +----------------------------------------------+----------+
+        |(make all), (make test),
+        |(make html), (make txt), (make pdf), ...
+        v
      all documents (*.*.html *.*.txt *.*.pdf)
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ```

+```
+# RAWXML updated with reference to new packages
+ $ make entity             # update all RAWENT with REMOTE_DATA (NET)
+# RAWXML updated without reference to new packages
+ $                         # no action needed
+# before PO update for LANGPO=XX
+ $ make po LANGPO=XX       # update all PO in sync with RAWXML and RAWENT
+# after PO update for LANGPO=XX
+ $ make po LANGPO=XX       # normalize PO
+# clean source for commit  (except ===== data)
+ $ make clean
+# clean source for commit  (except ===== and ^^^^^^^ data) (Keep remote data)
+ $ make localclean
+# clean source including entity (except ===== and ^^^^^^^ data) (Keep remote data)
+ $ make entityclean
+# build package
+ $ make all                # build all documents
+# test build English html  (keep REMOTE_DATA)
+ $ make en
+# test build LANGPO=XX html
+ $ make test LANGPO=XX
+# no wrap po file for LANGPO=XX
+ $ make nowrap LANGPO=XX
+# wrap po file for LANGPO=XX
+ $ make wrap LANGPO=XX
+# replace string with 'sed -f foo' over po file for LANGPO=XX
+ $ make replace LANGPO=XX SEDF=foo
+```
 * (`+`)  When the English source changes URL link location or packages
-  mentioned in the package list table, you need to update `*.ent` files in the
-  source by running "`make entity`" with remote file access.
+   mentioned in the package list table, you need to update `*.ent` files in the
+   source by running "`make entity`" with remote file access.
 * (`**`) `debian-reference.en.xmlt` effectively replaces untranslatable
-  contents in `debian-reference.en.xml` with "DUMMY" to reduce clutter in PO
-  files.
+   contents in `debian-reference.en.xml` with "DUMMY" to reduce clutter in PO
+   files.
 * (`++`) `fuzzy.log` file contains number of fuzzy translation.  If not zero,
-  please update PO file.
+   please manually update PO file contents.

 ### Build failure due to po/*.add

@ -408,32 +452,6 @@ rename `po/foo.add-keep` back to `po/foo.add` and update the matching string.

 It's tricky.  (This should be less problematic after recent po4a updates)

-### List of make targets
-
-```
- $ make all       # build all
- $ make test      # build html for testing (for Translator)
- $ make package   # build html and text from RAWXML/PO for DDP
- $ make publish   # build html text pdf from RAWXML/PO for DDP
- $ make clean     # clean files ready for tar
- $ make distclean # clean files to reset ENT/POT
- $ make rawxml    # update debian-reference.rawxml from split-RAWXML
- $ make entity    # update ENT and local cache data from RAWXML/REMOTE
- $ make po        # update all PO from RAWXML
- $ make wrap      # wrap all PO
- $ make xml       # update all XML from RAWXML/ENT/PO/ADD
- $ make css       # update CSS and IMAGES in $(PUBLISHDIR)
- $ make html      # update all HTML in $(PUBLISHDIR)
- $ make txt       # update all Plain TEXT in $(PUBLISHDIR)
- $ make pdf       # update all PDF in $(PUBLISHDIR)
- $ make tex       # update all TeX source in $(PUBLISHDIR)
- $ make url       # check duplicate URL references
-```
-
-Wikipedia URLs:
-
-`bin/interwiki` script can be used to check translated URLs.
-
 ## Publication to the www.debian.org servers

 The contents of `debian-reference` are published to the www.debian.org servers
@ -451,10 +469,7 @@ www.debian.org servers.

 ## Is there easier way to edit XML source

-For now, asciidoc source in asciidoc branch is in sync with XML source in this
-master branch.  You need to run script in buster environment where python2 is
-available.  We may convert this XML source to easier format such as Sphinx in
-future.
+Unfortunately, no.

 ## Reminder

--- a/bin/colspec.py
+++ b/bin/colspec.py
@ -40,6 +40,8 @@ if __name__ == '__main__':
                colwidth = (20,12,6,12,12,38)
            elif tgroup_cols == 7:
                colwidth = (20,12,6,12,12,12,26)
+            elif tgroup_cols == 8:
+                colwidth = (20,12,6,6,6,6,6,26)
            # List of exceptions
            if table_id == "thenumericmodefoinchmodbcommands":
                colwidth = (20,80)
--- a/bin/docbook.conf
+++ b/bin/docbook.conf
@ -1,601 +0,0 @@
-#
-# docbook.conf
-#
-# Asciidoc configuration file.
-# Default docbook backend.
-#
-
-[miscellaneous]
-outfilesuffix=.xml
-# Printable page width in pts.
-pagewidth=380
-pageunits=pt
-
-[attributes]
-basebackend=docbook
-basebackend-docbook=
-
-[replacements]
-# Line break markup is dropped (there is no DocBook line break tag).
-(?m)^(.*)\s\+$=\1
-ifdef::asciidoc7compatible[]
-# Superscripts.
-\^(.+?)\^=<superscript>\1</superscript>
-# Subscripts.
-~(.+?)~=<subscript>\1</subscript>
-endif::asciidoc7compatible[]
-
-[ruler-blockmacro]
-# Only applies to HTML so don't output anything.
-
-[image-inlinemacro]
-<inlinemediaobject>
-  <imageobject>
-  <imagedata fileref="{imagesdir=}{target}"{width? contentwidth="{width}"}{height? contentdepth="{height}"}/>
-  </imageobject>
-  <textobject><phrase>{1={target}}</phrase></textobject>
-</inlinemediaobject>
-
-[image-blockmacro]
-<figure{id? id="{id}"}><title>{title}</title>
-{title%}<informalfigure{id? id="{id}"}>
-<mediaobject>
-  <imageobject>
-  <imagedata fileref="{imagesdir=}{target}"{width? contentwidth="{width}"}{height? contentdepth="{height}"}{scaledwidth? width="{scaledwidth}" scalefit="1"}{align? align="{align}"}/>
-  </imageobject>
-  <textobject><phrase>{1={target}}</phrase></textobject>
-</mediaobject>
-{title#}</figure>
-{title%}</informalfigure>
-
-[indexterm-inlinemacro]
-# Inline index term.
-# Generate separate index entries for primary, secondary and tertiary
-# descriptions.
-# Primary only.
-{2%}<indexterm>
-{2%}  <primary>{1}</primary>
-{2%}</indexterm>
-# Primary and secondary.
-{2#}{3%}<indexterm>
-{2#}{3%}  <primary>{1}</primary><secondary>{2}</secondary>
-{2#}{3%}</indexterm>
-{2#}{3%}<indexterm>
-{2#}{3%}  <primary>{2}</primary>
-{2#}{3%}</indexterm>
-# Primary, secondary and tertiary.
-{3#}<indexterm>
-  <primary>{1}</primary><secondary>{2}</secondary><tertiary>{3}</tertiary>
-{3#}</indexterm>
-{3#}<indexterm>
-  <primary>{2}</primary><secondary>{3}</secondary>
-{3#}</indexterm>
-{3#}<indexterm>
-  <primary>{3}</primary>
-{3#}</indexterm>
-
-[indexterm2-inlinemacro]
-# Inline index term.
-# Single entry index term that is visible in the primary text flow.
-<indexterm>
-  <primary>{1}</primary>
-</indexterm>
-{1}
-
-[footnote-inlinemacro]
-# Inline footnote.
-<footnote><para>{0}</para></footnote>
-
-[callout-inlinemacro]
-# Inline callout.
-<co id="{coid}"/>
-
-[tags]
-# Bulleted, numbered and labeled list tags.
-ilist=<itemizedlist{id? id="{id}"}>{title?<title>{title}</title>}|</itemizedlist>
-ilistitem=<listitem>|</listitem>
-ilisttext=<para>|</para>
-olist=<orderedlist{id? id="{id}"}>{title?<title>{title}</title>}|</orderedlist>
-olist2=<orderedlist{id? id="{id}"} numeration="loweralpha">|</orderedlist>
-olistitem=<listitem>|</listitem>
-olisttext=<para>|</para>
-vlist=<variablelist{id? id="{id}"}>{title?<title>{title}</title>}|</variablelist>
-vlistentry=<varlistentry>|</varlistentry>
-vlistterm=<term>|</term>
-vlisttext=<para>|</para>
-vlistitem=<listitem>|</listitem>
-# Horizontal labeled list (implemented with two column table).
-# Hardwired column widths to 30%,70% because the current crop of PDF
-# generators do not auto calculate column widths.
-hlist=<{title?table}{title!informaltable}{id? id="{id}"} tabstyle="{style=hlabeledlist}" pgwide="0" frame="none" colsep="0" rowsep="0">{title?<title>{title}</title>}<tgroup cols="2"><colspec colwidth="{1=3}*"/><colspec colwidth="{2=7}*"/><tbody valign="top">|</tbody></tgroup><{title?/table}{title!/informaltable}>
-hlistentry=<row>|</row>
-hlisttext=<para>|</para>
-hlistterm=<entry><para>|</para></entry>
-hlistitem=<entry>|</entry>
-
-# Question and Answer list.
-qlist=<qandaset{id? id="{id}"}>{title?<title>{title}</title>}|</qandaset>
-qlistentry=<qandaentry>|</qandaentry>
-qlistterm=<question><para>|</para></question>
-qlistitem=<answer>|</answer>
-qlisttext=<para>|</para>
-# Bibliography list.
-blist=|
-blistitem=<bibliomixed>|</bibliomixed>
-blisttext=<bibliomisc>|</bibliomisc>
-# Glossary list.
-glist=|
-glistentry=<glossentry>|</glossentry>
-glistterm=<glossterm>|</glossterm>
-glistitem=<glossdef>|</glossdef>
-glisttext=<para>|</para>
-# Callout list.
-colist=<calloutlist{id? id="{id}"}>{title?<title>{title}</title>}|</calloutlist>
-colistitem=<callout arearefs="{coids}">|</callout>
-colisttext=<para>|</para>
-
-# Quoted text
-emphasis='|'
-strong=<emphasis role="strong">|</emphasis>
-monospaced=<literal>|</literal>
-quoted={amp}#8220;|{amp}#8221;
-unquoted=|
-subscript=<subscript>|</subscript>
-superscript=<superscript>|</superscript>
-
-# $$ inline passthrough.
-$$passthrough=|
-
-# Inline macros
-[http-inlinemacro]
-<ulink url="{name}:{target}">{0={name}:{target}}</ulink>
-[https-inlinemacro]
-<ulink url="{name}:{target}">{0={name}:{target}}</ulink>
-[ftp-inlinemacro]
-<ulink url="{name}:{target}">{0={name}:{target}}</ulink>
-[file-inlinemacro]
-<ulink url="{name}:{target}">{0={name}:{target}}</ulink>
-[mailto-inlinemacro]
-<ulink url="mailto:{target}">{0={target}}</ulink>
-[callto-inlinemacro]
-<ulink url="{name}:{target}">{0={target}}</ulink>
-[link-inlinemacro]
-<ulink url="{target}">{0={target}}</ulink>
-# anchor:id[text]
-[anchor-inlinemacro]
-<anchor id="{target}" xreflabel="{0=[{target}]}"/>
-# [[id,text]]
-[anchor2-inlinemacro]
-<anchor id="{1}" xreflabel="{2=[{1}]}"/>
-# [[[id]]]
-[anchor3-inlinemacro]
-<anchor id="{1}" xreflabel="[{1}]"/>[{1}]
-# xref:id[text]
-[xref-inlinemacro]
-<link linkend="{target}">{0}</link>
-{2%}<xref linkend="{target}"/>
-# <<id,text>>
-[xref2-inlinemacro]
-<link linkend="{1}">{2}</link>
-{2%}<xref linkend="{1}"/>
-
-
-# Special word macros
-[emphasizedwords]
-<emphasis>{words}</emphasis>
-[monospacedwords]
-<literal>{words}</literal>
-[strongwords]
-<emphasis role="strong">{words}</emphasis>
-
-# Paragraph substitution.
-[paragraph]
-<formalpara{id? id="{id}"}><title>{title}</title><para>
-{title%}<para{id? id="{id}"}>
-|
-{title%}</para>
-{title#}</para></formalpara>
-{empty}
-
-[admonitionparagraph]
-<{name}{id? id="{id}"}><para>|</para></{name}>
-
-[literalparagraph]
-# The literal block employs the same markup.
-template::[literalblock]
-
-[verseparagraph]
-template::[verseblock]
-
-# Delimited blocks.
-[literalblock]
-<example><title>{title}</title>
-<literallayout{id? id="{id}"} class="{font=monospaced}">
-|
-</literallayout>
-{title#}</example>
-
-[listingblock]
-<example><title>{title}</title>
-<screen>
-|
-</screen>
-{title#}</example>
-
-[sidebarblock]
-<sidebar{id? id="{id}"}>
-<title>{title}</title>
-|
-</sidebar>
-
-[passthroughblock]
-|
-
-[quoteblock]
-<blockquote{id? id="{id}"}>
-<title>{title}</title>
-# Include attribution only if either {attribution} or {citetitle} are defined.
-{attribution#}<attribution>
-{attribution%}{citetitle#}<attribution>
-{attribution}
-<citetitle>{citetitle}</citetitle>
-{attribution#}</attribution>
-{attribution%}{citetitle#}</attribution>
-|
-</blockquote>
-
-[verseblock]
-<blockquote{id? id="{id}"}>
-<title>{title}</title>
-# Include attribution only if either {attribution} or {citetitle} are defined.
-{attribution#}<attribution>
-{attribution%}{citetitle#}<attribution>
-{attribution}
-<citetitle>{citetitle}</citetitle>
-{attribution#}</attribution>
-{attribution%}{citetitle#}</attribution>
-<literallayout>
-|
-</literallayout>
-</blockquote>
-
-[exampleblock]
-<{title?example}{title!informalexample}{id? id="{id}"}>
-<title>{title}</title>
-|
-</{title?example}{title!informalexample}>
-
-[admonitionblock]
-<{name}{id? id="{id}"}>
-<title>{title}</title>
-|
-</{name}>
-
-# Tables.
-[tabledef-default]
-template=table		
-colspec=<colspec colwidth="{colwidth}{pageunits}" align="{colalign}"/>
-bodyrow=<row>|</row>
-bodydata=<entry>|</entry>
-
-[table]
-<{title?table}{title!informaltable}{id? id="{id}"} pgwide="0"
-frame="{frame=topbot}"
-{grid%rowsep="0" colsep="0"}
-rowsep="{grid@none|cols:0:1}" colsep="{grid@none|rows:0:1}"
->
-<title>{title}</title>
-<tgroup cols="{cols}">
-{colspecs}
-{headrows#}<thead>
-{headrows}
-{headrows#}</thead>
-{footrows#}<tfoot>
-{footrows}
-{footrows#}</tfoot>
-<tbody>
-{bodyrows}
-</tbody>
-</tgroup>
-</{title?table}{title!informaltable}>
-
-[specialsections]
-ifdef::doctype-article[]
-^Abstract$=sect-abstract
-endif::doctype-article[]
-
-ifdef::doctype-book[]
-^Colophon$=sect-colophon
-^Dedication$=sect-dedication
-^Preface$=sect-preface
-endif::doctype-book[]
-
-^Index$=sect-index
-^(Bibliography|References)$=sect-bibliography
-^Glossary$=sect-glossary
-^Appendix [A-Z][:.](?P<title>.*)$=sect-appendix
-
-# Special sections.
-[sect-preface]
-<preface{id? id="{id}"}>
-<title>{title}</title>
-|
-</preface>
-
-[sect-index]
-<index{id? id="{id}"}>
-<title>{title}</title>
-|
-</index>
-
-[sect-bibliography]
-<bibliography{id? id="{id}"}>
-<title>{title}</title>
-|
-</bibliography>
-
-[sect-glossary]
-<glossary{id? id="{id}"}>
-<title>{title}</title>
-|
-</glossary>
-
-[sect-appendix]
-<appendix{id? id="{id}"}>
-<title>{title}</title>
-|
-</appendix>
-
-
-[header-declarations]
-<?xml version="1.0" encoding="{encoding}"?>
-<!DOCTYPE {doctype-article?article}{doctype-book?book}{doctype-manpage?refentry} PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-#-------------------------
-# article document type
-#-------------------------
-ifdef::doctype-article[]
-
-[header]
-template::[header-declarations]
-
-<article lang="{lang=en}">
-{doctitle#}<articleinfo>
-    <title>{doctitle}</title>
-    <date>{date}</date>
-    {authored#}<author>
-        <personname><othername>{personname}</othername></personname>
-        <affiliation><address><email>{email}</email></address></affiliation>
-    {authored#}</author>
-    <authorinitials>{authorinitials}</authorinitials>
-
-# If file named like source document with -revhistory.xml suffix exists
-# include it as the document history, otherwise use current revision.
-{revisionhistory#}{include:{docdir}/{docname}-revhistory.xml}
-{revisionhistory%}<revhistory><revision><revnumber>{revision}</revnumber><date>{date}</date>{authorinitials?<authorinitials>{authorinitials}</authorinitials>}{revremark?<revremark>{revremark}</revremark>}</revision></revhistory>
-
-    <corpname>{companyname}</corpname>
-{doctitle#}</articleinfo>
-
-[footer]
-</article>
-
-[preamble]
-# Untitled elements between header and first section title.
-|
-
-[sect-abstract]
-<abstract{id? id="{id}"}>
-|
-</abstract>
-
-[sect1]
-<section{id? id="{id}"}>
-<title>{title}</title>
-|
-</section>
-
-[sect2]
-<section{id? id="{id}"}>
-<title>{title}</title>
-|
-</section>
-
-[sect3]
-<section{id? id="{id}"}>
-<title>{title}</title>
-|
-</section>
-
-[sect4]
-<section{id? id="{id}"}>
-<title>{title}</title>
-|
-</section>
-
-endif::doctype-article[]
-
-#-------------------------
-# manpage document type
-#-------------------------
-ifdef::doctype-manpage[]
-
-[replacements]
-# The roff format does not substitute special characters so just print them as
-# text.
-\(C\)=(C)
-\(TM\)=(TM)
-
-[header]
-template::[header-declarations]
-<refentry lang="{lang=en}">
-<refmeta>
-<refentrytitle>{mantitle}</refentrytitle>
-<manvolnum>{manvolnum}</manvolnum>
-<refmiscinfo class="source">{mansource}</refmiscinfo>
-<refmiscinfo class="version">{manversion}</refmiscinfo>
-<refmiscinfo class="manual">{manmanual}</refmiscinfo>
-</refmeta>
-<refnamediv>
-    <refname>{manname}</refname>
-    <refpurpose>{manpurpose}</refpurpose>
-</refnamediv>
-
-[footer]
-</refentry>
-
-# Section macros
-[sect-synopsis]
-<refsynopsisdiv{id? id="{id}"}>
-|
-</refsynopsisdiv>
-
-[sect1]
-<refsect1{id? id="{id}"}>
-<title>{title}</title>
-|
-</refsect1>
-
-[sect2]
-<refsect2{id? id="{id}"}>
-<title>{title}</title>
-|
-</refsect2>
-
-[sect3]
-<refsect3{id? id="{id}"}>
-<title>{title}</title>
-|
-</refsect3>
-
-endif::doctype-manpage[]
-
-#-------------------------
-# book document type
-#-------------------------
-ifdef::doctype-book[]
-
-[header]
-template::[header-declarations]
-
-<book lang="{lang=en}">
-{doctitle#}<bookinfo>
-    <title>{doctitle}</title>
-    <date>{date}</date>
-    {authored#}<author>
-        <personname><othername>{personname}</othername></personname>
-        <affiliation><address><email>{email}</email></address></affiliation>
-    {authored#}</author>
-
-# If file named like source document with -revhistory.xml suffix exists
-# include it as the document history, otherwise use current revision.
-{revisionhistory#}{include:{docdir}/{docname}-revhistory.xml}
-{revisionhistory%}<revhistory><revision><revnumber>{revision}</revnumber><date>{date}</date>{authorinitials?<authorinitials>{authorinitials}</authorinitials>}{revremark?<revremark>{revremark}</revremark>}</revision></revhistory>
-
-    <corpname>{companyname}</corpname>
-{doctitle#}</bookinfo>
-
-[footer]
-</book>
-
-[preamble]
-# Preamble is not allowed in DocBook book so wrap it in a preface. 
-<preface{id? id="{id}"}>
-<title>Preface</title>
-|
-</preface>
-
-[sect-dedication]
-<dedication{id? id="{id}"}>
-|
-</dedication>
-
-[sect-colophon]
-<colophon{id? id="{id}"}>
-|
-</colophon>
-
-[sect0]
-<part{id? id="{id}"}>
-<title>{title}</title>
-|
-</part>
-
-[sect1]
-<chapter{id? id="{id}"}>
-<title>{title}</title>
-|
-</chapter>
-
-[sect2]
-<section{id? id="{id}"}>
-<title>{title}</title>
-|
-</section>
-
-[sect3]
-<section{id? id="{id}"}>
-<title>{title}</title>
-|
-</section>
-
-[sect4]
-<section{id? id="{id}"}>
-<title>{title}</title>
-|
-</section>
-
-endif::doctype-book[]
-
-ifdef::sgml[]
-#
-# Optional DocBook SGML.
-#
-# Most of the differences between DocBook XML and DocBook SGML boils
-# down to the empty element syntax: SGML does not like the XML empty
-# element <.../> syntax, use <...> instead.
-#
-[miscellaneous]
-outfilesuffix=.sgml
-
-[header-declarations]
-<!DOCTYPE {doctype-article?article}{doctype-book?book}{doctype-manpage?refentry} PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-
-[tabledef-default]
-colspec=<colspec colwidth="{colwidth}{pageunits}" align="{colalign}">
-
-[image-inlinemacro]
-<inlinemediaobject>
-  <imageobject>
-  <imagedata fileref="{imagesdir=}{target}"{width? width="{width}"}{height? depth="{height}"}>
-  </imageobject>
-  <textobject><phrase>{1={target}}</phrase></textobject>
-</inlinemediaobject>
-
-[image-blockmacro]
-<figure><title>{title}</title>
-{title%}<informalfigure>
-<mediaobject>
-  <imageobject>
-  <imagedata fileref="{imagesdir=}{target}"{width? width="{width}"}{height? depth="{height}"}>
-  </imageobject>
-  <textobject><phrase>{1={target}}</phrase></textobject>
-</mediaobject>
-{title#}</figure>
-{title%}</informalfigure>
-
-# Inline macros
-[xref-inlinemacro]
-<link linkend="{target}">{0}</link>
-{2%}<xref linkend="{target}">
-[xref2-inlinemacro]
-# <<id,text>>
-<link linkend="{1}">{2}</link>
-{2%}<xref linkend="{1}">
-[anchor-inlinemacro]
-<anchor id="{target}" xreflabel="{0=[{target}]}">
-[anchor2-inlinemacro]
-# [[id,text]]
-<anchor id="{1}" xreflabel="{2=[{1}]}">
-
-endif::sgml[]
--- a/bin/fuzzypo
+++ b/bin/fuzzypo
@ -2,10 +2,21 @@
 # vim: set sts=4 expandtab:
 # $1: es.po fr.po pt.po zh-cn.po zh-cn.po-best ...
 #
-DPO="po"
 MSGATTR="msgattrib"
+MSGCAT="msgcat --no-wrap -"
 #
-echo "no-obsolete  $1  `${MSGATTR} --no-obsolete  $1 |grep ^msgid |sed 1d|wc -l`"
-echo "untranslated $1  `${MSGATTR} --untranslated $1 |grep ^msgid |sed 1d|wc -l`"
-echo "fuzzy        $1  `${MSGATTR} --fuzzy        $1 |grep ^msgid |sed 1d|wc -l`"
+TOTAL="$(${MSGATTR} --no-obsolete  "$1" |grep ^msgid |sed 1d|wc -l)"
+UNTRANSLATED="$(${MSGATTR} --untranslated  "$1" |grep ^msgid |sed 1d|wc -l)"
+FUZZY="$(${MSGATTR} --fuzzy  "$1" |grep ^msgid |sed 1d|wc -l)"
+COMPLETED="$(( ( TOTAL - UNTRANSLATED - FUZZY ) * 100 / TOTAL ))"
+TRIVIAL="$(${MSGATTR} --no-obsolete  "$1" |${MSGCAT} |grep -i -c '^msgid *"http')"
+BASELINE="$(( TRIVIAL * 100 / TOTAL ))"
+MINCOMP="$(( ( 60 * TRIVIAL + 40 * TOTAL ) / TOTAL ))"
+echo "$1  $TOTAL strings -- TOTAL msgstr to translate"
+echo "$1  $UNTRANSLATED strings -- EMPTY msgstr"
+echo "$1  $FUZZY strings -- FUZZY msgstr"
+echo "$1  $COMPLETED %       -- COMPLETED translation"
+echo "$1  $TRIVIAL strings -- msgid "http..." (considered TRIVIAL)"
+echo "$1  $BASELINE %       -- TRIVIAL portion"
+echo "$1  $MINCOMP %       -- MINIMUM translation portion to activate (net 40%)"
 echo
--- a/bin/help.conf
+++ b/bin/help.conf
@ -1,213 +0,0 @@
-# AsciiDoc help file.
-#
-# INI section format, each section contains a topic.
-# Displayed with 'asciidoc --help sectionname' command.
-#
-
-#
-# Default help topic.
-#
-[default]
-
-Man page:     asciidoc --help manpage
-Syntax:       asciidoc --help syntax
-
-[manpage]
-
-
-NAME
-
-   asciidoc - converts an AsciiDoc text file to DocBook, HTML or LinuxDoc
-
-SYNOPSIS
-
-   asciidoc [OPTIONS] FILE
-
-DESCRIPTION
-
-   The asciidoc(1) command translates the AsciiDoc text file FILE to a
-   DocBook, HTML or LinuxDoc file. If FILE is - then the standard input is
-   used.
-
-OPTIONS
-
-   -a, --attribute=ATTRIBUTE
-          Define or delete document attribute. ATTRIBUTE is formatted like
-          NAME=VALUE. Command-line attributes take precedence over
-          document and configuration file attributes. Alternate acceptable
-          forms are NAME (the VALUE defaults to an empty string); NAME!
-          (delete the NAME attribute); NAME@ (do not override document or
-          configuration file attributes). Values containing spaces should
-          be enclosed in double-quote characters. This option may be
-          specified more than once.
-
-   -b, --backend=BACKEND
-          Backend output file format: docbook, xhtml11 or html4. Defaults
-          to xhtml11.
-
-   -f, --conf-file=CONF_FILE
-          Use configuration file CONF_FILE.Configuration files processed
-          in command-line order (after implicit configuration files). This
-          option may be specified more than once.
-
-   -d, --doctype=DOCTYPE
-          Document type: article, manpage or book. The book document type
-          is only supported by the docbook backend. Default document type
-          is article.
-
-   -c, --dump-conf
-          Dump configuration to stdout.
-
-   -h, --help[=TOPIC]
-          Print help TOPIC. --help=topics will print a list of help
-          topics, --help=syntax summarizes AsciiDoc syntax, --help=manpage
-          prints the AsciiDoc manpage.
-
-   -e, --no-conf
-          Exclude implicitly loaded configuration files except for those
-          named like the input file (infile.conf and infile-backend.conf).
-
-   -s, --no-header-footer
-          Suppress document header and footer output.
-
-   -o, --out-file=OUT_FILE
-          Write output to file OUT_FILE. Defaults to the base name of
-          input file with backend extension. If the input is stdin then
-          the outfile defaults to stdout. If OUT_FILE is - then the
-          standard output is used.
-
-   -n, --section-numbers
-          Auto-number HTML article section titles. Synonym for -a
-          numbered.
-
-   --unsafe
-          Disable safe mode. Safe mode is enabled by default, disabling it
-          is potentially dangerous.
-
-   -v, --verbose
-          Verbosely print processing information and configuration file
-          checks to stderr.
-
-   --version
-          Print program version number.
-
-EXIT STATUS
-
-   0
-          Success
-
-   1
-          Failure (syntax or usage error; configuration error; document
-          processing failure; unexpected error).
-
-BUGS
-
-   See the AsciiDoc distribution BUGS file.
-
-AUTHOR
-
-   Written by Stuart Rackham, <srackham@gmail.com>
-
-RESOURCES
-
-   SourceForge: http://sourceforge.net/projects/asciidoc/
-
-   Main web site: http://www.methods.co.nz/asciidoc/
-
-COPYING
-
-   Copyright (C) 2002-2008 Stuart Rackham. Free use of this software is
-   granted under the terms of the GNU General Public License (GPL).
-
-[syntax]
-
-AsciiDoc Markup Syntax Summary
-==============================
-
-A summary of the most often used markup.
-For a complete reference see the 'AsciiDoc User Guide'.
-
-Text formatting
---------------
-  *bold text*                 (boldface font)
-  _emphasized text_           (normally italics) --  disabled
-  'emphasized text'                              --  disabled together with __
-  +monospaced text+           (proportional font)
-  `monospaced text`
-
-Document links
--------------
-  [[id]]                      (define link target)
-  <<id,caption>>              (link to target id)
-  link:filename#id[caption]   (link to external HTML file)
-
-URLs
----
-  Use normal URL and email addess syntax or:
-
-  http:address[caption]       (link to web page)
-  mailto:address[caption]     (link to mail recipient)
-
-Images
------
-  image:filename[caption]     (inline image)
-  image::filename[caption]    (block image)
-
-Document header
---------------
-
-  The Document Title
-  ==================
-  author <email>            (optional)
-  revision, date            (optional)
-
-Section title underlines
------------------------
-  Level 0 (document title):  ======================
-  Level 1:                   ----------------------
-  Level 2:                   ~~~~~~~~~~~~~~~~~~~~~~
-  Level 3:                   ^^^^^^^^^^^^^^^^^^^^^^
-  Level 4 (bottom level):    ++++++++++++++++++++++
-
-Delimited blocks
----------------
-Delimiters must begin at left margin.
-
-  -------------------
-  listing block
-  -------------------
-
-  ...................
-  literal block
-  ...................
-
-  *******************
-  sidebar block
-  *******************
-
-  [style, author, cite]       (optional)
-  ___________________
-  quote block
-  ___________________
-
-  ===================
-  example block
-  ===================
-
-  ///////////////////
-  comment block
-  ///////////////////
-
-More block elements
-------------------
-  [attributes list]           (Note 1)
-  .Block title                (Note 1)
-  // Comment line             (Note 1)
-  include::filename[]         (Note 1)
-
-Note 1: Begin at the left margin.
-
-More inline elements
--------------------
-  footnote:[footnote text]    (document footnote)
-
--- a/bin/replace0
+++ b/bin/replace0
@ -0,0 +1,8 @@
+# buggy original xml
+s,”</emphasis>,</emphasis>”,g
+# manpages to use literal conversion
+s,<citerefentry> *<refentrytitle>\([^<]*\)</refentrytitle> *<manvolnum>\([^<]*\)</manvolnum> *</citerefentry>,<literal>\1</literal>(\2),g
+# Now GTK instead of GTK+
+s,GTK+,GTK,g
+# <> -> emphasis:
+s,&lt;\([^& ]*\)&gt;,<emphasis>\1</emphasis>,g
--- a/bin/replace1
+++ b/bin/replace1
@ -1,2 +0,0 @@
-# manpages
-s,<literal>\([^<]*\)</literal>(\([^)]*\)),<citerefentry><refentrytitle>\1</refentrytitle><manvolnum>\2</manvolnum></citerefentry>,g
--- a/bin/replace_package
+++ b/bin/replace_package
@ -1,3 +1,4 @@
-# This is autogenerated by Makefile.  Update this with "make rawxml"
+# This is to keep XML source stable. (TO BE USED)
 s/@libpoppler@/libpoppler95/g
 s/@libgstreamer@/libgstreamer1.0-0/g
+s/@libstdc++-dev@/libstdc++-10-dev/g
--- a/common.ent
+++ b/common.ent
@ -1,11 +0,0 @@
-<!ENTITY build-date "2021-01-10 06:32:51 UTC">
-<!ENTITY arch "amd64">
-<!ENTITY dr-version "2.77">
-<!ENTITY codename-stable  "bullseye">
-<!ENTITY Codename-stable  "Bullseye">
-<!ENTITY codename-testing  "bookworm">
-<!ENTITY Codename-testing  "Bookworm">
-<!ENTITY codename-nexttesting  "trixie">
-<!ENTITY Codename-nexttesting  "Trixie">
-<!ENTITY codename-unstable "sid">
-<!ENTITY Codename-unstable "Sid">
--- a/datadatepop.ent
+++ b/datadatepop.ent
@ -1 +0,0 @@
-<!ENTITY pop-date "2021-01-10 06:32:17 UTC">
--- a/datadatesize.ent
+++ b/datadatesize.ent
@ -1,5 +0,0 @@
-<!ENTITY all-packages "62716">
-<!ENTITY main-packages "61595">
-<!ENTITY contrib-packages "349">
-<!ENTITY non-free-packages "772">
-<!ENTITY pkgsize-date "2021-01-10 06:32:23 UTC">
--- a/debian/all.install-in
+++ b/debian/all.install-in
@ -1,4 +1,4 @@
-tmp/debian-reference.@@.txt.gz usr/share/debian-reference/
-tmp/debian-reference.@@.epub usr/share/debian-reference/
-tmp/debian-reference.@@.pdf usr/share/debian-reference/
-tmp/*.@@.html usr/share/debian-reference/
+build/debian-reference.@@.txt.gz usr/share/debian-reference/
+build/debian-reference.@@.epub usr/share/debian-reference/
+build/debian-reference.@@.pdf usr/share/debian-reference/
+build/*.@@.html usr/share/debian-reference/
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+debian-reference (2.79) UNRELEASED; urgency=medium
+
+  * Clean up build scripts.
+
+ -- Osamu Aoki <osamu@debian.org>  Thu, 27 May 2021 10:49:41 +0900
+
 debian-reference (2.78) unstable; urgency=medium

  [ xiao sheng wen (肖盛文) ]
--- a/debian/debian-reference-common.install
+++ b/debian/debian-reference-common.install
@ -2,6 +2,6 @@ bin/debian-reference usr/bin
 bin/mkindexhtml usr/share/debian-reference-common
 debian/debian-reference-common.desktop usr/share/applications
 debian/debian-reference.png usr/share/pixmaps
-tmp/.htaccess usr/share/debian-reference
-tmp/debian-reference.css usr/share/debian-reference
-tmp/images/* usr/share/debian-reference/images
+build/.htaccess usr/share/debian-reference
+build/debian-reference.css usr/share/debian-reference
+build/images/* usr/share/debian-reference/images
--- a/pkgsize.ent
+++ b/pkgsize.ent
@ -1,682 +0,0 @@
-<!ENTITY size-acps "3651">
-<!ENTITY size-abiword "5141">
-<!ENTITY size-acpi "45">
-<!ENTITY size-acpid "176">
-<!ENTITY size-aft "235">
-<!ENTITY size-aide "2063">
-<!ENTITY size-ale "839">
-<!ENTITY size-alien "161">
-<!ENTITY size-alsautils "2283">
-<!ENTITY size-amandaclient "1089">
-<!ENTITY size-amandacommon "10031">
-<!ENTITY size-amandaserver "1076">
-<!ENTITY size-anacron "99">
-<!ENTITY size-analog "3534">
-<!ENTITY size-antiword "589">
-<!ENTITY size-apachec "610">
-<!ENTITY size-approx "6317">
-<!ENTITY size-apt "4299">
-<!ENTITY size-aptcacher "289">
-<!ENTITY size-aptcacherng "1488">
-<!ENTITY size-aptfile "90">
-<!ENTITY size-aptitude "4249">
-<!ENTITY size-aptlistbugs "465">
-<!ENTITY size-aptlistchanges "421">
-<!ENTITY size-aptrdepends "40">
-<!ENTITY size-aptutils "1162">
-<!ENTITY size-ariac "1854">
-<!ENTITY size-arping "77">
-<!ENTITY size-arptables "96">
-<!ENTITY size-asciidoc "81">
-<!ENTITY size-at "161">
-<!ENTITY size-autoconf "1846">
-<!ENTITY size-automake "1830">
-<!ENTITY size-autopsy "1027">
-<!ENTITY size-awstats "6910">
-<!ENTITY size-axel "216">
-<!ENTITY size-backupcl "114">
-<!ENTITY size-backupmanager "572">
-<!ENTITY size-backupninja "355">
-<!ENTITY size-backuppc "3182">
-<!ENTITY size-baculaclient "183">
-<!ENTITY size-baculacommon "2158">
-<!ENTITY size-baculaconsole "107">
-<!ENTITY size-baculaserver "183">
-<!ENTITY size-bash "6469">
-<!ENTITY size-beav "133">
-<!ENTITY size-bigcursor "27">
-<!ENTITY size-bindj "1063">
-<!ENTITY size-bindjhost "365">
-<!ENTITY size-bing "80">
-<!ENTITY size-binutils "97">
-<!ENTITY size-bison "2815">
-<!ENTITY size-blender "79166">
-<!ENTITY size-bless "1028">
-<!ENTITY size-bmon "146">
-<!ENTITY size-bochs "7194">
-<!ENTITY size-bootchartc "94">
-<!ENTITY size-browserpluginfreshplayerpepperflash "1135">
-<!ENTITY size-bsdmainutils "26">
-<!ENTITY size-bsdutils "393">
-<!ENTITY size-btrfsprogs "4027">
-<!ENTITY size-btyacc "243">
-<!ENTITY size-buildessential "20">
-<!ENTITY size-bwmng "90">
-<!ENTITY size-byacc "160">
-<!ENTITY size-bzipc "122">
-<!ENTITY size-bzr "28">
-<!ENTITY size-calibre "54876">
-<!ENTITY size-calligraplan "15342">
-<!ENTITY size-calligrasheets "10890">
-<!ENTITY size-calligrastage "5102">
-<!ENTITY size-calligrawords "5717">
-<!ENTITY size-catdoc "675">
-<!ENTITY size-cdebootstrap "116">
-<!ENTITY size-changetrack "71">
-<!ENTITY size-chkrootkit "970">
-<!ENTITY size-chromium "180040">
-<!ENTITY size-cifsutils "299">
-<!ENTITY size-clamav "774">
-<!ENTITY size-consolesetup "411">
-<!ENTITY size-coreutils "17478">
-<!ENTITY size-courierimap "589">
-<!ENTITY size-couriermta "2416">
-<!ENTITY size-courierpop "308">
-<!ENTITY size-cpio "1136">
-<!ENTITY size-cpp "42">
-<!ENTITY size-crack "149">
-<!ENTITY size-crmbbe "1119">
-<!ENTITY size-cron "263">
-<!ENTITY size-cryptmount "228">
-<!ENTITY size-cryptsetup "402">
-<!ENTITY size-csh "343">
-<!ENTITY size-cssc "2044">
-<!ENTITY size-cups "1141">
-<!ENTITY size-cupsbsd "122">
-<!ENTITY size-cupsclient "493">
-<!ENTITY size-curl "426">
-<!ENTITY size-cvs "4609">
-<!ENTITY size-cxref "1193">
-<!ENTITY size-cyrusimapd "484">
-<!ENTITY size-cyruspopdd "160">
-<!ENTITY size-cyrussaslcdoc "575">
-<!ENTITY size-darcs "23159">
-<!ENTITY size-dash "221">
-<!ENTITY size-dblatex "4643">
-<!ENTITY size-dbtoepub "37">
-<!ENTITY size-dcfldd "106">
-<!ENTITY size-dcraw "535">
-<!ENTITY size-ddd "4184">
-<!ENTITY size-debianfaq "817">
-<!ENTITY size-debianhistory "4285">
-<!ENTITY size-debianpolicy "4306">
-<!ENTITY size-debianutils "230">
-<!ENTITY size-debootstrap "298">
-<!ENTITY size-debsums "107">
-<!ENTITY size-developersreference "1917">
-<!ENTITY size-devscripts "2623">
-<!ENTITY size-dia "3727">
-<!ENTITY size-dialog "1222">
-<!ENTITY size-diffstat "73">
-<!ENTITY size-diffutils "1598">
-<!ENTITY size-digikam "2646">
-<!ENTITY size-dillo "1536">
-<!ENTITY size-dirdiff "166">
-<!ENTITY size-discover "90">
-<!ENTITY size-dkms "294">
-<!ENTITY size-dlint "53">
-<!ENTITY size-dnstracer "61">
-<!ENTITY size-dnsutils "256">
-<!ENTITY size-docbookdsssl "2604">
-<!ENTITY size-docbooktoman "191">
-<!ENTITY size-docbookutils "281">
-<!ENTITY size-docbookxml "2133">
-<!ENTITY size-docbookxsl "14870">
-<!ENTITY size-docdebian "166">
-<!ENTITY size-docdiff "555">
-<!ENTITY size-doclifter "451">
-<!ENTITY size-dosbox "2742">
-<!ENTITY size-dosemu "4891">
-<!ENTITY size-dosfstools "235">
-<!ENTITY size-dpatch "191">
-<!ENTITY size-dpkg "6856">
-<!ENTITY size-dselect "2591">
-<!ENTITY size-dump "352">
-<!ENTITY size-duplicity "1761">
-<!ENTITY size-dvbackup "413">
-<!ENTITY size-dvdisaster "1741">
-<!ENTITY size-ecfsprogs "1449">
-<!ENTITY size-ecps "109">
-<!ENTITY size-ebtables "265">
-<!ENTITY size-ecryptfsutils "460">
-<!ENTITY size-electricfence "70">
-<!ENTITY size-elinks "1767">
-<!ENTITY size-emacsnox "18364">
-<!ENTITY size-enscript "2132">
-<!ENTITY size-eog "10189">
-<!ENTITY size-epiphanybrowser "3730">
-<!ENTITY size-esmtp "128">
-<!ENTITY size-esmtprun "32">
-<!ENTITY size-etckeeper "162">
-<!ENTITY size-ethstats "23">
-<!ENTITY size-ethstatus "40">
-<!ENTITY size-ethtool "597">
-<!ENTITY size-evince "954">
-<!ENTITY size-evolution "475">
-<!ENTITY size-exif "339">
-<!ENTITY size-exifprobe "499">
-<!ENTITY size-exiftags "292">
-<!ENTITY size-exiftran "70">
-<!ENTITY size-eximebase "1704">
-<!ENTITY size-eximedaemonheavy "1643">
-<!ENTITY size-eximedaemonlight "1493">
-<!ENTITY size-eximedochtml "3662">
-<!ENTITY size-eximedocinfo "624">
-<!ENTITY size-exivc "321">
-<!ENTITY size-extdgrep "281">
-<!ENTITY size-extemagic "233">
-<!ENTITY size-extundelete "148">
-<!ENTITY size-exuberantctags "341">
-<!ENTITY size-fcc "442">
-<!ENTITY size-failcban "2092">
-<!ENTITY size-fakeroot "228">
-<!ENTITY size-fastjar "183">
-<!ENTITY size-fbreader "3074">
-<!ENTITY size-fetchmail "814">
-<!ENTITY size-figcsxd "149">
-<!ENTITY size-findimagedupes "79">
-<!ENTITY size-firefox "205631">
-<!ENTITY size-firefoxesr "198436">
-<!ENTITY size-flawfinder "181">
-<!ENTITY size-flex "1279">
-<!ENTITY size-flexbackup "243">
-<!ENTITY size-fluxbox "3860">
-<!ENTITY size-fontconfig "583">
-<!ENTITY size-fontconfigconfig "442">
-<!ENTITY size-fontforge "4191">
-<!ENTITY size-fontsdejavu "39">
-<!ENTITY size-fontsdejavucore "2954">
-<!ENTITY size-fontsdejavuextra "7493">
-<!ENTITY size-fontsfreefontttf "6656">
-<!ENTITY size-fontsliberation "2093">
-<!ENTITY size-fop "291">
-<!ENTITY size-foremost "104">
-<!ENTITY size-fpc "121">
-<!ENTITY size-freepwing "421">
-<!ENTITY size-ftp "137">
-<!ENTITY size-fwlogwatch "479">
-<!ENTITY size-gawk "2558">
-<!ENTITY size-gcc "45">
-<!ENTITY size-gdb "9789">
-<!ENTITY size-gdisk "852">
-<!ENTITY size-gdmd "5101">
-<!ENTITY size-geeqie "14643">
-<!ENTITY size-getmail "30">
-<!ENTITY size-gettext "5843">
-<!ENTITY size-gfortran "16">
-<!ENTITY size-ghostscript "231">
-<!ENTITY size-ghostscriptx "223">
-<!ENTITY size-gimp "22313">
-<!ENTITY size-git "35040">
-<!ENTITY size-gitbuildpackage "4193">
-<!ENTITY size-gitcvs "1279">
-<!ENTITY size-gitdoc "11762">
-<!ENTITY size-gitemail "966">
-<!ENTITY size-gitgui "2317">
-<!ENTITY size-gitk "1723">
-<!ENTITY size-gitmagic "721">
-<!ENTITY size-gitsvn "1144">
-<!ENTITY size-glabels "1326">
-<!ENTITY size-glade "1730">
-<!ENTITY size-glibcdoc "3161">
-<!ENTITY size-glibcdocreference "12740">
-<!ENTITY size-gnomenettool "2105">
-<!ENTITY size-gnucash "32304">
-<!ENTITY size-gnuhtmlclatex "27">
-<!ENTITY size-gnumeric "9933">
-<!ENTITY size-gnupg "787">
-<!ENTITY size-gocr "531">
-<!ENTITY size-gparted "2046">
-<!ENTITY size-gpgv "859">
-<!ENTITY size-gphotoc "955">
-<!ENTITY size-gpm "530">
-<!ENTITY size-graphicsmagick "5224">
-<!ENTITY size-grc "190">
-<!ENTITY size-groff "11838">
-<!ENTITY size-grublegacy "735">
-<!ENTITY size-grubpc "533">
-<!ENTITY size-grubrescuepc "6367">
-<!ENTITY size-gsfonts "4439">
-<!ENTITY size-gsfontsxbb "95">
-<!ENTITY size-gthumb "5475">
-<!ENTITY size-gtkam "1154">
-<!ENTITY size-guessnet "422">
-<!ENTITY size-guilt "146">
-<!ENTITY size-guymager "1030">
-<!ENTITY size-gwenview "10570">
-<!ENTITY size-gzip "245">
-<!ENTITY size-gzrt "33">
-<!ENTITY size-hdparm "256">
-<!ENTITY size-helpcman "498">
-<!ENTITY size-hexedit "72">
-<!ENTITY size-hfsprogs "356">
-<!ENTITY size-hfsutils "1884">
-<!ENTITY size-highlight "1083">
-<!ENTITY size-homebank "1044">
-<!ENTITY size-htmlcps "249">
-<!ENTITY size-htmlctext "274">
-<!ENTITY size-ibus "1581">
-<!ENTITY size-ibusanthy "8723">
-<!ENTITY size-ibuschewing "415">
-<!ENTITY size-ibushangul "288">
-<!ENTITY size-ibuskkc "214">
-<!ENTITY size-ibusmbhn "187">
-<!ENTITY size-ibusmozc "999">
-<!ENTITY size-ibuspinyin "1434">
-<!ENTITY size-ibusskk "244">
-<!ENTITY size-ibustable "1801">
-<!ENTITY size-ibustablethai "47">
-<!ENTITY size-ibusunikey "318">
-<!ENTITY size-icmpinfo "44">
-<!ENTITY size-icoutils "221">
-<!ENTITY size-ifmetric "37">
-<!ENTITY size-ifplugd "217">
-<!ENTITY size-ifrename "125">
-<!ENTITY size-ifscheme "59">
-<!ENTITY size-ifstat "60">
-<!ENTITY size-iftop "97">
-<!ENTITY size-ifupdown "217">
-<!ENTITY size-ifupdownextra "106">
-<!ENTITY size-imageindex "145">
-<!ENTITY size-imagemagick "218">
-<!ENTITY size-imediff "157">
-<!ENTITY size-impose "119">
-<!ENTITY size-inetutilsping "359">
-<!ENTITY size-infocman "134">
-<!ENTITY size-infocwww "76">
-<!ENTITY size-initramfstools "112">
-<!ENTITY size-initscripts "176">
-<!ENTITY size-initsystemhelpers "131">
-<!ENTITY size-inkscape "84823">
-<!ENTITY size-insserv "150">
-<!ENTITY size-integrit "329">
-<!ENTITY size-intelcgas "178">
-<!ENTITY size-iperf "263">
-<!ENTITY size-ipfm "78">
-<!ENTITY size-iproutec "2867">
-<!ENTITY size-iptables "2520">
-<!ENTITY size-iptstate "116">
-<!ENTITY size-iputilsarping "55">
-<!ENTITY size-iputilsping "113">
-<!ENTITY size-iputilstracepath "72">
-<!ENTITY size-isag "116">
-<!ENTITY size-iscdhcpclient "686">
-<!ENTITY size-iscdhcpserver "1471">
-<!ENTITY size-jackd "9">
-<!ENTITY size-jfsutils "1577">
-<!ENTITY size-jhead "109">
-<!ENTITY size-john "452">
-<!ENTITY size-kamera "798">
-<!ENTITY size-karbon "3473">
-<!ENTITY size-kexectools "278">
-<!ENTITY size-kexi "7576">
-<!ENTITY size-kmail "18011">
-<!ENTITY size-kmymoney "12036">
-<!ENTITY size-knockd "102">
-<!ENTITY size-konqueror "20763">
-<!ENTITY size-kontact "2152">
-<!ENTITY size-konwert "134">
-<!ENTITY size-kpartx "87">
-<!ENTITY size-ksh "3284">
-<!ENTITY size-latexcrtf "480">
-<!ENTITY size-ldaputils "718">
-<!ENTITY size-ldm "436">
-<!ENTITY size-leaktracer "57">
-<!ENTITY size-lftp "2255">
-<!ENTITY size-libaudioc "165">
-<!ENTITY size-libcg "12771">
-<!ENTITY size-libcgdev "14357">
-<!ENTITY size-libdmallocf "393">
-<!ENTITY size-libfreetypeg "896">
-<!ENTITY size-libgstreamerbaa "5280">
-<!ENTITY size-libjacka "338">
-<!ENTITY size-libncursesfdev "6">
-<!ENTITY size-libnssldap "265">
-<!ENTITY size-libnssldapd "153">
-<!ENTITY size-libnssmdns "150">
-<!ENTITY size-libpamcracklib "115">
-<!ENTITY size-libpamdoc "1044">
-<!ENTITY size-libpamldap "249">
-<!ENTITY size-libpammodules "1032">
-<!ENTITY size-libpamshield "115">
-<!ENTITY size-libpamsystemd "573">
-<!ENTITY size-libphonone "680">
-<!ENTITY size-libpopplerjf "4172">
-<!ENTITY size-libpopplerglibi "449">
-<!ENTITY size-libpulsea "969">
-<!ENTITY size-librecad "8205">
-<!ENTITY size-libreofficebase "7473">
-<!ENTITY size-libreofficecalc "32973">
-<!ENTITY size-libreofficedraw "14600">
-<!ENTITY size-libreofficeimpress "9934">
-<!ENTITY size-libreofficemath "1963">
-<!ENTITY size-libreofficewriter "39333">
-<!ENTITY size-libvirtclients "1167">
-<!ENTITY size-libwmfbin "113">
-<!ENTITY size-libxftc "122">
-<!ENTITY size-libxmlcutils "182">
-<!ENTITY size-lilo "697">
-<!ENTITY size-linklint "344">
-<!ENTITY size-links "2249">
-<!ENTITY size-linksc "5417">
-<!ENTITY size-lmodern "33270">
-<!ENTITY size-loadlin "90">
-<!ENTITY size-logcheck "102">
-<!ENTITY size-logwatch "2265">
-<!ENTITY size-lpr "362">
-<!ENTITY size-lprng "3064">
-<!ENTITY size-lsbbase "49">
-<!ENTITY size-lshw "842">
-<!ENTITY size-lsof "451">
-<!ENTITY size-ltrace "363">
-<!ENTITY size-lxc "18761">
-<!ENTITY size-lynx "1948">
-<!ENTITY size-lzma "149">
-<!ENTITY size-lzop "164">
-<!ENTITY size-macutils "298">
-<!ENTITY size-magicrescue "259">
-<!ENTITY size-mailagent "1356">
-<!ENTITY size-maildrop "1141">
-<!ENTITY size-mailfilter "291">
-<!ENTITY size-maintguide "987">
-<!ENTITY size-make "1592">
-<!ENTITY size-makepatch "102">
-<!ENTITY size-manchtml "138">
-<!ENTITY size-markdown "57">
-<!ENTITY size-masqmail "337">
-<!ENTITY size-mawk "242">
-<!ENTITY size-mbr "50">
-<!ENTITY size-mc "1482">
-<!ENTITY size-meld "2972">
-<!ENTITY size-memtestig "2391">
-<!ENTITY size-menu "1509">
-<!ENTITY size-menuxdg "27">
-<!ENTITY size-mercurial "1053">
-<!ENTITY size-mew "2325">
-<!ENTITY size-mgetty "315">
-<!ENTITY size-mingetty "38">
-<!ENTITY size-mksh "1469">
-<!ENTITY size-mmdd "3778">
-<!ENTITY size-monotone "5815">
-<!ENTITY size-moreutils "237">
-<!ENTITY size-mpack "106">
-<!ENTITY size-mpop "400">
-<!ENTITY size-msmtp "547">
-<!ENTITY size-msmtpmta "86">
-<!ENTITY size-mtools "389">
-<!ENTITY size-mtr "214">
-<!ENTITY size-mtrtiny "161">
-<!ENTITY size-mutt "7056">
-<!ENTITY size-myrescue "83">
-<!ENTITY size-nas "243">
-<!ENTITY size-ncftp "1339">
-<!ENTITY size-ncurseshexedit "132">
-<!ENTITY size-netatalk "2077">
-<!ENTITY size-netcat "16">
-<!ENTITY size-netpbm "4302">
-<!ENTITY size-nettools "991">
-<!ENTITY size-networkmanager "14957">
-<!ENTITY size-networkmanagergnome "5540">
-<!ENTITY size-nfscommon "768">
-<!ENTITY size-nfskernelserver "342">
-<!ENTITY size-nkf "358">
-<!ENTITY size-nmap "4452">
-<!ENTITY size-ntfsdg "1479">
-<!ENTITY size-ntopng "969">
-<!ENTITY size-nullmailer "479">
-<!ENTITY size-ocrad "303">
-<!ENTITY size-odtctxt "60">
-<!ENTITY size-okteta "1508">
-<!ENTITY size-okular "14646">
-<!ENTITY size-ooocdbk "217">
-<!ENTITY size-openfontdesigntoolkit "10">
-<!ENTITY size-openjade "1019">
-<!ENTITY size-opensshclient "4298">
-<!ENTITY size-opensshserver "1567">
-<!ENTITY size-openssl "1465">
-<!ENTITY size-osscompat "20">
-<!ENTITY size-outguess "261">
-<!ENTITY size-phzip "987">
-<!ENTITY size-phzipfull "4664">
-<!ENTITY size-pandoc "151714">
-<!ENTITY size-paperkey "58">
-<!ENTITY size-parc "271">
-<!ENTITY size-parted "304">
-<!ENTITY size-patch "248">
-<!ENTITY size-patchutils "232">
-<!ENTITY size-pax "170">
-<!ENTITY size-pbuilder "966">
-<!ENTITY size-pciutils "196">
-<!ENTITY size-pcmciautils "97">
-<!ENTITY size-pdfcsvg "30">
-<!ENTITY size-pdftk "28">
-<!ENTITY size-pdftoipe "71">
-<!ENTITY size-pepperflashpluginnonfree "29">
-<!ENTITY size-perl "705">
-<!ENTITY size-pflogsumm "111">
-<!ENTITY size-planner "1146">
-<!ENTITY size-popplerdata "13090">
-<!ENTITY size-popplerutils "689">
-<!ENTITY size-posh "190">
-<!ENTITY size-poster "58">
-<!ENTITY size-postfix "4182">
-<!ENTITY size-postfixdoc "4444">
-<!ENTITY size-powertop "662">
-<!ENTITY size-ppp "1054">
-<!ENTITY size-pppconfig "801">
-<!ENTITY size-pppoeconf "192">
-<!ENTITY size-printerdrivergutenprint "937">
-<!ENTITY size-procinfo "135">
-<!ENTITY size-procmail "300">
-<!ENTITY size-procps "792">
-<!ENTITY size-proftpdbasic "488">
-<!ENTITY size-psceps "98">
-<!ENTITY size-psmisc "679">
-<!ENTITY size-pstoedit "988">
-<!ENTITY size-pstotext "126">
-<!ENTITY size-psutils "219">
-<!ENTITY size-pulseaudio "6398">
-<!ENTITY size-pybootchartgui "177">
-<!ENTITY size-pylint "1371">
-<!ENTITY size-python "68">
-<!ENTITY size-pythondocutils "1771">
-<!ENTITY size-qemu "94">
-<!ENTITY size-qemukvm "107">
-<!ENTITY size-qemusystem "95">
-<!ENTITY size-qemuuser "89671">
-<!ENTITY size-qemuutils "6083">
-<!ENTITY size-quilt "788">
-<!ENTITY size-rc "169">
-<!ENTITY size-rcs "562">
-<!ENTITY size-rdiffbackup "733">
-<!ENTITY size-recode "603">
-<!ENTITY size-reisereprogs "1373">
-<!ENTITY size-reiserfsprogs "1132">
-<!ENTITY size-restcweb "527">
-<!ENTITY size-restic "20595">
-<!ENTITY size-rsnapshot "462">
-<!ENTITY size-rsync "677">
-<!ENTITY size-ruby "35">
-<!ENTITY size-samba "16629">
-<!ENTITY size-sarg "843">
-<!ENTITY size-sash "1054">
-<!ENTITY size-saslcbin "428">
-<!ENTITY size-sbuild "286">
-<!ENTITY size-scalpel "87">
-<!ENTITY size-schroot "2708">
-<!ENTITY size-screen "1013">
-<!ENTITY size-scribus "30375">
-<!ENTITY size-scrot "70">
-<!ENTITY size-scroungentfs "50">
-<!ENTITY size-scsitools "390">
-<!ENTITY size-sddm "1742">
-<!ENTITY size-sdf "1445">
-<!ENTITY size-sendmailbin "1854">
-<!ENTITY size-setcd "35">
-<!ENTITY size-setserial "117">
-<!ENTITY size-sgmlcx "90">
-<!ENTITY size-sharutils "1421">
-<!ENTITY size-shorewall "2458">
-<!ENTITY size-shorewallg "779">
-<!ENTITY size-shorewallglite "64">
-<!ENTITY size-shorewallinit "68">
-<!ENTITY size-shorewalllite "65">
-<!ENTITY size-shotwell "6451">
-<!ENTITY size-sisu "5344">
-<!ENTITY size-slbackup "151">
-<!ENTITY size-sleepd "86">
-<!ENTITY size-sleuthkit "1511">
-<!ENTITY size-smartmontools "2117">
-<!ENTITY size-smbclient "2016">
-<!ENTITY size-snort "2206">
-<!ENTITY size-sourcehighlight "1992">
-<!ENTITY size-splint "2315">
-<!ENTITY size-squid "8385">
-<!ENTITY size-squidd "240">
-<!ENTITY size-squidview "189">
-<!ENTITY size-srcctex "622">
-<!ENTITY size-ssft "75">
-<!ENTITY size-sshaskpass "106">
-<!ENTITY size-sshaskpassfullscreen "42">
-<!ENTITY size-ssmtp "2">
-<!ENTITY size-stgit "603">
-<!ENTITY size-strace "2367">
-<!ENTITY size-stunnele "507">
-<!ENTITY size-stxcany "264">
-<!ENTITY size-subversion "4858">
-<!ENTITY size-sudo "4555">
-<!ENTITY size-susvc "16">
-<!ENTITY size-susvd "16">
-<!ENTITY size-swatch "101">
-<!ENTITY size-synaptic "7873">
-<!ENTITY size-syslinux "343">
-<!ENTITY size-syslogsummary "30">
-<!ENTITY size-sysstat "1918">
-<!ENTITY size-systemd "15998">
-<!ENTITY size-systemdbootchart "128">
-<!ENTITY size-systemdcron "143">
-<!ENTITY size-systemdsysv "138">
-<!ENTITY size-sysvinitcore "276">
-<!ENTITY size-sysvinitutils "79">
-<!ENTITY size-sysvrc "81">
-<!ENTITY size-tbcyrillic "4878">
-<!ENTITY size-tar "3098">
-<!ENTITY size-taskgnomedesktop "9">
-<!ENTITY size-taskkdedesktop "6">
-<!ENTITY size-tasklxdedesktop "9">
-<!ENTITY size-tasksel "393">
-<!ENTITY size-taskxfcedesktop "9">
-<!ENTITY size-tcl "22">
-<!ENTITY size-tcpdump "1329">
-<!ENTITY size-tcptrace "401">
-<!ENTITY size-tcs "518">
-<!ENTITY size-tcsh "1316">
-<!ENTITY size-telnet "163">
-<!ENTITY size-telnetd "115">
-<!ENTITY size-telnetdssl "170">
-<!ENTITY size-telnetssl "210">
-<!ENTITY size-tesseractocr "1500">
-<!ENTITY size-tesseractocreng "4032">
-<!ENTITY size-testdisk "1426">
-<!ENTITY size-texichtml "1833">
-<!ENTITY size-texlive "71">
-<!ENTITY size-thunderbird "165180">
-<!ENTITY size-tidy "84">
-<!ENTITY size-tiger "7822">
-<!ENTITY size-time "82">
-<!ENTITY size-tk "22">
-<!ENTITY size-tkcvs "1498">
-<!ENTITY size-tla "1011">
-<!ENTITY size-tmux "830">
-<!ENTITY size-tnef "110">
-<!ENTITY size-tofrodos "55">
-<!ENTITY size-traceroute "159">
-<!ENTITY size-tripwire "11521">
-<!ENTITY size-trueprint "146">
-<!ENTITY size-tshark "407">
-<!ENTITY size-ttfmscorefontsinstaller "92">
-<!ENTITY size-ttfunifont "21">
-<!ENTITY size-txtchtml "259">
-<!ENTITY size-txtcman "114">
-<!ENTITY size-txtctags "342">
-<!ENTITY size-udo "583">
-<!ENTITY size-unaccent "29">
-<!ENTITY size-unattendedupgrades "325">
-<!ENTITY size-unhtml "43">
-<!ENTITY size-unison "14">
-<!ENTITY size-unpaper "460">
-<!ENTITY size-unrtf "148">
-<!ENTITY size-unzip "566">
-<!ENTITY size-usbutils "324">
-<!ENTITY size-uswsusp "714">
-<!ENTITY size-utillinux "4598">
-<!ENTITY size-uudeview "109">
-<!ENTITY size-valgrind "80378">
-<!ENTITY size-vdmfec "97">
-<!ENTITY size-vim "3231">
-<!ENTITY size-vimruntime "31723">
-<!ENTITY size-vimtiny "1553">
-<!ENTITY size-virtmanager "2298">
-<!ENTITY size-virtualbox "106495">
-<!ENTITY size-vzctl "1112">
-<!ENTITY size-vzquota "236">
-<!ENTITY size-wdm "2289">
-<!ENTITY size-wdiff "644">
-<!ENTITY size-wdm "885">
-<!ENTITY size-weblintperl "32">
-<!ENTITY size-wget "3477">
-<!ENTITY size-whiptail "71">
-<!ENTITY size-whois "364">
-<!ENTITY size-wicd "36(*)">
-<!ENTITY size-wicdcli "60(*)">
-<!ENTITY size-wicdcurses "176(*)">
-<!ENTITY size-wicddaemon "992(*)">
-<!ENTITY size-wicdgtk "576(*)">
-<!ENTITY size-wiggle "174">
-<!ENTITY size-wine "192">
-<!ENTITY size-wirelesstools "297">
-<!ENTITY size-wireshark "64">
-<!ENTITY size-wpcx "202">
-<!ENTITY size-wpagui "781">
-<!ENTITY size-wpasupplicant "3436">
-<!ENTITY size-wv "717">
-<!ENTITY size-wvdial "249">
-<!ENTITY size-xbbcommon "308">
-<!ENTITY size-xbbutils "712">
-<!ENTITY size-xbbxserverutils "511">
-<!ENTITY size-xbaseclients "46">
-<!ENTITY size-xclip "64">
-<!ENTITY size-xdgutils "327">
-<!ENTITY size-xdm "686">
-<!ENTITY size-xentools "727">
-<!ENTITY size-xfig "1793">
-<!ENTITY size-xfontsutils "415">
-<!ENTITY size-xfsdump "854">
-<!ENTITY size-xfsprogs "3191">
-<!ENTITY size-xgridfit "806">
-<!ENTITY size-xmlto "130">
-<!ENTITY size-xorg "52">
-<!ENTITY size-xorgdocs "2036">
-<!ENTITY size-xsane "2346">
-<!ENTITY size-xsel "59">
-<!ENTITY size-xserverxorg "238">
-<!ENTITY size-xsltproc "160">
-<!ENTITY size-xtrace "353">
-<!ENTITY size-xutilsdev "1466">
-<!ENTITY size-xzutils "612">
-<!ENTITY size-yodl "610">
-<!ENTITY size-zenity "384">
-<!ENTITY size-zenmap "2939">
-<!ENTITY size-zerofree "25">
-<!ENTITY size-zip "608">
-<!ENTITY size-zsh "2442">
--- a/popcon.ent
+++ b/popcon.ent
@ -1,685 +0,0 @@
-<!ENTITY pop-submissions "197967">
-<!ENTITY pop-architectures "26">
-<!ENTITY pop-packages "178828">
-<!ENTITY pop-acps "V:1, I:15">
-<!ENTITY pop-abiword "V:1, I:12">
-<!ENTITY pop-acpi "V:17, I:302">
-<!ENTITY pop-acpid "V:145, I:318">
-<!ENTITY pop-aft "V:0, I:0">
-<!ENTITY pop-aide "V:1, I:2">
-<!ENTITY pop-ale "V:0, I:0">
-<!ENTITY pop-alien "V:2, I:34">
-<!ENTITY pop-alsautils "V:341, I:476">
-<!ENTITY pop-amandaclient "V:0, I:2">
-<!ENTITY pop-amandacommon "V:0, I:2">
-<!ENTITY pop-amandaserver "V:0, I:0">
-<!ENTITY pop-anacron "V:409, I:482">
-<!ENTITY pop-analog "V:4, I:109">
-<!ENTITY pop-antiword "V:2, I:10">
-<!ENTITY pop-apachec "V:246, I:315">
-<!ENTITY pop-approx "V:0, I:0">
-<!ENTITY pop-apt "V:868, I:999">
-<!ENTITY pop-aptcacher "V:0, I:0">
-<!ENTITY pop-aptcacherng "V:5, I:5">
-<!ENTITY pop-aptfile "V:18, I:78">
-<!ENTITY pop-aptlistbugs "V:7, I:12">
-<!ENTITY pop-aptlistchanges "V:369, I:851">
-<!ENTITY pop-aptrdepends "V:0, I:6">
-<!ENTITY pop-aptutils "V:339, I:996">
-<!ENTITY pop-aptitude "V:80, I:431">
-<!ENTITY pop-ariac "V:2, I:19">
-<!ENTITY pop-arping "V:2, I:29">
-<!ENTITY pop-arptables "V:0, I:2">
-<!ENTITY pop-asciidoc "I:13">
-<!ENTITY pop-at "V:162, I:310">
-<!ENTITY pop-autoconf "V:41, I:282">
-<!ENTITY pop-automake "V:42, I:279">
-<!ENTITY pop-autopsy "V:0, I:2">
-<!ENTITY pop-awstats "V:9, I:15">
-<!ENTITY pop-axel "V:0, I:4">
-<!ENTITY pop-backupmanager "V:1, I:2">
-<!ENTITY pop-backupcl "V:0, I:1">
-<!ENTITY pop-backupninja "V:4, I:5">
-<!ENTITY pop-backuppc "V:3, I:3">
-<!ENTITY pop-baculaclient "I:3">
-<!ENTITY pop-baculacommon "V:10, I:15">
-<!ENTITY pop-baculaconsole "V:1, I:5">
-<!ENTITY pop-baculaserver "I:1">
-<!ENTITY pop-bash "V:791, I:999">
-<!ENTITY pop-beav "V:0, I:0">
-<!ENTITY pop-bigcursor "I:1">
-<!ENTITY pop-bindj "V:52, I:65">
-<!ENTITY pop-bindjhost "V:382, I:948">
-<!ENTITY pop-bing "V:0, I:1">
-<!ENTITY pop-binutils "V:164, I:678">
-<!ENTITY pop-bison "V:9, I:103">
-<!ENTITY pop-blender "V:4, I:38">
-<!ENTITY pop-bless "V:0, I:4">
-<!ENTITY pop-bmon "V:1, I:17">
-<!ENTITY pop-bochs "V:0, I:1">
-<!ENTITY pop-bootchartc "V:0, I:0">
-<!ENTITY pop-browserpluginfreshplayerpepperflash "I:9">
-<!ENTITY pop-bsdmainutils "V:60, I:996">
-<!ENTITY pop-bsdutils "V:673, I:999">
-<!ENTITY pop-btrfsprogs "V:38, I:64">
-<!ENTITY pop-btyacc "V:0, I:0">
-<!ENTITY pop-buildessential "I:499">
-<!ENTITY pop-bwmng "V:2, I:17">
-<!ENTITY pop-byacc "V:0, I:6">
-<!ENTITY pop-bzipc "V:157, I:970">
-<!ENTITY pop-bzr "V:2, I:16">
-<!ENTITY pop-calibre "V:9, I:36">
-<!ENTITY pop-calligraplan "V:0, I:2">
-<!ENTITY pop-calligrasheets "V:0, I:6">
-<!ENTITY pop-calligrastage "V:0, I:5">
-<!ENTITY pop-calligrawords "V:0, I:7">
-<!ENTITY pop-catdoc "V:27, I:127">
-<!ENTITY pop-cdebootstrap "V:0, I:3">
-<!ENTITY pop-changetrack "V:0, I:0">
-<!ENTITY pop-chkrootkit "V:5, I:24">
-<!ENTITY pop-chromium "V:51, I:141">
-<!ENTITY pop-cifsutils "V:32, I:123">
-<!ENTITY pop-clamav "V:13, I:58">
-<!ENTITY pop-consolesetup "V:137, I:959">
-<!ENTITY pop-coreutils "V:891, I:999">
-<!ENTITY pop-courierimap "V:3, I:4">
-<!ENTITY pop-couriermta "V:0, I:0">
-<!ENTITY pop-courierpop "V:2, I:2">
-<!ENTITY pop-cpio "V:412, I:998">
-<!ENTITY pop-cpp "V:319, I:770">
-<!ENTITY pop-crack "V:0, I:1">
-<!ENTITY pop-crmbbe "V:0, I:0">
-<!ENTITY pop-cron "V:805, I:997">
-<!ENTITY pop-cryptmount "V:4, I:5">
-<!ENTITY pop-cryptsetup "V:29, I:78">
-<!ENTITY pop-csh "V:2, I:8">
-<!ENTITY pop-cssc "V:0, I:2">
-<!ENTITY pop-cups "V:140, I:395">
-<!ENTITY pop-cupsbsd "V:36, I:385">
-<!ENTITY pop-cupsclient "V:56, I:454">
-<!ENTITY pop-curl "V:151, I:548">
-<!ENTITY pop-cvs "V:5, I:41">
-<!ENTITY pop-cxref "V:0, I:0">
-<!ENTITY pop-cyrusimapd "V:1, I:1">
-<!ENTITY pop-cyruspopdd "V:0, I:0">
-<!ENTITY pop-cyrussaslcdoc "I:1">
-<!ENTITY pop-darcs "V:0, I:7">
-<!ENTITY pop-dash "V:907, I:992">
-<!ENTITY pop-dblatex "V:3, I:16">
-<!ENTITY pop-dbtoepub "V:0, I:0">
-<!ENTITY pop-dcfldd "V:0, I:5">
-<!ENTITY pop-dcraw "V:2, I:19">
-<!ENTITY pop-ddd "V:0, I:10">
-<!ENTITY pop-debianfaq "I:849">
-<!ENTITY pop-debianhistory "I:1">
-<!ENTITY pop-debianpolicy "I:36">
-<!ENTITY pop-debianutils "V:925, I:999">
-<!ENTITY pop-debootstrap "V:6, I:63">
-<!ENTITY pop-debsums "V:5, I:42">
-<!ENTITY pop-developersreference "I:6">
-<!ENTITY pop-devscripts "V:9, I:57">
-<!ENTITY pop-dia "V:5, I:31">
-<!ENTITY pop-dialog "V:15, I:123">
-<!ENTITY pop-diffstat "V:16, I:154">
-<!ENTITY pop-diffutils "V:871, I:991">
-<!ENTITY pop-digikam "V:2, I:13">
-<!ENTITY pop-dillo "V:1, I:7">
-<!ENTITY pop-dirdiff "V:0, I:2">
-<!ENTITY pop-discover "V:41, I:947">
-<!ENTITY pop-dkms "V:70, I:219">
-<!ENTITY pop-dlint "V:0, I:7">
-<!ENTITY pop-dnstracer "V:0, I:2">
-<!ENTITY pop-dnsutils "V:64, I:517">
-<!ENTITY pop-docdebian "I:854">
-<!ENTITY pop-docbookdsssl "V:1, I:23">
-<!ENTITY pop-docbooktoman "V:0, I:13">
-<!ENTITY pop-docbookutils "V:0, I:16">
-<!ENTITY pop-docbookxml "V:15, I:280">
-<!ENTITY pop-docbookxsl "V:13, I:165">
-<!ENTITY pop-docdiff "V:0, I:0">
-<!ENTITY pop-doclifter "V:0, I:0">
-<!ENTITY pop-dosbox "V:2, I:18">
-<!ENTITY pop-dosemu "V:0, I:2">
-<!ENTITY pop-dosfstools "V:128, I:524">
-<!ENTITY pop-dpatch "V:0, I:11">
-<!ENTITY pop-dpkg "V:925, I:999">
-<!ENTITY pop-dselect "V:3, I:32">
-<!ENTITY pop-dump "V:1, I:6">
-<!ENTITY pop-duplicity "V:7, I:15">
-<!ENTITY pop-dvbackup "V:0, I:0">
-<!ENTITY pop-dvdisaster "V:0, I:2">
-<!ENTITY pop-ecfsprogs "V:576, I:999">
-<!ENTITY pop-ecps "V:0, I:0">
-<!ENTITY pop-ebtables "V:15, I:39">
-<!ENTITY pop-ecryptfsutils "V:3, I:5">
-<!ENTITY pop-electricfence "V:0, I:5">
-<!ENTITY pop-elinks "V:6, I:28">
-<!ENTITY pop-emacsnox "V:4, I:17">
-<!ENTITY pop-enscript "V:1, I:20">
-<!ENTITY pop-eog "V:71, I:264">
-<!ENTITY pop-epiphanybrowser "V:4, I:24">
-<!ENTITY pop-esmtp "V:0, I:0">
-<!ENTITY pop-esmtprun "V:0, I:0">
-<!ENTITY pop-etckeeper "V:27, I:32">
-<!ENTITY pop-ethstats "V:0, I:0">
-<!ENTITY pop-ethstatus "V:0, I:5">
-<!ENTITY pop-ethtool "V:102, I:261">
-<!ENTITY pop-evince "V:116, I:329">
-<!ENTITY pop-evolution "V:31, I:229">
-<!ENTITY pop-exif "V:1, I:12">
-<!ENTITY pop-exifprobe "V:0, I:4">
-<!ENTITY pop-exiftags "V:0, I:5">
-<!ENTITY pop-exiftran "V:1, I:21">
-<!ENTITY pop-eximebase "V:349, I:377">
-<!ENTITY pop-eximedaemonheavy "V:7, I:8">
-<!ENTITY pop-eximedaemonlight "V:342, I:367">
-<!ENTITY pop-eximedochtml "I:1">
-<!ENTITY pop-eximedocinfo "I:1">
-<!ENTITY pop-exivc "V:3, I:44">
-<!ENTITY pop-extdgrep "V:0, I:3">
-<!ENTITY pop-extemagic "V:0, I:4">
-<!ENTITY pop-extundelete "V:1, I:11">
-<!ENTITY pop-exuberantctags "V:5, I:37">
-<!ENTITY pop-fcc "V:0, I:6">
-<!ENTITY pop-failcban "V:112, I:123">
-<!ENTITY pop-fakeroot "V:35, I:521">
-<!ENTITY pop-fastjar "V:2, I:29">
-<!ENTITY pop-fbreader "V:2, I:15">
-<!ENTITY pop-fetchmail "V:5, I:17">
-<!ENTITY pop-figcsxd "V:0, I:0">
-<!ENTITY pop-findimagedupes "V:0, I:1">
-<!ENTITY pop-firefox "V:13, I:20">
-<!ENTITY pop-firefoxesr "V:217, I:437">
-<!ENTITY pop-flawfinder "V:0, I:0">
-<!ENTITY pop-flex "V:9, I:93">
-<!ENTITY pop-flexbackup "V:0, I:0">
-<!ENTITY pop-fluxbox "V:2, I:9">
-<!ENTITY pop-fontconfig "V:354, I:776">
-<!ENTITY pop-fontconfigconfig "V:367, I:871">
-<!ENTITY pop-fontforge "V:0, I:8">
-<!ENTITY pop-fontsdejavu "I:478">
-<!ENTITY pop-fontsdejavucore "V:220, I:809">
-<!ENTITY pop-fontsdejavuextra "I:516">
-<!ENTITY pop-fontsfreefontttf "V:50, I:276">
-<!ENTITY pop-fontsliberation "I:469">
-<!ENTITY pop-fop "V:1, I:24">
-<!ENTITY pop-foremost "V:0, I:7">
-<!ENTITY pop-fpc "I:3">
-<!ENTITY pop-freepwing "V:0, I:0">
-<!ENTITY pop-ftp "V:18, I:282">
-<!ENTITY pop-fwlogwatch "V:0, I:0">
-<!ENTITY pop-gawk "V:368, I:454">
-<!ENTITY pop-gcc "V:165, I:604">
-<!ENTITY pop-gdb "V:13, I:114">
-<!ENTITY pop-gdisk "V:278, I:513">
-<!ENTITY pop-gdmd "V:165, I:229">
-<!ENTITY pop-geeqie "V:6, I:21">
-<!ENTITY pop-getmail "V:1, I:6">
-<!ENTITY pop-gettext "V:48, I:312">
-<!ENTITY pop-gfortran "V:11, I:98">
-<!ENTITY pop-ghostscript "V:252, I:598">
-<!ENTITY pop-ghostscriptx "V:15, I:65">
-<!ENTITY pop-gimp "V:68, I:341">
-<!ENTITY pop-git "V:305, I:478">
-<!ENTITY pop-gitbuildpackage "V:2, I:12">
-<!ENTITY pop-gitcvs "V:0, I:10">
-<!ENTITY pop-gitdoc "I:15">
-<!ENTITY pop-gitemail "V:0, I:11">
-<!ENTITY pop-gitgui "V:2, I:24">
-<!ENTITY pop-gitsvn "V:1, I:22">
-<!ENTITY pop-gitk "V:6, I:42">
-<!ENTITY pop-gitmagic "I:1">
-<!ENTITY pop-glabels "V:0, I:4">
-<!ENTITY pop-glade "V:0, I:8">
-<!ENTITY pop-glibcdoc "I:11">
-<!ENTITY pop-glibcdocreference "I:5">
-<!ENTITY pop-gnomenettool "V:2, I:45">
-<!ENTITY pop-gnucash "V:3, I:12">
-<!ENTITY pop-gnuhtmlclatex "V:0, I:1">
-<!ENTITY pop-gnumeric "V:6, I:21">
-<!ENTITY pop-gnupg "V:531, I:950">
-<!ENTITY pop-gocr "V:1, I:13">
-<!ENTITY pop-gparted "V:19, I:132">
-<!ENTITY pop-gpgv "V:880, I:999">
-<!ENTITY pop-gphotoc "V:1, I:12">
-<!ENTITY pop-gpm "V:11, I:17">
-<!ENTITY pop-graphicsmagick "V:3, I:17">
-<!ENTITY pop-grc "V:0, I:3">
-<!ENTITY pop-groff "V:3, I:64">
-<!ENTITY pop-grublegacy "V:0, I:2">
-<!ENTITY pop-grubpc "V:28, I:774">
-<!ENTITY pop-grubrescuepc "V:0, I:1">
-<!ENTITY pop-gsfonts "I:599">
-<!ENTITY pop-gsfontsxbb "I:82">
-<!ENTITY pop-gthumb "V:5, I:22">
-<!ENTITY pop-gtkam "V:0, I:6">
-<!ENTITY pop-guessnet "V:0, I:0">
-<!ENTITY pop-guilt "V:0, I:0">
-<!ENTITY pop-guymager "V:0, I:1">
-<!ENTITY pop-gwenview "V:28, I:97">
-<!ENTITY pop-gzip "V:883, I:999">
-<!ENTITY pop-gzrt "V:0, I:0">
-<!ENTITY pop-hdparm "V:408, I:718">
-<!ENTITY pop-helpcman "V:0, I:10">
-<!ENTITY pop-hexedit "V:1, I:12">
-<!ENTITY pop-hfsprogs "V:0, I:8">
-<!ENTITY pop-hfsutils "V:0, I:7">
-<!ENTITY pop-highlight "V:1, I:12">
-<!ENTITY pop-homebank "V:0, I:3">
-<!ENTITY pop-htmlcps "V:0, I:3">
-<!ENTITY pop-htmlctext "V:3, I:33">
-<!ENTITY pop-ibus "V:70, I:87">
-<!ENTITY pop-ibusanthy "V:0, I:1">
-<!ENTITY pop-ibuschewing "V:0, I:0">
-<!ENTITY pop-ibushangul "V:0, I:1">
-<!ENTITY pop-ibuskkc "V:0, I:0">
-<!ENTITY pop-ibusmbhn "V:0, I:1">
-<!ENTITY pop-ibusmozc "V:1, I:2">
-<!ENTITY pop-ibuspinyin "V:0, I:1">
-<!ENTITY pop-ibusskk "V:0, I:0">
-<!ENTITY pop-ibustable "V:0, I:1">
-<!ENTITY pop-ibustablethai "I:0">
-<!ENTITY pop-ibusunikey "V:0, I:0">
-<!ENTITY pop-icmpinfo "V:0, I:0">
-<!ENTITY pop-icoutils "V:21, I:127">
-<!ENTITY pop-ifmetric "V:0, I:1">
-<!ENTITY pop-ifplugd "V:3, I:18">
-<!ENTITY pop-ifrename "V:0, I:3">
-<!ENTITY pop-ifscheme "V:0, I:0">
-<!ENTITY pop-ifstat "V:0, I:8">
-<!ENTITY pop-iftop "V:7, I:115">
-<!ENTITY pop-ifupdown "V:587, I:991">
-<!ENTITY pop-ifupdownextra "V:0, I:1">
-<!ENTITY pop-imageindex "V:0, I:2">
-<!ENTITY pop-imagemagick "I:400">
-<!ENTITY pop-imediff "V:0, I:0">
-<!ENTITY pop-impose "V:0, I:0">
-<!ENTITY pop-inetutilsping "V:0, I:1">
-<!ENTITY pop-infocman "V:0, I:0">
-<!ENTITY pop-infocwww "V:1, I:3">
-<!ENTITY pop-initsystemhelpers "V:675, I:930">
-<!ENTITY pop-initramfstools "V:371, I:989">
-<!ENTITY pop-initscripts "V:91, I:323">
-<!ENTITY pop-inkscape "V:55, I:209">
-<!ENTITY pop-insserv "V:210, I:330">
-<!ENTITY pop-integrit "V:0, I:0">
-<!ENTITY pop-intelcgas "V:0, I:0">
-<!ENTITY pop-iperf "V:4, I:55">
-<!ENTITY pop-ipfm "V:0, I:0">
-<!ENTITY pop-iproutec "V:672, I:926">
-<!ENTITY pop-iptables "V:300, I:993">
-<!ENTITY pop-iptstate "V:0, I:3">
-<!ENTITY pop-iputilsarping "V:8, I:127">
-<!ENTITY pop-iputilsping "V:234, I:997">
-<!ENTITY pop-iputilstracepath "V:4, I:60">
-<!ENTITY pop-isag "V:0, I:3">
-<!ENTITY pop-iscdhcpclient "V:231, I:979">
-<!ENTITY pop-iscdhcpserver "V:18, I:54">
-<!ENTITY pop-jackd "V:4, I:27">
-<!ENTITY pop-jfsutils "V:1, I:12">
-<!ENTITY pop-jhead "V:1, I:11">
-<!ENTITY pop-john "V:2, I:12">
-<!ENTITY pop-kamera "I:97">
-<!ENTITY pop-karbon "V:0, I:7">
-<!ENTITY pop-kexectools "V:1, I:8">
-<!ENTITY pop-kexi "V:0, I:2">
-<!ENTITY pop-kmail "V:34, I:88">
-<!ENTITY pop-kmymoney "V:0, I:2">
-<!ENTITY pop-knockd "V:0, I:3">
-<!ENTITY pop-konqueror "V:18, I:100">
-<!ENTITY pop-kontact "V:1, I:16">
-<!ENTITY pop-konwert "V:1, I:54">
-<!ENTITY pop-kpartx "V:16, I:29">
-<!ENTITY pop-ksh "V:3, I:16">
-<!ENTITY pop-latexcrtf "V:0, I:6">
-<!ENTITY pop-ldaputils "V:14, I:75">
-<!ENTITY pop-ldm "V:0, I:0">
-<!ENTITY pop-leaktracer "V:0, I:3">
-<!ENTITY pop-lftp "V:6, I:39">
-<!ENTITY pop-libaudioc "V:60, I:488">
-<!ENTITY pop-libcg "V:935, I:999">
-<!ENTITY pop-libcgdev "V:249, I:620">
-<!ENTITY pop-libdmallocf "V:0, I:3">
-<!ENTITY pop-libfreetypeg "V:426, I:994">
-<!ENTITY pop-libgstreamerbaa "V:372, I:574">
-<!ENTITY pop-libjacka "V:1, I:13">
-<!ENTITY pop-libncursesfdev "I:116">
-<!ENTITY pop-libnssldap "I:11">
-<!ENTITY pop-libnssldapd "I:14">
-<!ENTITY pop-libnssmdns "I:526">
-<!ENTITY pop-libpamcracklib "I:16">
-<!ENTITY pop-libpamdoc "I:1">
-<!ENTITY pop-libpamldap "I:12">
-<!ENTITY pop-libpammodules "V:807, I:999">
-<!ENTITY pop-libpamshield "V:0, I:0">
-<!ENTITY pop-libpamsystemd "V:474, I:853">
-<!ENTITY pop-libphonone "I:121">
-<!ENTITY pop-libpopplerglibi "V:217, I:481">
-<!ENTITY pop-libpopplerjf "I:3">
-<!ENTITY pop-libpulsea "V:289, I:604">
-<!ENTITY pop-librecad "V:4, I:18">
-<!ENTITY pop-libreofficebase "V:145, I:325">
-<!ENTITY pop-libreofficecalc "V:188, I:436">
-<!ENTITY pop-libreofficedraw "V:177, I:434">
-<!ENTITY pop-libreofficeimpress "V:176, I:433">
-<!ENTITY pop-libreofficemath "V:174, I:437">
-<!ENTITY pop-libreofficewriter "V:188, I:441">
-<!ENTITY pop-libvirtclients "V:43, I:62">
-<!ENTITY pop-libwmfbin "V:10, I:211">
-<!ENTITY pop-libxftc "V:143, I:662">
-<!ENTITY pop-libxmlcutils "V:22, I:246">
-<!ENTITY pop-lilo "V:0, I:2">
-<!ENTITY pop-linklint "V:0, I:0">
-<!ENTITY pop-links "V:6, I:39">
-<!ENTITY pop-linksc "V:1, I:15">
-<!ENTITY pop-lmodern "V:13, I:113">
-<!ENTITY pop-loadlin "V:0, I:1">
-<!ENTITY pop-logcheck "V:8, I:10">
-<!ENTITY pop-logwatch "V:16, I:18">
-<!ENTITY pop-lpr "V:3, I:4">
-<!ENTITY pop-lprng "V:1, I:1">
-<!ENTITY pop-lsbbase "V:881, I:999">
-<!ENTITY pop-lshw "V:12, I:94">
-<!ENTITY pop-lsof "V:391, I:946">
-<!ENTITY pop-ltrace "V:1, I:21">
-<!ENTITY pop-lxc "V:10, I:15">
-<!ENTITY pop-lynx "V:13, I:98">
-<!ENTITY pop-lzma "V:2, I:29">
-<!ENTITY pop-lzop "V:9, I:76">
-<!ENTITY pop-macutils "V:0, I:1">
-<!ENTITY pop-magicrescue "V:0, I:3">
-<!ENTITY pop-mailagent "V:0, I:5">
-<!ENTITY pop-maildrop "V:0, I:2">
-<!ENTITY pop-mailfilter "V:0, I:0">
-<!ENTITY pop-maintguide "I:4">
-<!ENTITY pop-make "V:157, I:609">
-<!ENTITY pop-makepatch "V:0, I:0">
-<!ENTITY pop-manchtml "V:0, I:2">
-<!ENTITY pop-markdown "V:0, I:8">
-<!ENTITY pop-masqmail "V:0, I:0">
-<!ENTITY pop-mawk "V:372, I:997">
-<!ENTITY pop-mbr "V:0, I:7">
-<!ENTITY pop-mc "V:59, I:236">
-<!ENTITY pop-meld "V:14, I:39">
-<!ENTITY pop-memtestig "V:1, I:29">
-<!ENTITY pop-menu "V:54, I:197">
-<!ENTITY pop-menuxdg "V:31, I:109">
-<!ENTITY pop-mercurial "V:8, I:48">
-<!ENTITY pop-mew "V:0, I:0">
-<!ENTITY pop-mgetty "V:0, I:1">
-<!ENTITY pop-mingetty "V:0, I:3">
-<!ENTITY pop-mksh "V:4, I:12">
-<!ENTITY pop-mmdd "V:0, I:0">
-<!ENTITY pop-monotone "V:0, I:0">
-<!ENTITY pop-moreutils "V:11, I:35">
-<!ENTITY pop-mpack "V:1, I:18">
-<!ENTITY pop-mpop "V:0, I:0">
-<!ENTITY pop-msmtp "V:5, I:10">
-<!ENTITY pop-msmtpmta "V:3, I:4">
-<!ENTITY pop-mtools "V:10, I:83">
-<!ENTITY pop-mtr "V:4, I:43">
-<!ENTITY pop-mtrtiny "V:6, I:54">
-<!ENTITY pop-mutt "V:37, I:313">
-<!ENTITY pop-myrescue "V:0, I:3">
-<!ENTITY pop-nas "V:0, I:0">
-<!ENTITY pop-ncftp "V:3, I:22">
-<!ENTITY pop-ncurseshexedit "V:0, I:2">
-<!ENTITY pop-nettools "V:234, I:634">
-<!ENTITY pop-netatalk "V:2, I:3">
-<!ENTITY pop-netcat "I:41">
-<!ENTITY pop-netpbm "V:32, I:409">
-<!ENTITY pop-networkmanager "V:358, I:440">
-<!ENTITY pop-networkmanagergnome "V:132, I:372">
-<!ENTITY pop-nfscommon "V:181, I:343">
-<!ENTITY pop-nfskernelserver "V:38, I:79">
-<!ENTITY pop-nkf "V:0, I:11">
-<!ENTITY pop-nmap "V:31, I:253">
-<!ENTITY pop-ntfsdg "V:186, I:512">
-<!ENTITY pop-ntopng "V:1, I:2">
-<!ENTITY pop-nullmailer "V:7, I:10">
-<!ENTITY pop-ocrad "V:0, I:5">
-<!ENTITY pop-odtctxt "V:1, I:7">
-<!ENTITY pop-okteta "V:1, I:15">
-<!ENTITY pop-okular "V:46, I:118">
-<!ENTITY pop-ooocdbk "V:0, I:0">
-<!ENTITY pop-openfontdesigntoolkit "I:0">
-<!ENTITY pop-openjade "V:2, I:38">
-<!ENTITY pop-opensshclient "V:803, I:996">
-<!ENTITY pop-opensshserver "V:690, I:834">
-<!ENTITY pop-openssl "V:794, I:993">
-<!ENTITY pop-osscompat "V:2, I:29">
-<!ENTITY pop-outguess "V:0, I:2">
-<!ENTITY pop-phzip "V:89, I:464">
-<!ENTITY pop-phzipfull "V:113, I:486">
-<!ENTITY pop-pandoc "V:8, I:47">
-<!ENTITY pop-paperkey "V:1, I:13">
-<!ENTITY pop-parc "V:4, I:15">
-<!ENTITY pop-parted "V:363, I:561">
-<!ENTITY pop-patch "V:99, I:725">
-<!ENTITY pop-patchutils "V:18, I:150">
-<!ENTITY pop-pax "V:13, I:26">
-<!ENTITY pop-pbuilder "V:2, I:16">
-<!ENTITY pop-pciutils "V:195, I:992">
-<!ENTITY pop-pcmciautils "V:13, I:21">
-<!ENTITY pop-pdfcsvg "V:0, I:4">
-<!ENTITY pop-pdftk "I:51">
-<!ENTITY pop-pdftoipe "V:0, I:0">
-<!ENTITY pop-pepperflashpluginnonfree "V:1, I:21">
-<!ENTITY pop-perl "V:610, I:992">
-<!ENTITY pop-pflogsumm "V:1, I:4">
-<!ENTITY pop-planner "V:0, I:5">
-<!ENTITY pop-popplerdata "V:111, I:637">
-<!ENTITY pop-popplerutils "V:241, I:434">
-<!ENTITY pop-posh "V:0, I:0">
-<!ENTITY pop-poster "V:0, I:5">
-<!ENTITY pop-postfix "V:145, I:160">
-<!ENTITY pop-postfixdoc "I:9">
-<!ENTITY pop-powertop "V:9, I:217">
-<!ENTITY pop-ppp "V:206, I:474">
-<!ENTITY pop-pppconfig "V:1, I:2">
-<!ENTITY pop-pppoeconf "V:0, I:8">
-<!ENTITY pop-printerdrivergutenprint "V:100, I:372">
-<!ENTITY pop-procinfo "V:0, I:13">
-<!ENTITY pop-procmail "V:40, I:277">
-<!ENTITY pop-procps "V:739, I:999">
-<!ENTITY pop-proftpdbasic "V:24, I:32">
-<!ENTITY pop-psceps "V:3, I:68">
-<!ENTITY pop-psmisc "V:427, I:845">
-<!ENTITY pop-pstoedit "V:4, I:98">
-<!ENTITY pop-pstotext "V:1, I:3">
-<!ENTITY pop-psutils "V:6, I:105">
-<!ENTITY pop-pulseaudio "V:350, I:471">
-<!ENTITY pop-pybootchartgui "V:0, I:0">
-<!ENTITY pop-pylint "V:2, I:13">
-<!ENTITY pop-python "V:293, I:923">
-<!ENTITY pop-pythondocutils "V:12, I:133">
-<!ENTITY pop-qemu "I:34">
-<!ENTITY pop-qemukvm "V:10, I:61">
-<!ENTITY pop-qemusystem "I:21">
-<!ENTITY pop-qemuuser "V:0, I:13">
-<!ENTITY pop-qemuutils "V:11, I:107">
-<!ENTITY pop-quilt "V:3, I:33">
-<!ENTITY pop-rc "V:0, I:2">
-<!ENTITY pop-rcs "V:3, I:19">
-<!ENTITY pop-rdiffbackup "V:7, I:15">
-<!ENTITY pop-recode "V:3, I:25">
-<!ENTITY pop-reisereprogs "V:0, I:4">
-<!ENTITY pop-reiserfsprogs "V:11, I:29">
-<!ENTITY pop-restcweb "V:0, I:0">
-<!ENTITY pop-restic "V:1, I:3">
-<!ENTITY pop-rsnapshot "V:5, I:11">
-<!ENTITY pop-rsync "V:281, I:560">
-<!ENTITY pop-ruby "V:137, I:318">
-<!ENTITY pop-samba "V:102, I:159">
-<!ENTITY pop-sarg "V:3, I:3">
-<!ENTITY pop-sash "V:0, I:6">
-<!ENTITY pop-saslcbin "V:5, I:19">
-<!ENTITY pop-sbuild "V:1, I:4">
-<!ENTITY pop-scalpel "V:0, I:4">
-<!ENTITY pop-schroot "V:7, I:10">
-<!ENTITY pop-screen "V:127, I:281">
-<!ENTITY pop-scribus "V:2, I:23">
-<!ENTITY pop-scrot "V:8, I:80">
-<!ENTITY pop-scroungentfs "V:0, I:3">
-<!ENTITY pop-scsitools "V:0, I:3">
-<!ENTITY pop-sddm "V:53, I:95">
-<!ENTITY pop-sdf "V:0, I:0">
-<!ENTITY pop-sendmailbin "V:14, I:15">
-<!ENTITY pop-setcd "V:0, I:1">
-<!ENTITY pop-setserial "V:5, I:9">
-<!ENTITY pop-sgmlcx "V:0, I:0">
-<!ENTITY pop-sharutils "V:4, I:55">
-<!ENTITY pop-shorewall "V:5, I:13">
-<!ENTITY pop-shorewallinit "V:0, I:0">
-<!ENTITY pop-shorewalllite "V:0, I:0">
-<!ENTITY pop-shorewallg "V:1, I:2">
-<!ENTITY pop-shorewallglite "V:0, I:0">
-<!ENTITY pop-shotwell "V:19, I:223">
-<!ENTITY pop-sisu "V:0, I:0">
-<!ENTITY pop-slbackup "V:0, I:0">
-<!ENTITY pop-sleepd "V:0, I:0">
-<!ENTITY pop-sleuthkit "V:2, I:24">
-<!ENTITY pop-smartmontools "V:134, I:197">
-<!ENTITY pop-smbclient "V:16, I:174">
-<!ENTITY pop-snort "V:0, I:1">
-<!ENTITY pop-sourcehighlight "V:0, I:7">
-<!ENTITY pop-splint "V:0, I:4">
-<!ENTITY pop-squid "V:13, I:15">
-<!ENTITY pop-squidd "V:4, I:10">
-<!ENTITY pop-squidview "V:0, I:1">
-<!ENTITY pop-srcctex "V:0, I:0">
-<!ENTITY pop-ssft "V:0, I:0">
-<!ENTITY pop-sshaskpass "V:3, I:34">
-<!ENTITY pop-sshaskpassfullscreen "V:0, I:0">
-<!ENTITY pop-ssmtp "V:8, I:11">
-<!ENTITY pop-stgit "V:0, I:0">
-<!ENTITY pop-strace "V:16, I:153">
-<!ENTITY pop-stunnele "V:5, I:17">
-<!ENTITY pop-stxcany "V:0, I:0">
-<!ENTITY pop-subversion "V:20, I:109">
-<!ENTITY pop-sudo "V:563, I:806">
-<!ENTITY pop-susvc "I:0">
-<!ENTITY pop-susvd "I:0">
-<!ENTITY pop-swatch "V:0, I:0">
-<!ENTITY pop-synaptic "V:47, I:320">
-<!ENTITY pop-syslinux "V:4, I:48">
-<!ENTITY pop-syslogsummary "V:0, I:2">
-<!ENTITY pop-sysstat "V:161, I:183">
-<!ENTITY pop-systemd "V:810, I:916">
-<!ENTITY pop-systemdbootchart "V:0, I:1">
-<!ENTITY pop-systemdcron "V:1, I:1">
-<!ENTITY pop-systemdsysv "V:802, I:914">
-<!ENTITY pop-sysvrc "V:183, I:335">
-<!ENTITY pop-sysvinitcore "V:7, I:9">
-<!ENTITY pop-sysvinitutils "V:494, I:999">
-<!ENTITY pop-tbcyrillic "I:19">
-<!ENTITY pop-tar "V:905, I:999">
-<!ENTITY pop-taskgnomedesktop "I:175">
-<!ENTITY pop-taskkdedesktop "I:66">
-<!ENTITY pop-tasklxdedesktop "I:35">
-<!ENTITY pop-taskxfcedesktop "I:106">
-<!ENTITY pop-tasksel "V:36, I:975">
-<!ENTITY pop-tcl "V:31, I:414">
-<!ENTITY pop-tcpdump "V:19, I:204">
-<!ENTITY pop-tcptrace "V:0, I:3">
-<!ENTITY pop-tcs "V:0, I:0">
-<!ENTITY pop-tcsh "V:9, I:29">
-<!ENTITY pop-telnet "V:65, I:904">
-<!ENTITY pop-telnetssl "V:0, I:3">
-<!ENTITY pop-telnetd "V:1, I:3">
-<!ENTITY pop-telnetdssl "V:0, I:0">
-<!ENTITY pop-tesseractocr "V:8, I:37">
-<!ENTITY pop-tesseractocreng "V:7, I:37">
-<!ENTITY pop-testdisk "V:3, I:38">
-<!ENTITY pop-texichtml "V:0, I:8">
-<!ENTITY pop-texlive "V:3, I:50">
-<!ENTITY pop-thunderbird "V:57, I:138">
-<!ENTITY pop-tidy "V:2, I:14">
-<!ENTITY pop-tiger "V:2, I:3">
-<!ENTITY pop-time "V:15, I:279">
-<!ENTITY pop-tk "V:30, I:406">
-<!ENTITY pop-tkcvs "V:0, I:1">
-<!ENTITY pop-tla "V:0, I:2">
-<!ENTITY pop-tmux "V:34, I:136">
-<!ENTITY pop-tnef "V:1, I:10">
-<!ENTITY pop-tofrodos "V:1, I:25">
-<!ENTITY pop-traceroute "V:63, I:936">
-<!ENTITY pop-tripwire "V:2, I:3">
-<!ENTITY pop-trueprint "V:0, I:0">
-<!ENTITY pop-tshark "V:3, I:34">
-<!ENTITY pop-ttfmscorefontsinstaller "V:1, I:64">
-<!ENTITY pop-ttfunifont "I:21">
-<!ENTITY pop-txtchtml "V:0, I:3">
-<!ENTITY pop-txtcman "V:0, I:1">
-<!ENTITY pop-txtctags "V:0, I:1">
-<!ENTITY pop-udo "V:0, I:0">
-<!ENTITY pop-unaccent "V:0, I:0">
-<!ENTITY pop-unattendedupgrades "V:324, I:447">
-<!ENTITY pop-unhtml "V:0, I:0">
-<!ENTITY pop-unison "V:4, I:17">
-<!ENTITY pop-unpaper "V:2, I:19">
-<!ENTITY pop-unrtf "V:0, I:4">
-<!ENTITY pop-unzip "V:154, I:798">
-<!ENTITY pop-usbutils "V:84, I:862">
-<!ENTITY pop-uswsusp "V:3, I:8">
-<!ENTITY pop-utillinux "V:891, I:999">
-<!ENTITY pop-uudeview "V:0, I:5">
-<!ENTITY pop-valgrind "V:6, I:46">
-<!ENTITY pop-vdmfec "V:0, I:0">
-<!ENTITY pop-vim "V:106, I:398">
-<!ENTITY pop-vimruntime "V:19, I:435">
-<!ENTITY pop-vimtiny "V:62, I:970">
-<!ENTITY pop-virtmanager "V:10, I:42">
-<!ENTITY pop-virtualbox "V:12, I:16">
-<!ENTITY pop-vzctl "V:0, I:1">
-<!ENTITY pop-vzquota "V:0, I:1">
-<!ENTITY pop-wdm "V:31, I:284">
-<!ENTITY pop-wdiff "V:9, I:72">
-<!ENTITY pop-wdm "V:0, I:0">
-<!ENTITY pop-weblintperl "V:0, I:1">
-<!ENTITY pop-wget "V:288, I:988">
-<!ENTITY pop-whiptail "V:87, I:995">
-<!ENTITY pop-whois "V:35, I:393">
-<!ENTITY pop-wicd "I:24">
-<!ENTITY pop-wicdcli "V:0, I:1">
-<!ENTITY pop-wicdcurses "V:0, I:3">
-<!ENTITY pop-wicddaemon "V:19, I:26">
-<!ENTITY pop-wicdgtk "V:15, I:25">
-<!ENTITY pop-wiggle "V:0, I:0">
-<!ENTITY pop-wine "V:19, I:82">
-<!ENTITY pop-wirelesstools "V:188, I:254">
-<!ENTITY pop-wireshark "I:55">
-<!ENTITY pop-wpcx "V:0, I:0">
-<!ENTITY pop-wpagui "V:0, I:2">
-<!ENTITY pop-wpasupplicant "V:332, I:507">
-<!ENTITY pop-wv "V:0, I:7">
-<!ENTITY pop-wvdial "V:0, I:5">
-<!ENTITY pop-xbbcommon "V:372, I:755">
-<!ENTITY pop-xbbutils "V:180, I:599">
-<!ENTITY pop-xbbxserverutils "V:282, I:534">
-<!ENTITY pop-xbaseclients "I:26">
-<!ENTITY pop-xclip "V:9, I:49">
-<!ENTITY pop-xdgutils "V:229, I:521">
-<!ENTITY pop-xdm "V:3, I:6">
-<!ENTITY pop-xentools "V:0, I:4">
-<!ENTITY pop-xfig "V:2, I:15">
-<!ENTITY pop-xfontsutils "V:66, I:542">
-<!ENTITY pop-xfsdump "V:0, I:9">
-<!ENTITY pop-xfsprogs "V:21, I:98">
-<!ENTITY pop-xgridfit "V:0, I:0">
-<!ENTITY pop-xmlto "V:1, I:23">
-<!ENTITY pop-xorg "I:457">
-<!ENTITY pop-xorgdocs "I:6">
-<!ENTITY pop-xsane "V:17, I:173">
-<!ENTITY pop-xsel "V:10, I:44">
-<!ENTITY pop-xserverxorg "V:66, I:492">
-<!ENTITY pop-xsltproc "V:15, I:104">
-<!ENTITY pop-xtrace "V:0, I:0">
-<!ENTITY pop-xutilsdev "V:1, I:12">
-<!ENTITY pop-xzutils "V:454, I:977">
-<!ENTITY pop-yodl "V:0, I:0">
-<!ENTITY pop-zenity "V:87, I:409">
-<!ENTITY pop-zenmap "V:2, I:9">
-<!ENTITY pop-zerofree "V:3, I:94">
-<!ENTITY pop-zip "V:51, I:432">
-<!ENTITY pop-zsh "V:37, I:73">
--- a/xslt/table.xsl
+++ b/xslt/table.xsl
@ -12,7 +12,8 @@ Process raw XML file:
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

-<xsl:variable name="uletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 !#$%()=-~^|\/+*,.?;:@`&quot;&apos;@-&amp;-@&gt;&lt;’</xsl:variable>
+<!-- &#233; is for é -->
+<xsl:variable name="uletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789&#233; !#$%()=-~^|\/+*,.?;:@`&quot;&apos;&amp;&gt;&lt;’</xsl:variable>
 <xsl:variable name="lletters">abcdefghijklmnopqrstuvwxyzabcdefghij</xsl:variable>
 <!-- I will use max 32 characters for href references and id references -->

--- a/xslt/tablet.xsl
+++ b/xslt/tablet.xsl
@ -12,7 +12,8 @@ Process raw XML file:
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

-<xsl:variable name="uletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 !#$%()=-~^|\/+*,.?;:@`&quot;&apos;@-&amp;-@&gt;&lt;’</xsl:variable>
+<!-- &#233; is for é -->
+<xsl:variable name="uletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789&#233; !#$%()=-~^|\/+*,.?;:@`&quot;&apos;&amp;&gt;&lt;’</xsl:variable>
 <xsl:variable name="lletters">abcdefghijklmnopqrstuvwxyzabcdefghij</xsl:variable>
 <!-- I will use max 32 characters for href references and id references -->

@ -183,6 +184,13 @@ Process raw XML file:
  </xsl:copy>
 </xsl:template>

+<!-- don't translate screen -->
+<xsl:template match="screen">
+  <xsl:copy>
+    <xsl:text>DUMMY</xsl:text>
+  </xsl:copy>
+</xsl:template>
+
 <xsl:template match="@*|node()">
  <xsl:copy>
    <xsl:apply-templates select="@*|node()"/>
--- a/xslt/urls.xsl
+++ b/xslt/urls.xsl
@ -7,7 +7,8 @@ Extract URL and link location name for &url-***; for use in urls.ent
 <xsl:output method="text" indent="no"/>

 <xsl:strip-space elements="*"/>
-<xsl:variable name="uletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 !#$%()=-~^|\/+*,.?;:@`&quot;&apos;&amp;&gt;&lt;’</xsl:variable>
+<!-- &#233; is for é -->
+<xsl:variable name="uletters">ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789&#233; !#$%()=-~^|\/+*,.?;:@`&quot;&apos;&amp;&gt;&lt;’</xsl:variable>
 <xsl:variable name="lletters">abcdefghijklmnopqrstuvwxyzabcdefghij</xsl:variable>

 <!-- I will use max 32 characters for href references -->
				`@ -1 +0,0 @@`
				`<!ENTITY pop-date "2021-01-10 06:32:17 UTC">`