release 2.73

Signed-off-by: Osamu Aoki <osamu@debian.org>
2026-01-16 23:14:19 +00:00 · 2018-07-01 13:37:51 +09:00 · 2018-07-01 13:37:51 +09:00 · c7233bc14a
commit c7233bc14a
parent fee5b0a924
31 changed files with 962 additions and 932 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,6 +11,12 @@ debian-reference.*.xml
 debian-reference.*.xmlt
 header.txt
 packages.bkup.txt
+packages.contrib
+packages.main
+packages.non-free
 packages.txt
 pkg.lst
 tmp
+fuzzy.log
+po/templates.pot
+
--- a/389
+++ b/389
@ -20,7 +20,10 @@ LANGALL	=	en $(LANGPO)
 # Update release name when setting back RELEASE_STATE
 # from stable -> testing just after stable release

+# This is normal
 RELEASE_STATE := testing
+
+# this is just before freeze
 #RELEASE_STATE := stable

 # TMP_DIR_DR is not mean to be set to generic TMPDIR like /tmp ~/.tmp
@ -59,9 +62,10 @@ MSGATTR	:=	msgattrib
 MSGCAT	:=	msgcat
 DBLATEX	:=	dblatex

-# Debian packge archive URL
+# Debian package archive URL
 #DEBM	:=	http://ftp.us.debian.org/debian/dists
-DEBM	:=	http://ftp.jp.debian.org/debian/dists
+#DEBM	:=	http://ftp.jp.debian.org/debian/dists
+DEBM	:=	http://deb.debian.org/debian/dists
 # Debian popcon data source URL
 UPOPC	:=	http://popcon.debian.org/all-popcon-results.txt.gz
 # Debian release name and arch used
@ -71,8 +75,6 @@ UDEBA	:=	$(DEBM)/$(CODE)
 UDEBB	:=	$(DEBM)/experimental
 DR_VERSION :=	$(shell dpkg-parsechangelog --show-field Version)

-# cached data removed for package related to remotely fetched data
-RCACHE	:=      all-popcon-results.txt all-popcon-submissions.txt all-popcon-pkgs.txt packages.txt packages.bkup.txt pkg.lst
 # AsciiDoc source file names in $(DASC) directories for local update
 ASC_NM	:=	00_preface.txt 01_tutorial.txt 02_package.txt \
 		03_sysinit.txt 04_auth.txt 05_network.txt 06_netapp.txt \
@ -81,13 +83,6 @@ ASC_NM	:=	00_preface.txt 01_tutorial.txt 02_package.txt \
 		copyright.txt header1.txt header2.txt $(MANUAL).txt
 # source asciidoc files (local asciidoc conversion script used for stability)
 SRC_ASC :=	$(addprefix $(DASC)/, $(ASC_NM))
-# source XML inclusion files (excluding common.ent)
-ENT_STAT:=	datadatepop.ent datadatesize.ent popcon.ent pkgsize.ent
-ENT_ALL	:=	$(ENT_STAT) common.ent
-# source PO files for all languages (build prcess requires these)
-SRC_PO	:=	$(addsuffix .po, $(addprefix  $(DPO)/, $(LANGPO)))
-# source XML files for all languages (build prcess requires these)
-SRC_XML	:=	$(addsuffix .xml, $(addprefix  $(MANUAL)., $(LANGALL)))

 #######################################################################
 # Used as $(call check-command, <command>, <package>)
@ -97,7 +92,6 @@ set -e; if ! which $(1) >/dev/null; then \
  false; \
 fi
 endef
-
 #######################################################################
 # $ make all       # build all
 #######################################################################
@ -113,52 +107,80 @@ all: css html txt epub pdf
 test: html css

 #######################################################################
-# $ make publish   # build html text from RAWXML/PO for DDP
+# Phase 1 build : fetch remote data
 #######################################################################
-.PHONY: package
-# $(PUBLISHDIR) is set to be: /org/www.debian.org/www/doc/manuals for master-www
-publish:
-	-mkdir -p $(PUBLISHDIR)/$(MANUAL)
-	$(MAKE) css html txt "TMP_DIR_DR=$(PUBLISHDIR)/$(MANUAL)"
+# cached data removed for package related to remotely fetched data
+REMOTE_DATA :=	packages.main packages.contrib packages.non-free \
+		packages.txt packages.bkup.txt all-popcon-results.txt \
+		all-popcon-submissions.txt all-popcon-pkgs.txt pkg.lst
+.PHONY: remote
+remote: $(REMOTE_DATA)
+
+packages.main:
+	# FETCH PACKAGE (sid main)
+	@$(call check-command, wget, wget)
+	@$(call check-command, grep-dctrl, dctrl-tools)
+	wget -O - $(UDEBA)/main/binary-$(ARCH)/Packages.xz      | xzcat - > packages.main.tmp
+	grep-dctrl -e -sPackage,Installed-Size -P "." packages.main.tmp > packages.main
+	rm packages.main.tmp
+
+packages.contrib:
+	# FETCH PACKAGE (sid contrib)
+	@$(call check-command, wget, wget)
+	@$(call check-command, grep-dctrl, dctrl-tools)
+	wget -O - $(UDEBA)/contrib/binary-$(ARCH)/Packages.xz   | xzcat - > packages.contrib.tmp
+	grep-dctrl -e -sPackage,Installed-Size -P "." packages.contrib.tmp > packages.contrib
+	rm packages.contrib.tmp
+
+packages.non-free:
+	# FETCH PACKAGE (sid non-free)
+	@$(call check-command, wget, wget)
+	@$(call check-command, grep-dctrl, dctrl-tools)
+	wget -O - $(UDEBA)/non-free/binary-$(ARCH)/Packages.xz  | xzcat - > packages.non-free.tmp
+	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:
+	# 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
+
+all-popcon-results.txt:
+	# POPCON RESULTS
+	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
+
+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

 #######################################################################
-# $ make clean     # clean files ready for tar 
+# Phase 2 build : package glob replacement script
 #######################################################################
-.PHONY: clean
-clean:
-	-rm -f *.swp *~ *.tmp
-	-rm -f $(DPO)/*~ $(DPO)/*.mo $(DPO)/*.po.*
-	-rm -f $(DASC)/*~
-	-rm -rf tmp debian/tmp $(PUBLISHDIR)/$(MANUAL)
-	-rm -f $(addsuffix .xml, $(addprefix $(MANUAL)., $(LANGALL)))
-	-rm -f $(MANUAL).en.xml $(MANUAL).en.xmlt header.txt
-	-rm -f $(RCACHE)
+
+$(DBIN)/replace_package: packages.txt
+	# GENERATE $(DBIN)/replace_package (sed script)
+	echo "# This is autogenerated by Makefile.  Update this with \"make rawxml\"" \
+		 >  $(DBIN)/replace_package
+	$(DBIN)/genreplace emacs	>>  $(DBIN)/replace_package
+	$(DBIN)/genreplace libpoppler	>>  $(DBIN)/replace_package
+	$(DBIN)/genreplace libgstreamer	>>  $(DBIN)/replace_package
+	$(DBIN)/genreplace libphonon	>>  $(DBIN)/replace_package

 #######################################################################
-# $ make distclean # clean files to reset RAWXML/ENT/POT
+# Phase 3 build : ASCIIDOC -> RAW XML (with @emacs@ etc.)
 #######################################################################
-.PHONY: distclean
-distclean: clean
-	-rm -f $(MANUAL).raw.xml
-	-rm -f $(ENT_ALL)
-	-rm -f $(DPO)/*.pot
-	-rm -f fuzzy.log

-#######################################################################
-# $ make rawxml    # update RAWXML from ASCIIDOC
-#######################################################################
-.PHONY: rawxml
-rawxml: $(MANUAL).raw.xml
-
-# This needs to be run under testing/unstable manually
-$(MANUAL).raw.xml: $(SRC_ASC)
-	@$(call check-command, python, python)
-	@$(call check-command, xmllint, xmllint)
-	echo "# This is autogenerated by Makefile.  Update this with \"make rawxml\""  >  $(DBIN)/replace_package
-	echo "s/@emacs@/$(shell apt-cache search -n '^emacs[0-9]+$$'|cut -d' ' -f1|grep -v -e '-'|sort -n|tail -1)/"  >>  $(DBIN)/replace_package
-	echo "s/@libpoppler@/$(shell apt-cache search -n '^libpoppler[0-9]+$$'|cut -d' ' -f1|sort -n|tail -1)/"       >> $(DBIN)/replace_package
-	echo "s/@libgstreamer@/$(shell apt-cache search -n '^libgstreamer[-.0-9]+$$'|cut -d' ' -f1|sort -n|tail -1)/"       >> $(DBIN)/replace_package
-	echo "s/@libphonon@/$(shell apt-cache search -n '^libphonon[-.0-9]+$$'|cut -d' ' -f1|sort -n|tail -1)/"       >> $(DBIN)/replace_package
+$(MANUAL).raw.xml: $(SRC_ASC) $(DBIN)/replace_package
+	# BUILD RAWXML from ASCIIDOC
 	$(DBIN)/asciidoc -a 'newline=\n' -o - $(DASC)/$(MANUAL).txt |\
 	sed -e "/<\/author>/r $(DASC)/copyright.txt" |\
 	$(XLINT) -  |\
@ -166,19 +188,51 @@ $(MANUAL).raw.xml: $(SRC_ASC)
 	sed -f $(DBIN)/replace > $(MANUAL).raw.xml

 #######################################################################
-# $ make entity    # update ENT and local cache data from RAWXML/REMOTE
+# Phase 4 build : RAW XML (with @emacs@ etc.) -> pkg.lst 
 #######################################################################
-# This ensures not to run remote except by manually
-$(ENT_STAT):
-	@echo "******** You are missing ENTITY files *******"
-	@echo "	$(ENT_STAT)"
-	@echo "*********************************************"
-	@echo " run \"make entity\""
-	@echo "*********************************************"
-	@false
+
+pkg.lst: $(MANUAL).raw.xml
+	@$(call check-command, xsltproc, xsltproc)
+	# PACKAGE LIST of packages mentioned in the source XML
+	$(XPNO) $(DXSL)/pkg.xsl $(MANUAL).raw.xml > pkg.lst
+
+#######################################################################
+# Phase 5 build : ENTITY
+#######################################################################
+# source XML inclusion files (excluding common.ent)
+ENT_STAT:=	datadatepop.ent datadatesize.ent popcon.ent pkgsize.ent common.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


-common.ent: $(MANUAL).raw.xml
+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
+	# GENERATE pkgsize.ent
+	sort pkg.lst | uniq | $(DBIN)/sizeent packages.txt packages.bkup.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
@ -203,50 +257,62 @@ endif
 	echo "<!ENTITY codename-unstable \"sid\">"			>> common.ent
 	echo "<!ENTITY Codename-unstable \"Sid\">"                      >> common.ent

+#######################################################################
+# Phase pre-6 pre-build : when updating English asciidoc, run this and commit it
+#######################################################################
 .PHONY: entity
-entity: rawxml
-	@$(call check-command, wget, wget)
-	@$(call check-command, xsltproc, xsltproc)
-	@$(call check-command, grep-dctrl, dctrl-tools)
-	# PACKAGE (sid)
-	wget -O - $(UDEBA)/main/binary-$(ARCH)/Packages.xz      | xzcat - > packages.main.tmp
-	grep-dctrl -e -sPackage,Installed-Size -P "." packages.main.tmp > packages.main
-	rm packages.main.tmp
-	wget -O - $(UDEBA)/contrib/binary-$(ARCH)/Packages.xz   | xzcat - > packages.contrib.tmp
-	grep-dctrl -e -sPackage,Installed-Size -P "." packages.contrib.tmp > packages.contrib
-	rm packages.contrib.tmp
-	wget -O - $(UDEBA)/non-free/binary-$(ARCH)/Packages.xz  | xzcat - > packages.non-free.tmp
-	grep-dctrl -e -sPackage,Installed-Size -P "." packages.non-free.tmp > packages.non-free
-	rm packages.non-free.tmp
-	cat packages.main packages.contrib packages.non-free >packages.txt
-	#
-	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
-	rm packages.main packages.contrib packages.non-free
-	# PACKAGE (experimental)
-	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
-	# PACKAGE LIST of packages mentioned in the source XML
-	$(XPNO) $(DXSL)/pkg.xsl $(MANUAL).raw.xml > pkg.lst
-	# ENT for package size
-	sort pkg.lst | uniq | $(DBIN)/sizeent packages.txt packages.bkup.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
-	echo "<!ENTITY pop-date \"$(shell date -u +'%F %T %Z')\">" > 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
+entity: 
+	$(MAKE) distclean
+	$(MAKE) $(ENT_STAT)
+	$(MAKE) clean
+	# PLEASE MAKE SURE TO COMMIT TO VCS

 #######################################################################
-# $ make po        # update all PO from RAWXML
+# Phase 6 build : XML ENGLISH (with template XML) -- NORMAL BUILD
 #######################################################################
+
+# Update URL list header from $(MANUAL).raw.xml
+header.txt: $(DASC)/header1.txt $(DASC)/header2.txt
+	# SANITY CHECK
+	[ -f $(MANUAL).raw.xml ]
+	# GENERATE header.txt
+	cat $(DASC)/header1.txt >  header.txt
+	$(XPNO) $(DXSL)/urls.xsl $(MANUAL).raw.xml | sort | uniq |\
+	sed -e "s/&/\&amp;/g"   >> header.txt
+	cat $(DASC)/header2.txt >> header.txt
+
+# Replace table contents with @-@popcon*@-@ and @@@psize*@-@ and 
+# fix URL referencees and table ID.
+$(MANUAL).en.xml: header.txt
+	# SANITY CHECK
+	[ -f $(MANUAL).raw.xml ]
+	# GENERATE $(MANUAL).en.xml
+	@$(call check-command, xsltproc, xsltproc)
+	# use asciidoc generated xml file as main contents 
+	$(XPNO) $(DXSL)/table.xsl $(MANUAL).raw.xml |\
+	$(DBIN)/colspec.py  |\
+	sed -e '/<!DOCTYPE /d' -e "1r header.txt" |\
+	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.
+# This avoids bloated PO/POT files. (tablet.xsl used insted of table.xsl)
+$(MANUAL).en.xmlt: header.txt
+	# SANITY CHECK
+	[ -f $(MANUAL).raw.xml ]
+	# GENERATE $(MANUAL).en.xmlt (TEMPLATE to avoid bloated PO/POT files)
+	@$(call check-command, xsltproc, xsltproc)
+	# use asciidoc generated xml file as main contents 
+	$(XPNO) $(DXSL)/tablet.xsl $(MANUAL).raw.xml |\
+	$(DBIN)/colspec.py  |\
+	sed -e '/<!DOCTYPE /d' -e "1r header.txt" |\
+	sed -e 's/@-@amp@-@/\&/g' -e 's/@-@\([^@]\+\)@-@/\&\1;/g' > $@
+
+#######################################################################
+# Phase 7 build : POT/PO/XML non-ENGLISH (with template XML)
+#######################################################################
+# 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)
@ -277,67 +343,21 @@ $(DPO)/%.po: $(DPO)/templates.pot FORCE

 FORCE:

-#######################################################################
-# $ make wrap       # wrap all PO
-#######################################################################
-.PHONY: wrap nowrap wip
-wrap:
-	@$(call check-command, msgcat, gettext)
-	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
-	$(MSGCAT) -o $$XX $$XX ;\
-	done
-nowrap:
-	@$(call check-command, msgcat, gettext)
-	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
-	$(MSGCAT) -o $$XX --no-wrap $$XX ;\
-	done
-
-wip:
-	@$(call check-command, msgattrib, gettext)
-	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
-	$(MSGATTR) -o $$XX.fuzz --fuzzy        $$XX ;\
-	$(MSGATTR) -o $$XX.untr --untranslated $$XX ;\
-	done
-
-#######################################################################
-# $ make xml       # update all *.XML from RAWXML/ENT/PO/ADD
-#######################################################################
+# source XML files for all languages (build prcess requires these)
+SRC_XML	:=	$(addsuffix .xml, $(addprefix  $(MANUAL)., $(LANGALL)))
 .PHONY: xml
 xml: $(SRC_XML)

-# Update URL list header from $(MANUAL).raw.xml
-header.txt: $(DASC)/header1.txt $(MANUAL).raw.xml $(DASC)/header2.txt
-	cat $(DASC)/header1.txt >  header.txt
-	$(XPNO) $(DXSL)/urls.xsl $(MANUAL).raw.xml | sort | uniq |\
-	sed -e "s/&/\&amp;/g"   >> header.txt
-	cat $(DASC)/header2.txt >> header.txt
-
-# Replace table contents with @-@popcon*@-@ and @@@psize*@-@ and 
-# fix URL referencees and table ID.
-$(MANUAL).en.xml: $(MANUAL).raw.xml header.txt common.ent
-	@$(call check-command, xsltproc, xsltproc)
-	# use asciidoc generated xml file as main contents 
-	$(XPNO) $(DXSL)/table.xsl $(MANUAL).raw.xml |\
-	$(DBIN)/colspec.py  |\
-	sed -e '/<!DOCTYPE /d' -e "1r header.txt" |\
-	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.
-# This avoids bloated PO/POT files. (tablet.xsl used insted of table.xsl)
-$(MANUAL).en.xmlt: $(MANUAL).raw.xml header.txt
-	@$(call check-command, xsltproc, xsltproc)
-	# use asciidoc generated xml file as main contents 
-	$(XPNO) $(DXSL)/tablet.xsl $(MANUAL).raw.xml |\
-	$(DBIN)/colspec.py  |\
-	sed -e '/<!DOCTYPE /d' -e "1r header.txt" |\
-	sed -e 's/@-@amp@-@/\&/g' -e 's/@-@\([^@]\+\)@-@/\&\1;/g' > $@
-
 $(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
+#######################################################################
+
 #######################################################################
 # $ make css       # update CSS and DIMG in $(TMP_DIR_DR)
 #######################################################################
@ -357,7 +377,7 @@ css:
 .PHONY: html
 html:	$(foreach LX, $(LANGALL), $(TMP_DIR_DR)/index.$(LX).html)

-$(TMP_DIR_DR)/index.%.html: $(MANUAL).%.xml $(ENT_ALL)
+$(TMP_DIR_DR)/index.%.html: $(MANUAL).%.xml
 	@$(call check-command, xsltproc, xsltproc)
 	-mkdir -p $(TMP_DIR_DR)
 	$(XPINC)   --stringparam base.dir $(TMP_DIR_DR)/ \
@ -371,7 +391,7 @@ $(TMP_DIR_DR)/index.%.html: $(MANUAL).%.xml $(ENT_ALL)
 txt:	$(foreach LX, $(LANGALL), $(TMP_DIR_DR)/$(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 $(ENT_ALL)
+$(TMP_DIR_DR)/$(MANUAL).%.txt.gz: $(MANUAL).%.xml
 	@$(call check-command, w3m, w3m)
 	@$(call check-command, xsltproc, xsltproc)
 	-mkdir -p $(TMP_DIR_DR)
@ -380,7 +400,6 @@ $(TMP_DIR_DR)/$(MANUAL).%.txt.gz: $(MANUAL).%.xml $(ENT_ALL)
 	  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)
 #######################################################################
@ -399,7 +418,7 @@ $(foreach LX, $(NOPDF), $(TMP_DIR_DR)/$(MANUAL).$(LX).pdf): $(TMP_DIR_DR)/nopdf.
 	cp $(TMP_DIR_DR)/nopdf.pdf $@

 # dblatex.xsl provide work around for hidden URL links by appending them explicitly.
-$(TMP_DIR_DR)/$(MANUAL).%.pdf: $(MANUAL).%.xml $(ENT_ALL)
+$(TMP_DIR_DR)/$(MANUAL).%.pdf: $(MANUAL).%.xml
 	@$(call check-command, dblatex, dblatex)
 	@$(call check-command, xsltproc, xsltproc)
 	-mkdir -p $(CURDIR)/tmp
@ -423,7 +442,7 @@ $(TMP_DIR_DR)/$(MANUAL).%.pdf: $(MANUAL).%.xml $(ENT_ALL)
 tex:	$(foreach LX, $(LANGALL), $(TMP_DIR_DR)/$(MANUAL).$(LX).tex)

 # dblatex.xsl provide work around for hidden URL links by appending them explicitly.
-$(TMP_DIR_DR)/$(MANUAL).%.tex: $(MANUAL).%.xml $(ENT_ALL)
+$(TMP_DIR_DR)/$(MANUAL).%.tex: $(MANUAL).%.xml
 	-mkdir -p $(CURDIR)/tmp
 	@test -n "`which $(DBLATEX)`"  || { echo "ERROR: dblatex not found. Please install the dblatex package." ; false ;  }
 	export TEXINPUTS=".:"; \
@ -445,7 +464,7 @@ $(TMP_DIR_DR)/$(MANUAL).%.tex: $(MANUAL).%.xml $(ENT_ALL)
 .PHONY: epub
 epub:	$(foreach LX, $(LANGALL), $(TMP_DIR_DR)/$(MANUAL).$(LX).epub)

-$(TMP_DIR_DR)/$(MANUAL).%.epub: $(MANUAL).%.xml $(ENT_ALL)
+$(TMP_DIR_DR)/$(MANUAL).%.epub: $(MANUAL).%.xml
 	@$(call check-command, xsltproc, xsltproc)
 	-mkdir -p $(TMP_DIR_DR)/$*/
 	cd $(TMP_DIR_DR)/$*/ ; $(XPINC) $(CURDIR)/$(DXSL)/style-epub.xsl $(CURDIR)/$<
@ -454,9 +473,61 @@ $(TMP_DIR_DR)/$(MANUAL).%.epub: $(MANUAL).%.xml $(ENT_ALL)
 	cp -f $(DXSL)/debian-openlogo.png $(TMP_DIR_DR)/$*/OEBPS/debian-openlogo.png
 	cd $(TMP_DIR_DR)/$*/ ; zip -r $@ ./

+#######################################################################
+# Phase 9 post/pre build: clean and distclean
+#######################################################################
+#######################################################################
+# $ make clean     # clean files ready for tar 
+#######################################################################
+.PHONY: clean
+clean:
+	# CLEAN
+	-rm -f *.swp *~ *.tmp
+	-rm -f $(DPO)/*~ $(DPO)/*.mo $(DPO)/*.po.*
+	-rm -f $(DASC)/*~
+	-rm -rf tmp debian/tmp $(PUBLISHDIR)/$(MANUAL)
+	-rm -f $(addsuffix .xml, $(addprefix $(MANUAL)., $(LANGALL)))
+	-rm -f $(MANUAL).en.xml $(MANUAL).en.xmlt header.txt
+	-rm -f $(REMOTE_DATA)
+
+#######################################################################
+# $ make distclean # clean files to reset RAWXML/ENT/POT
+#######################################################################
+.PHONY: distclean
+distclean: clean
+	# DISTCLEAN
+	-rm -f $(MANUAL).raw.xml
+	-rm -f $(ENT_STAT)
+	-rm -f $(DPO)/*.pot
+	-rm -f fuzzy.log
+	-rm -f $(DBIN)/replace_package
+
 #######################################################################
 ### Utility targets
 #######################################################################
+
+#######################################################################
+# $ make wrap       # wrap all PO
+#######################################################################
+.PHONY: wrap nowrap wip
+wrap:
+	@$(call check-command, msgcat, gettext)
+	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
+	$(MSGCAT) -o $$XX $$XX ;\
+	done
+nowrap:
+	@$(call check-command, msgcat, gettext)
+	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
+	$(MSGCAT) -o $$XX --no-wrap $$XX ;\
+	done
+
+wip:
+	@$(call check-command, msgattrib, gettext)
+	for XX in $(foreach LX, $(LANGPO), $(DPO)/$(LX).po); do \
+	$(MSGATTR) -o $$XX.fuzz --fuzzy        $$XX ;\
+	$(MSGATTR) -o $$XX.untr --untranslated $$XX ;\
+	done
+
 #######################################################################
 # $ make rsync     
 # export build result to http://people.debian.org/~osamu/debian-reference/
--- a/asciidoc/01_tutorial.txt
+++ b/asciidoc/01_tutorial.txt
@ -930,7 +930,7 @@ The center wheel on the modern wheel mouse is considered middle mouse button and

 ==== The pager

-The `less`(1) command is the enhanced pager (file content browser). It reads the file specified by its command argument or its standard input.  Hit "`h`" if you need help while browsing with the `less` command.  It can do much more than `more`(1) and can be supercharged by executing "`eval $(lesspipe)`" or "`eval $(lessfile)`" in the shell startup script. See more in "`/usr/share/doc/lessf/LESSOPEN`".  The "`-R`" option allows raw character output and enables ANSI color escape sequences.  See `less`(1).
+The `less`(1) command is the enhanced pager (file content browser). It reads the file specified by its command argument or its standard input.  Hit "`h`" if you need help while browsing with the `less` command.  It can do much more than `more`(1) and can be supercharged by executing "`eval $(lesspipe)`" or "`eval $(lessfile)`" in the shell startup script. See more in "`/usr/share/doc/less/LESSOPEN`".  The "`-R`" option allows raw character output and enables ANSI color escape sequences.  See `less`(1).

 ==== The text editor

--- a/asciidoc/06_netapp.txt
+++ b/asciidoc/06_netapp.txt
@ -47,7 +47,6 @@ Debian offers many free browser plugin packages in the main archive area which c
 package                  popcon        size         area      description
 ------------------------------------------------------------------------------------------------------------------------------------------
 `icedtea-plugin`         @-@popcon1@-@ @-@psize1@-@ main      Java plugin based on OpenJDK and IcedTea
-`mozilla-plugin-gnash`   @-@popcon1@-@ @-@psize1@-@ main      Flash plugin based on Gnash
 `flashplugin-nonfree`    @-@popcon1@-@ @-@psize1@-@ contrib   Flash plugin helper to install Adobe Flash Player (i386, amd64 only)
 `browser-plugin-vlc`     @-@popcon1@-@ @-@psize1@-@ main      Multimedia plugin based on https://en.wikipedia.org/wiki/VLC_media_player[VLC media player]
 ------------------------------------------------------------------------------------------------------------------------------------------
--- a/asciidoc/07_xwindow.txt
+++ b/asciidoc/07_xwindow.txt
@ -22,7 +22,6 @@ There are a few (meta)packages provided to ease installation.
 `x11-common`                @-@popcon1@-@ @-@psize1@-@ filesystem infrastructure for the X Window System
 `xorg-docs`                 @-@popcon1@-@ @-@psize1@-@ miscellaneous documentation for the X.Org software suite
 `menu`                      @-@popcon1@-@ @-@psize1@-@ generate the Debian menu for all menu-aware applications
-`gksu`                      @-@popcon1@-@ @-@psize1@-@ Gtk+ frontend to `su`(1) or `sudo`(8)
 `menu-xdg`                  @-@popcon1@-@ @-@psize1@-@ convert the Debian menu structure to the https://en.wikipedia.org/wiki/Freedesktop.org[freedesktop.org] xdg menu structure
 `xdg-utils`                 @-@popcon1@-@ @-@psize1@-@ utilities to integrate desktop environment provided by the https://en.wikipedia.org/wiki/Freedesktop.org[freedesktop.org]
 `task-gnome-desktop`        @-@popcon1@-@ @-@psize1@-@ standard https://en.wikipedia.org/wiki/GNOME[GNOME] desktop environment (metapackage)
@ -450,10 +449,6 @@ $ sudo -s
 # foo &
 --------------------

--------------------
-$ gksu foo &
--------------------
-
 --------------------
 $ ssh -X root@localhost
 # foo &
@ -466,5 +461,3 @@ In order for the X client to connect to the X server, please note the following.
 - Values of the old user@@@sq@@@s "`$XAUTHORITY`" and "`$DISPLAY`" environment variables must be copied to the new user@@@sq@@@s ones.
 - The file pointed by value of the "`$XAUTHORITY`" environment variable must be readable by the new user.

-The `gksu` package (popcon: @-@pop-gksu@-@) is a specialized GTK+ GUI package for gaining the root privileges.  It can be configured to use `su`(1) or `sudo`(8) as its backend depending on the "`/apps/gksu/sudo-mode`" gconf key.  You can edit gconf key using `gconf-editor`(1) (menu: "Applications" -> "System Tools" -> "Configuration Editor").
-
--- a/asciidoc/09_systips.txt
+++ b/asciidoc/09_systips.txt
@ -916,7 +916,7 @@ package         popcon        size         description
 `jfsutils`      @-@popcon1@-@ @-@psize1@-@ utilities for the https://en.wikipedia.org/wiki/JFS_(file_system)[JFS] filesystem. (IBM: AIX, OS/2)
 `reiser4progs`  @-@popcon1@-@ @-@psize1@-@ utilities for the https://en.wikipedia.org/wiki/Reiser4[Reiser4] filesystem
 `hfsprogs`      @-@popcon1@-@ @-@psize1@-@ utilities for https://en.wikipedia.org/wiki/Hierarchical_File_System[HFS] and https://en.wikipedia.org/wiki/HFS_Plus[HFS Plus] filesystem. (Apple: Mac OS)
-`btrfs-tools`   @-@popcon1@-@ @-@psize1@-@ utilities for the https://en.wikipedia.org/wiki/Btrfs[Btrfs] filesystem
+`btrfs-progs`   @-@popcon1@-@ @-@psize1@-@ utilities for the https://en.wikipedia.org/wiki/Btrfs[Btrfs] filesystem
 `zerofree`      @-@popcon1@-@ @-@psize1@-@ program to zero free blocks from ext2/3/4 filesystems
 ------------------------------------------------------------------------------------------------------------------------------------------

--- a/asciidoc/10_datamngt.txt
+++ b/asciidoc/10_datamngt.txt
@ -783,7 +783,9 @@ VCS is sometimes known as revision control system (RCS), or software configurati

 Distributed VCS such as Git is the tool of choice these days.  CVS and Subversion may still be useful to join some existing open source program activities.

-Debian provides free VCS services via https://salsa.debian.org/[Debian Salsa service].  It supports practically all VCSs. Its documentation can be found at https://wiki.debian.org/Salsa .
+Debian provides free Git services via https://salsa.debian.org/[Debian Salsa service].  Its documentation can be found at https://wiki.debian.org/Salsa .
+
+CAUTION: Debian has closed its old alioth services and the old alioth service data are available at https://alioth-archive.debian.org/[alioth-archive] as tarballs.

 There are few basics for creating a shared access VCS archive.

--- a/asciidoc/11_dataconv.txt
+++ b/asciidoc/11_dataconv.txt
@ -547,7 +547,6 @@ package      popcon        size         keyword      description
 `mpack`      @-@popcon1@-@ @-@psize1@-@ MIME         encoding and decoding of https://en.wikipedia.org/wiki/MIME[MIME] messages: `mpack`(1) and `munpack`(1)
 `tnef`       @-@popcon1@-@ @-@psize1@-@ ms-tnef      unpacking https://en.wikipedia.org/wiki/MIME[MIME] attachments of type "application/ms-tnef" which is a Microsoft only format
 `uudeview`   @-@popcon1@-@ @-@psize1@-@ mail         encoder and decoder for the following formats: https://en.wikipedia.org/wiki/Uuencoding[uuencode], https://en.wikipedia.org/wiki/Xxencode[xxencode], https://en.wikipedia.org/wiki/Base64[BASE64], https://en.wikipedia.org/wiki/Quoted-printable[quoted printable], and https://en.wikipedia.org/wiki/BinHex[BinHex]
-`readpst`    @-@popcon1@-@ @-@psize1@-@ PST          convert Microsoft https://en.wikipedia.org/wiki/Personal_Folders_(.pst)_file[Outlook PST files] to https://en.wikipedia.org/wiki/Mbox[mbox] format
 ------------------------------------------------------------------------------------------------------------------------------------------

 TIP: The https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol[Internet Message Access Protocol] version 4 (IMAP4) server (see <<_pop3_imap4_server>>) may be used to move mails out from proprietary mail systems if the mail client software can be configured to use IMAP4 server too.
--- a/asciidoc/12_program.txt
+++ b/asciidoc/12_program.txt
@ -577,7 +577,6 @@ package          popcon        size         description
 -------------------------------------------------------------------------------------------------
 `libc6-dev`      @-@popcon1@-@ @-@psize1@-@ `mtrace`(1): malloc debugging functionality in glibc
 `valgrind`       @-@popcon1@-@ @-@psize1@-@ memory debugger and profiler
-`kmtrace`        @-@popcon1@-@ @-@psize1@-@ KDE memory leak tracer using glibc@@@sq@@@s `mtrace`(1)
 `electric-fence` @-@popcon1@-@ @-@psize1@-@ `malloc`(3) debugger
 `leaktracer`     @-@popcon1@-@ @-@psize1@-@ memory-leak tracer for C++ programs
 `libdmalloc5`    @-@popcon1@-@ @-@psize1@-@ debug memory allocation library
--- a/bin/genreplace
+++ b/bin/genreplace
@ -0,0 +1,17 @@
+#! /bin/sh -e
+# vim: set sts=4 expandtab:
+PKG_GEN=$1
+PKG_VER=$(grep -e "^Package:" packages.txt |\
+    sed -e "s/Package: //" |\
+    grep -e "^${PKG_GEN}[-\.0-9]*[0-9]\$"|\
+    sort -n|\
+    tail -1)
+if [ -n "${PKG_VER}" ]; then
+    echo "s/@${PKG_GEN}@/${PKG_VER}/g"
+else
+    echo "s/@${PKG_GEN}@/${PKG_GEN}*/g"
+    echo "*** ${PKG_GEN} is missing ***" >&2
+    grep -e "^Package:" packages.txt |\
+    sed -e "s/Package: //" |\
+    grep -e "^${PKG_GEN}[-\.0-9]*[0-9]\$" <&2
+fi
--- a/bin/replace_package
+++ b/bin/replace_package
@ -1,5 +1,5 @@
 # This is autogenerated by Makefile.  Update this with "make rawxml"
-s/@emacs@/emacs25/
-s/@libpoppler@/libpoppler73/
-s/@libgstreamer@/libgstreamer1.0-0/
-s/@libphonon@/libphonon4/
+s/@emacs@/emacs25/g
+s/@libpoppler@/libpoppler74/g
+s/@libgstreamer@/libgstreamer1.0-0/g
+s/@libphonon@/libphonon4/g
--- a/common.ent
+++ b/common.ent
@ -0,0 +1,11 @@
+<!ENTITY build-date "2018-07-01 15:51:07 UTC">
+<!ENTITY arch "amd64">
+<!ENTITY dr-version "2.73">
+<!ENTITY codename-stable  "stretch">
+<!ENTITY Codename-stable  "Stretch">
+<!ENTITY codename-testing  "buster">
+<!ENTITY Codename-testing  "Buster">
+<!ENTITY codename-nexttesting  "bullseye">
+<!ENTITY Codename-nexttesting  "Bullseye">
+<!ENTITY codename-unstable "sid">
+<!ENTITY Codename-unstable "Sid">
--- a/datadatepop.ent
+++ b/datadatepop.ent
@ -1 +1 @@
-<!ENTITY pop-date "2018-04-10 11:22:56 UTC">
+<!ENTITY pop-date "2018-07-01 15:49:36 UTC">
--- a/datadatesize.ent
+++ b/datadatesize.ent
@ -1,5 +1,5 @@
-<!ENTITY all-packages "59116">
-<!ENTITY main-packages "58230">
-<!ENTITY contrib-packages "341">
-<!ENTITY non-free-packages "545">
-<!ENTITY pkgsize-date "2018-04-10 11:22:56 UTC">
+<!ENTITY all-packages "59509">
+<!ENTITY main-packages "58588">
+<!ENTITY contrib-packages "352">
+<!ENTITY non-free-packages "569">
+<!ENTITY pkgsize-date "2018-07-01 15:49:41 UTC">
--- a/debian-reference.raw.xml
+++ b/debian-reference.raw.xml
@ -2515,7 +2515,7 @@ export EDITOR</screen>
      </section>
      <section id="_the_pager">
        <title>The pager</title>
-        <para>The <citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry> command is the enhanced pager (file content browser). It reads the file specified by its command argument or its standard input.  Hit "<literal>h</literal>" if you need help while browsing with the <literal>less</literal> command.  It can do much more than <citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></citerefentry> and can be supercharged by executing "<literal>eval $(lesspipe)</literal>" or "<literal>eval $(lessfile)</literal>" in the shell startup script. See more in "<literal>/usr/share/doc/lessf/LESSOPEN</literal>".  The "<literal>-R</literal>" option allows raw character output and enables ANSI color escape sequences.  See <citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
+        <para>The <citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry> command is the enhanced pager (file content browser). It reads the file specified by its command argument or its standard input.  Hit "<literal>h</literal>" if you need help while browsing with the <literal>less</literal> command.  It can do much more than <citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></citerefentry> and can be supercharged by executing "<literal>eval $(lesspipe)</literal>" or "<literal>eval $(lessfile)</literal>" in the shell startup script. See more in "<literal>/usr/share/doc/less/LESSOPEN</literal>".  The "<literal>-R</literal>" option allows raw character output and enables ANSI color escape sequences.  See <citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
      </section>
      <section id="_the_text_editor">
        <title>The text editor</title>
@ -15300,23 +15300,6 @@ MSS = MTU - 60 for IPv6
    </entry>
                <entry>
    Java plugin based on OpenJDK and IcedTea
-    </entry>
-              </row>
-              <row>
-                <entry>
-                  <literal>mozilla-plugin-gnash</literal>
-                </entry>
-                <entry>
-    @-@popcon1@-@
-    </entry>
-                <entry>
-    @-@psize1@-@
-    </entry>
-                <entry>
-    main
-    </entry>
-                <entry>
-    Flash plugin based on Gnash
    </entry>
              </row>
              <row>
@ -18339,20 +18322,6 @@ Identity added: /home/&lt;username&gt;/.ssh/id_rsa (/home/&lt;username&gt;/.ssh/
    </entry>
              <entry>
    generate the Debian menu for all menu-aware applications
-    </entry>
-            </row>
-            <row>
-              <entry>
-                <literal>gksu</literal>
-              </entry>
-              <entry>
-    @-@popcon1@-@
-    </entry>
-              <entry>
-    @-@psize1@-@
-    </entry>
-              <entry>
-    Gtk+ frontend to <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry> or <citerefentry><refentrytitle>sudo</refentrytitle><manvolnum>8</manvolnum></citerefentry>
    </entry>
            </row>
            <row>
@ -20280,7 +20249,6 @@ To get the <emphasis role="strong">keycode</emphasis>, run <citerefentry><refent
        <screen>$ sudo foo &amp;</screen>
        <screen>$ sudo -s
 # foo &amp;</screen>
-        <screen>$ gksu foo &amp;</screen>
        <screen>$ ssh -X root@localhost
 # foo &amp;</screen>
        <caution>
@ -20299,7 +20267,6 @@ The file pointed by value of the "<literal>$XAUTHORITY</literal>" environment va
 </para>
          </listitem>
        </itemizedlist>
-        <para>The <literal>gksu</literal> package (popcon: @-@pop-gksu@-@) is a specialized GTK+ GUI package for gaining the root privileges.  It can be configured to use <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry> or <citerefentry><refentrytitle>sudo</refentrytitle><manvolnum>8</manvolnum></citerefentry> as its backend depending on the "<literal>/apps/gksu/sudo-mode</literal>" gconf key.  You can edit gconf key using <citerefentry><refentrytitle>gconf-editor</refentrytitle><manvolnum>1</manvolnum></citerefentry> (menu: "Applications" → "System Tools" → "Configuration Editor").</para>
      </section>
    </section>
  </chapter>
@ -23713,7 +23680,7 @@ the userspace LVM2 tools (<literal>lvm2</literal> package)
              </row>
              <row>
                <entry>
-                  <literal>btrfs-tools</literal>
+                  <literal>btrfs-progs</literal>
                </entry>
                <entry>
    @-@popcon1@-@
@ -28878,7 +28845,10 @@ $ patch -p1 file &lt; file.patch1</screen>
      </table>
      <para>VCS is sometimes known as revision control system (RCS), or software configuration management (SCM).</para>
      <para>Distributed VCS such as Git is the tool of choice these days.  CVS and Subversion may still be useful to join some existing open source program activities.</para>
-      <para>Debian provides free VCS services via <ulink url="https://salsa.debian.org/">Debian Salsa service</ulink>.  It supports practically all VCSs. Its documentation can be found at <ulink url="https://wiki.debian.org/Salsa">https://wiki.debian.org/Salsa</ulink> .</para>
+      <para>Debian provides free Git services via <ulink url="https://salsa.debian.org/">Debian Salsa service</ulink>.  Its documentation can be found at <ulink url="https://wiki.debian.org/Salsa">https://wiki.debian.org/Salsa</ulink> .</para>
+      <caution>
+        <para>Debian has closed its old alioth services and the old alioth service data are available at <ulink url="https://alioth-archive.debian.org/">alioth-archive</ulink> as tarballs.</para>
+      </caution>
      <para>There are few basics for creating a shared access VCS archive.</para>
      <itemizedlist>
        <listitem>
@ -32010,7 +31980,7 @@ The TEX Live Guide - TEX Live 2007 ("<literal>/usr/share/doc/texlive-doc-base/en
              </row>
              <row>
                <entry>
-                  <literal>libpoppler73</literal>
+                  <literal>libpoppler74</literal>
                </entry>
                <entry>
    @-@popcon1@-@
@ -32464,23 +32434,6 @@ $ gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=bla.pdf -f foo1.pdf foo
    </entry>
              <entry>
    encoder and decoder for the following formats: <ulink url="https://en.wikipedia.org/wiki/Uuencoding">uuencode</ulink>, <ulink url="https://en.wikipedia.org/wiki/Xxencode">xxencode</ulink>, <ulink url="https://en.wikipedia.org/wiki/Base64">BASE64</ulink>, <ulink url="https://en.wikipedia.org/wiki/Quoted-printable">quoted printable</ulink>, and <ulink url="https://en.wikipedia.org/wiki/BinHex">BinHex</ulink>
-    </entry>
-            </row>
-            <row>
-              <entry>
-                <literal>readpst</literal>
-              </entry>
-              <entry>
-    @-@popcon1@-@
-    </entry>
-              <entry>
-    @-@psize1@-@
-    </entry>
-              <entry>
-    PST
-    </entry>
-              <entry>
-    convert Microsoft <ulink url="https://en.wikipedia.org/wiki/Personal_Folders_(.pst)_file">Outlook PST files</ulink> to <ulink url="https://en.wikipedia.org/wiki/Mbox">mbox</ulink> format
    </entry>
            </row>
          </tbody>
@ -35166,20 +35119,6 @@ Type "<literal>bt</literal>" at the <literal>gdb</literal> prompt.
    </entry>
                <entry>
    memory debugger and profiler
-    </entry>
-              </row>
-              <row>
-                <entry>
-                  <literal>kmtrace</literal>
-                </entry>
-                <entry>
-    @-@popcon1@-@
-    </entry>
-                <entry>
-    @-@psize1@-@
-    </entry>
-                <entry>
-    KDE memory leak tracer using glibc's <citerefentry><refentrytitle>mtrace</refentrytitle><manvolnum>1</manvolnum></citerefentry>
    </entry>
              </row>
              <row>
--- a/debian/changelog
+++ b/debian/changelog
@ -1,9 +1,12 @@
-debian-reference (2.73) UNRELEASED; urgency=medium
+debian-reference (2.73) unstable; urgency=medium

  * Adjust symlink for README.md.gz . Closes: #893479
+  * Fix typo.  Closes: #897666
+  * Adjust popcon graph URL to new location.
+  * More robust package name substitution for versioned packages.
  * Update translations.

- -- Osamu Aoki <osamu@debian.org>  Mon, 19 Mar 2018 22:41:38 +0900
+ -- Osamu Aoki <osamu@debian.org>  Mon, 02 Jul 2018 00:52:17 +0900

 debian-reference (2.72) unstable; urgency=medium

--- a/debian/rules
+++ b/debian/rules
@ -19,8 +19,8 @@ MANUAL	:=	debian-reference
 LANGALL	:=	en ja fr it pt de zh-cn zh-tw es
 LANGPO	:=	   ja fr it pt de zh-cn zh-tw es
 # languages to skip generation of PDF files (not used now)
-NOPDF	:=	zh-cn zh-tw
-#NOPDF	:=	
+#NOPDF	:=	zh-cn zh-tw
+NOPDF	:=	

 ## ----------------------------------------------------------------------
 ## Targets
--- a/pkgsize.ent
+++ b/pkgsize.ent
@ -6,17 +6,17 @@
 <!ENTITY size-aide "2038">
 <!ENTITY size-ale "753">
 <!ENTITY size-alien "166">
-<!ENTITY size-alsautils "2103">
-<!ENTITY size-amandaclient "1072">
-<!ENTITY size-amandacommon "9964">
-<!ENTITY size-amandaserver "1044">
+<!ENTITY size-alsautils "2119">
+<!ENTITY size-amandaclient "1073">
+<!ENTITY size-amandacommon "9760">
+<!ENTITY size-amandaserver "1045">
 <!ENTITY size-anacron "106">
 <!ENTITY size-analog "3529">
 <!ENTITY size-antiword "623">
-<!ENTITY size-apachec "592">
+<!ENTITY size-apachec "593">
 <!ENTITY size-apmd "132">
 <!ENTITY size-approx "4729">
-<!ENTITY size-apt "3755">
+<!ENTITY size-apt "3799">
 <!ENTITY size-aptcacher "289">
 <!ENTITY size-aptcacherng "1401">
 <!ENTITY size-aptfile "82">
@ -24,10 +24,10 @@
 <!ENTITY size-aptlistbugs "449">
 <!ENTITY size-aptlistchanges "385">
 <!ENTITY size-aptrdepends "40">
-<!ENTITY size-aptutils "1113">
-<!ENTITY size-ariac "4557">
-<!ENTITY size-arping "72">
-<!ENTITY size-arptables "88">
+<!ENTITY size-aptutils "1114">
+<!ENTITY size-ariac "4562">
+<!ENTITY size-arping "73">
+<!ENTITY size-arptables "86">
 <!ENTITY size-asciidoc "80">
 <!ENTITY size-at "149">
 <!ENTITY size-autoconf "1868">
@ -35,50 +35,50 @@
 <!ENTITY size-autopsy "1021">
 <!ENTITY size-awstats "6799">
 <!ENTITY size-axel "186">
-<!ENTITY size-backupcl "113">
+<!ENTITY size-backupcl "114">
 <!ENTITY size-backupmanager "571">
-<!ENTITY size-backupninja "329">
+<!ENTITY size-backupninja "350">
 <!ENTITY size-backuppc "2232">
-<!ENTITY size-baculaclient "167">
-<!ENTITY size-baculacommon "2059">
+<!ENTITY size-baculaclient "168">
+<!ENTITY size-baculacommon "2074">
 <!ENTITY size-baculaconsole "68">
-<!ENTITY size-baculaserver "167">
-<!ENTITY size-bash "5810">
+<!ENTITY size-baculaserver "168">
+<!ENTITY size-bash "5776">
 <!ENTITY size-beav "133">
 <!ENTITY size-bigcursor "27">
-<!ENTITY size-bindj "1902">
-<!ENTITY size-bindjhost "176">
+<!ENTITY size-bindj "2075">
+<!ENTITY size-bindjhost "349">
 <!ENTITY size-bing "71">
 <!ENTITY size-binutils "91">
 <!ENTITY size-bison "2061">
 <!ENTITY size-blender "106780">
 <!ENTITY size-bless "973">
 <!ENTITY size-bmon "140">
-<!ENTITY size-bochs "4086">
+<!ENTITY size-bochs "4619">
 <!ENTITY size-bootchartc "94">
 <!ENTITY size-browserpluginvlc "202">
-<!ENTITY size-bsdmainutils "586">
+<!ENTITY size-bsdmainutils "587">
 <!ENTITY size-bsdutils "256">
-<!ENTITY size-btrfstools "29">
+<!ENTITY size-btrfsprogs "3146">
 <!ENTITY size-btyacc "207">
 <!ENTITY size-buildessential "20">
-<!ENTITY size-bwmng "89">
+<!ENTITY size-bwmng "90">
 <!ENTITY size-byacc "160">
 <!ENTITY size-bzipc "184">
-<!ENTITY size-bzr "73">
-<!ENTITY size-calibre "51238">
+<!ENTITY size-bzr "74">
+<!ENTITY size-calibre "51519">
 <!ENTITY size-calligraplan "15222">
-<!ENTITY size-calligrasheets "10780">
-<!ENTITY size-calligrastage "4832">
-<!ENTITY size-calligrawords "5569">
+<!ENTITY size-calligrasheets "10789">
+<!ENTITY size-calligrastage "4833">
+<!ENTITY size-calligrawords "5570">
 <!ENTITY size-catdoc "675">
 <!ENTITY size-cdebootstrap "112">
 <!ENTITY size-changetrack "62">
-<!ENTITY size-chkrootkit "954">
-<!ENTITY size-chromium "141083">
+<!ENTITY size-chkrootkit "888">
+<!ENTITY size-chromium "141861">
 <!ENTITY size-cifsutils "231">
-<!ENTITY size-clamav "893">
-<!ENTITY size-consolesetup "382">
+<!ENTITY size-clamav "698">
+<!ENTITY size-consolesetup "385">
 <!ENTITY size-coreutils "15016">
 <!ENTITY size-courierimap "545">
 <!ENTITY size-couriermta "2079">
@ -89,45 +89,45 @@
 <!ENTITY size-crmbbe "1099">
 <!ENTITY size-cron "252">
 <!ENTITY size-cryptmount "224">
-<!ENTITY size-cryptsetup "378">
+<!ENTITY size-cryptsetup "60">
 <!ENTITY size-csh "339">
 <!ENTITY size-cssc "1979">
-<!ENTITY size-cups "766">
+<!ENTITY size-cups "767">
 <!ENTITY size-cupsbsd "115">
-<!ENTITY size-cupsclient "480">
-<!ENTITY size-curl "377">
+<!ENTITY size-cupsclient "481">
+<!ENTITY size-curl "385">
 <!ENTITY size-cvs "4597">
 <!ENTITY size-cxref "1182">
 <!ENTITY size-cyrusimapd "332">
 <!ENTITY size-cyruspopdd "147">
 <!ENTITY size-cyrussaslcdoc "247">
-<!ENTITY size-darcs "31349">
+<!ENTITY size-darcs "29914">
 <!ENTITY size-dash "218">
 <!ENTITY size-dblatex "4648">
 <!ENTITY size-dbtoepub "71">
 <!ENTITY size-dcfldd "94">
 <!ENTITY size-dcraw "384">
-<!ENTITY size-ddd "3965">
+<!ENTITY size-ddd "3929">
 <!ENTITY size-debianfaq "1277">
 <!ENTITY size-debianhistory "5034">
-<!ENTITY size-debianpolicy "5258">
-<!ENTITY size-debianutils "213">
-<!ENTITY size-debootstrap "268">
+<!ENTITY size-debianpolicy "5339">
+<!ENTITY size-debianutils "214">
+<!ENTITY size-debootstrap "277">
 <!ENTITY size-debsums "120">
 <!ENTITY size-developersreference "1304">
-<!ENTITY size-devscripts "2175">
+<!ENTITY size-devscripts "2185">
 <!ENTITY size-dia "3916">
-<!ENTITY size-dialog "1119">
+<!ENTITY size-dialog "1118">
 <!ENTITY size-diffstat "70">
 <!ENTITY size-diffutils "1394">
-<!ENTITY size-digikam "1832">
+<!ENTITY size-digikam "3639">
 <!ENTITY size-dillo "1500">
-<!ENTITY size-dirdiff "144">
+<!ENTITY size-dirdiff "161">
 <!ENTITY size-discover "90">
 <!ENTITY size-dkms "282">
 <!ENTITY size-dlint "96">
 <!ENTITY size-dnstracer "56">
-<!ENTITY size-dnsutils "500">
+<!ENTITY size-dnsutils "673">
 <!ENTITY size-docbookdsssl "2604">
 <!ENTITY size-docbooktoman "187">
 <!ENTITY size-docbookutils "281">
@ -135,45 +135,45 @@
 <!ENTITY size-docbookxsl "14998">
 <!ENTITY size-docdebian "166">
 <!ENTITY size-docdiff "573">
-<!ENTITY size-doclifter "457">
+<!ENTITY size-doclifter "446">
 <!ENTITY size-dosbox "2706">
 <!ENTITY size-dosemu "4891">
 <!ENTITY size-dosfstools "235">
 <!ENTITY size-dpatch "191">
-<!ENTITY size-dpkg "6743">
-<!ENTITY size-dselect "2506">
-<!ENTITY size-dump "341">
+<!ENTITY size-dpkg "6744">
+<!ENTITY size-dselect "2507">
+<!ENTITY size-dump "340">
 <!ENTITY size-duplicity "1597">
 <!ENTITY size-dvbackup "412">
-<!ENTITY size-dvdisaster "1588">
-<!ENTITY size-ecfsprogs "1222">
+<!ENTITY size-dvdisaster "1548">
+<!ENTITY size-ecfsprogs "1223">
 <!ENTITY size-ecps "112">
-<!ENTITY size-ebtables "351">
+<!ENTITY size-ebtables "345">
 <!ENTITY size-ecryptfsutils "396">
 <!ENTITY size-electricfence "70">
 <!ENTITY size-elinks "1583">
-<!ENTITY size-emacscf "19216">
+<!ENTITY size-emacscf "19264">
 <!ENTITY size-enscript "2111">
-<!ENTITY size-eog "11242">
+<!ENTITY size-eog "11254">
 <!ENTITY size-epiphanybrowser "1538">
 <!ENTITY size-esmtp "124">
 <!ENTITY size-esmtprun "32">
 <!ENTITY size-etckeeper "153">
-<!ENTITY size-ethstats "20">
-<!ENTITY size-ethstatus "39">
+<!ENTITY size-ethstats "23">
+<!ENTITY size-ethstatus "40">
 <!ENTITY size-ethtool "384">
-<!ENTITY size-evince "1418">
-<!ENTITY size-evolution "448">
+<!ENTITY size-evince "1466">
+<!ENTITY size-evolution "449">
 <!ENTITY size-exif "238">
 <!ENTITY size-exifprobe "490">
 <!ENTITY size-exiftags "288">
 <!ENTITY size-exiftran "71">
-<!ENTITY size-eximebase "1585">
-<!ENTITY size-eximedaemonheavy "1430">
-<!ENTITY size-eximedaemonlight "1289">
-<!ENTITY size-eximedochtml "3484">
-<!ENTITY size-eximedocinfo "593">
-<!ENTITY size-exivc "246">
+<!ENTITY size-eximebase "1598">
+<!ENTITY size-eximedaemonheavy "1448">
+<!ENTITY size-eximedaemonlight "1303">
+<!ENTITY size-eximedochtml "3525">
+<!ENTITY size-eximedocinfo "603">
+<!ENTITY size-exivc "239">
 <!ENTITY size-extdgrep "278">
 <!ENTITY size-extemagic "232">
 <!ENTITY size-extundelete "148">
@ -186,68 +186,66 @@
 <!ENTITY size-fetchmail "2343">
 <!ENTITY size-figcsxd "149">
 <!ENTITY size-findimagedupes "79">
-<!ENTITY size-firefox "159602">
-<!ENTITY size-firefoxesr "107045">
+<!ENTITY size-firefox "153158">
+<!ENTITY size-firefoxesr "107172">
 <!ENTITY size-flashpluginnonfree "71">
 <!ENTITY size-flawfinder "175">
 <!ENTITY size-flex "1220">
 <!ENTITY size-flexbackup "242">
 <!ENTITY size-fluxbox "3860">
-<!ENTITY size-fontconfig "563">
-<!ENTITY size-fontconfigconfig "472">
+<!ENTITY size-fontconfig "542">
+<!ENTITY size-fontconfigconfig "441">
 <!ENTITY size-fontforge "91">
 <!ENTITY size-fontsdejavu "39">
 <!ENTITY size-fontsdejavucore "2954">
 <!ENTITY size-fontsdejavuextra "7217">
-<!ENTITY size-fontsfreefontttf "10746">
+<!ENTITY size-fontsfreefontttf "10750">
 <!ENTITY size-fontsliberation "2093">
 <!ENTITY size-fop "64">
-<!ENTITY size-foremost "123">
-<!ENTITY size-fpc "119">
+<!ENTITY size-foremost "96">
+<!ENTITY size-fpc "120">
 <!ENTITY size-freepwing "421">
 <!ENTITY size-ftp "132">
 <!ENTITY size-fwlogwatch "474">
 <!ENTITY size-gawk "2196">
 <!ENTITY size-gcc "45">
 <!ENTITY size-gdb "7928">
-<!ENTITY size-gdisk "779">
+<!ENTITY size-gdisk "780">
 <!ENTITY size-gdmd "4715">
-<!ENTITY size-geeqie "1989">
-<!ENTITY size-getmaile "32
-637">
-<!ENTITY size-gettext "6501">
+<!ENTITY size-geeqie "1990">
+<!ENTITY size-getmaile "32">
+<!ENTITY size-gettext "6502">
 <!ENTITY size-gfortran "16">
 <!ENTITY size-ghostscript "219">
 <!ENTITY size-ghostscriptx "211">
-<!ENTITY size-gimp "16300">
-<!ENTITY size-git "34616">
-<!ENTITY size-gitbuildpackage "3867">
-<!ENTITY size-gitcvs "1125">
-<!ENTITY size-gitdoc "10802">
-<!ENTITY size-gitemail "811">
-<!ENTITY size-gitgui "2219">
-<!ENTITY size-gitk "1492">
+<!ENTITY size-gimp "17769">
+<!ENTITY size-git "33183">
+<!ENTITY size-gitbuildpackage "3869">
+<!ENTITY size-gitcvs "1140">
+<!ENTITY size-gitdoc "10985">
+<!ENTITY size-gitemail "827">
+<!ENTITY size-gitgui "2234">
+<!ENTITY size-gitk "1507">
 <!ENTITY size-gitmagic "719">
-<!ENTITY size-gitsvn "990">
-<!ENTITY size-gksu "NOT_FOUND">
+<!ENTITY size-gitsvn "1005">
 <!ENTITY size-glabels "1385">
-<!ENTITY size-glade "2307">
+<!ENTITY size-glade "2306">
 <!ENTITY size-glibcdoc "2919">
 <!ENTITY size-glibcdocreference "13132">
 <!ENTITY size-gnomenettool "2101">
 <!ENTITY size-gnucash "9664">
 <!ENTITY size-gnuhtmlclatex "27">
-<!ENTITY size-gnumeric "7888">
-<!ENTITY size-gnupg "696">
+<!ENTITY size-gnumeric "7737">
+<!ENTITY size-gnupg "711">
 <!ENTITY size-gocr "477">
 <!ENTITY size-gparted "7231">
-<!ENTITY size-gpgv "809">
-<!ENTITY size-gphotoc "967">
+<!ENTITY size-gpgv "820">
+<!ENTITY size-gphotoc "961">
 <!ENTITY size-gpm "497">
-<!ENTITY size-graphicsmagick "4979">
-<!ENTITY size-grc "106">
+<!ENTITY size-graphicsmagick "5158">
+<!ENTITY size-grc "188">
 <!ENTITY size-groff "9389">
-<!ENTITY size-grublegacy "710">
+<!ENTITY size-grublegacy "719">
 <!ENTITY size-grubpc "584">
 <!ENTITY size-grubrescuepc "6288">
 <!ENTITY size-gsfonts "4439">
@ -256,13 +254,13 @@
 <!ENTITY size-gtkam "1154">
 <!ENTITY size-guessnet "422">
 <!ENTITY size-guilt "146">
-<!ENTITY size-guymager "1044">
-<!ENTITY size-gwenview "10871">
+<!ENTITY size-guymager "1051">
+<!ENTITY size-gwenview "11261">
 <!ENTITY size-gzip "231">
 <!ENTITY size-gzrt "57">
-<!ENTITY size-hdparm "247">
+<!ENTITY size-hdparm "248">
 <!ENTITY size-helpcman "464">
-<!ENTITY size-hexedit "62">
+<!ENTITY size-hexedit "63">
 <!ENTITY size-hfsprogs "303">
 <!ENTITY size-hfsutils "1771">
 <!ENTITY size-highlight "1028">
@ -271,8 +269,8 @@
 <!ENTITY size-htmlctext "257">
 <!ENTITY size-ibus "45177">
 <!ENTITY size-ibusanthy "8450">
-<!ENTITY size-ibuschewing "401">
-<!ENTITY size-ibushangul "206">
+<!ENTITY size-ibuschewing "400">
+<!ENTITY size-ibushangul "214">
 <!ENTITY size-ibuskkc "205">
 <!ENTITY size-ibusmbhn "121">
 <!ENTITY size-ibusmozc "927">
@ -285,36 +283,36 @@
 <!ENTITY size-icmpinfo "39">
 <!ENTITY size-icoutils "192">
 <!ENTITY size-ifmetric "36">
-<!ENTITY size-ifplugd "214">
+<!ENTITY size-ifplugd "209">
 <!ENTITY size-ifrename "122">
 <!ENTITY size-ifscheme "58">
 <!ENTITY size-ifstat "56">
-<!ENTITY size-iftop "93">
-<!ENTITY size-ifupdown "203">
+<!ENTITY size-iftop "94">
+<!ENTITY size-ifupdown "206">
 <!ENTITY size-ifupdownextra "100">
 <!ENTITY size-imageindex "144">
 <!ENTITY size-imagemagick "207">
 <!ENTITY size-imediffc "34">
 <!ENTITY size-impose "180">
-<!ENTITY size-inetutilsping "336">
+<!ENTITY size-inetutilsping "337">
 <!ENTITY size-infocman "134">
 <!ENTITY size-infocwww "156">
 <!ENTITY size-initramfstools "105">
 <!ENTITY size-initscripts "205">
 <!ENTITY size-initsystemhelpers "129">
-<!ENTITY size-inkscape "126054">
+<!ENTITY size-inkscape "77572">
 <!ENTITY size-insserv "140">
 <!ENTITY size-integrit "313">
 <!ENTITY size-intelcgas "174">
 <!ENTITY size-iperf "168">
 <!ENTITY size-ipfm "78">
-<!ENTITY size-iproutec "2057">
+<!ENTITY size-iproutec "2124">
 <!ENTITY size-iptables "1543">
 <!ENTITY size-iptstate "116">
-<!ENTITY size-iputilsarping "58">
-<!ENTITY size-iputilsping "111">
-<!ENTITY size-iputilstracepath "75">
-<!ENTITY size-isag "109">
+<!ENTITY size-iputilsarping "51">
+<!ENTITY size-iputilsping "100">
+<!ENTITY size-iputilstracepath "68">
+<!ENTITY size-isag "110">
 <!ENTITY size-iscdhcpclient "649">
 <!ENTITY size-iscdhcpserver "1388">
 <!ENTITY size-jackd "32">
@ -322,62 +320,61 @@
 <!ENTITY size-jhead "105">
 <!ENTITY size-john "449">
 <!ENTITY size-kamera "748">
-<!ENTITY size-karbon "4186">
+<!ENTITY size-karbon "4187">
 <!ENTITY size-kexectools "270">
 <!ENTITY size-kexi "7475">
 <!ENTITY size-kmail "17210">
-<!ENTITY size-kmtrace "351">
 <!ENTITY size-kmymoney "12342">
 <!ENTITY size-knockd "89">
-<!ENTITY size-konqueror "20672">
+<!ENTITY size-konqueror "20724">
 <!ENTITY size-kontact "2047">
 <!ENTITY size-konwert "123">
 <!ENTITY size-kpartx "84">
 <!ENTITY size-ksh "3276">
 <!ENTITY size-latexcrtf "478">
-<!ENTITY size-ldaputils "680">
-<!ENTITY size-ldm "413">
+<!ENTITY size-ldaputils "687">
+<!ENTITY size-ldm "414">
 <!ENTITY size-leaktracer "56">
-<!ENTITY size-lftp "2198">
+<!ENTITY size-lftp "2199">
 <!ENTITY size-libaudioc "161">
 <!ENTITY size-libcg "11401">
 <!ENTITY size-libcgdev "18102">
 <!ENTITY size-libdmallocf "360">
 <!ENTITY size-libfreetypeg "920">
-<!ENTITY size-libgstreamerbaa "4993">
+<!ENTITY size-libgstreamerbaa "5006">
 <!ENTITY size-libjacka "337">
-<!ENTITY size-libncursesfdev "993">
+<!ENTITY size-libncursesfdev "6">
 <!ENTITY size-libnssldap "255">
 <!ENTITY size-libnssldapd "146">
-<!ENTITY size-libnssmdns "107">
+<!ENTITY size-libnssmdns "119">
 <!ENTITY size-libpamcracklib "114">
 <!ENTITY size-libpamdoc "1020">
 <!ENTITY size-libpamldap "244">
 <!ENTITY size-libpammodules "870">
 <!ENTITY size-libpamshield "107">
-<!ENTITY size-libpamsystemd "354">
+<!ENTITY size-libpamsystemd "369">
 <!ENTITY size-libphonone "672">
-<!ENTITY size-libpopplerhd "3310">
-<!ENTITY size-libpopplerglibi "446">
-<!ENTITY size-libpulsea "986">
-<!ENTITY size-librecad "8039">
-<!ENTITY size-libreofficebase "8928">
-<!ENTITY size-libreofficecalc "28663">
-<!ENTITY size-libreofficedraw "9889">
-<!ENTITY size-libreofficeimpress "3798">
-<!ENTITY size-libreofficemath "1625">
-<!ENTITY size-libreofficewriter "31656">
-<!ENTITY size-libvirtclients "1942">
+<!ENTITY size-libpopplerhe "3330">
+<!ENTITY size-libpopplerglibi "447">
+<!ENTITY size-libpulsea "952">
+<!ENTITY size-librecad "7929">
+<!ENTITY size-libreofficebase "8930">
+<!ENTITY size-libreofficecalc "28669">
+<!ENTITY size-libreofficedraw "9896">
+<!ENTITY size-libreofficeimpress "3799">
+<!ENTITY size-libreofficemath "1626">
+<!ENTITY size-libreofficewriter "31679">
+<!ENTITY size-libvirtclients "1946">
 <!ENTITY size-libwmfbin "104">
 <!ENTITY size-libxftc "122">
-<!ENTITY size-libxmlcutils "167">
+<!ENTITY size-libxmlcutils "169">
 <!ENTITY size-lilo "693">
 <!ENTITY size-linklint "343">
 <!ENTITY size-links "2123">
 <!ENTITY size-linksc "5366">
 <!ENTITY size-lmodern "33270">
-<!ENTITY size-loadlin "84">
-<!ENTITY size-logcheck "152">
+<!ENTITY size-loadlin "83">
+<!ENTITY size-logcheck "100">
 <!ENTITY size-logwatch "2214">
 <!ENTITY size-lpr "324">
 <!ENTITY size-lprng "3852">
@ -392,9 +389,9 @@
 <!ENTITY size-macutils "298">
 <!ENTITY size-magicrescue "224">
 <!ENTITY size-mailagent "1283">
-<!ENTITY size-maildrop "1093">
+<!ENTITY size-maildrop "1140">
 <!ENTITY size-mailfilter "271">
-<!ENTITY size-maintguide "987">
+<!ENTITY size-maintguide "986">
 <!ENTITY size-make "1292">
 <!ENTITY size-makepatch "102">
 <!ENTITY size-manchtml "141">
@ -402,42 +399,41 @@
 <!ENTITY size-masqmail "337">
 <!ENTITY size-mawk "183">
 <!ENTITY size-mbr "50">
-<!ENTITY size-mc "1428">
-<!ENTITY size-meld "3116">
+<!ENTITY size-mc "1434">
+<!ENTITY size-meld "2898">
 <!ENTITY size-memtestig "2391">
 <!ENTITY size-menu "1435">
 <!ENTITY size-menuxdg "76">
-<!ENTITY size-mercurial "552">
-<!ENTITY size-mew "2328">
+<!ENTITY size-mercurial "775">
+<!ENTITY size-mew "2322">
 <!ENTITY size-mgetty "301">
 <!ENTITY size-mingetty "35">
 <!ENTITY size-mksh "1339">
 <!ENTITY size-mmdd "4047">
 <!ENTITY size-monotone "5815">
 <!ENTITY size-moreutils "205">
-<!ENTITY size-mozillaplugingnash "39">
 <!ENTITY size-mpack "91">
-<!ENTITY size-mpop "222">
-<!ENTITY size-msmtp "260">
-<!ENTITY size-msmtpmta "35">
+<!ENTITY size-mpop "226">
+<!ENTITY size-msmtp "303">
+<!ENTITY size-msmtpmta "30">
 <!ENTITY size-mtools "361">
-<!ENTITY size-mtr "190">
-<!ENTITY size-mtrtiny "140">
-<!ENTITY size-mutt "5952">
-<!ENTITY size-myrescue "38">
+<!ENTITY size-mtr "191">
+<!ENTITY size-mtrtiny "141">
+<!ENTITY size-mutt "5980">
+<!ENTITY size-myrescue "63">
 <!ENTITY size-nas "239">
-<!ENTITY size-ncftp "1506">
+<!ENTITY size-ncftp "1486">
 <!ENTITY size-ncurseshexedit "132">
 <!ENTITY size-netatalk "3923">
 <!ENTITY size-netcat "16">
 <!ENTITY size-netpbm "4302">
 <!ENTITY size-nettools "932">
-<!ENTITY size-networkmanager "10898">
-<!ENTITY size-networkmanagergnome "5831">
+<!ENTITY size-networkmanager "10910">
+<!ENTITY size-networkmanagergnome "5811">
 <!ENTITY size-nfscommon "722">
 <!ENTITY size-nfskernelserver "321">
-<!ENTITY size-nkf "347">
-<!ENTITY size-nmap "4740">
+<!ENTITY size-nkf "346">
+<!ENTITY size-nmap "4530">
 <!ENTITY size-ntfsdg "1355">
 <!ENTITY size-ntopng "1343">
 <!ENTITY size-nullmailer "435">
@ -450,79 +446,78 @@
 <!ENTITY size-openjade "988">
 <!ENTITY size-opensshclient "4034">
 <!ENTITY size-opensshserver "881">
-<!ENTITY size-openssl "1305">
-<!ENTITY size-osscompat "7">
+<!ENTITY size-openssl "1306">
+<!ENTITY size-osscompat "20">
 <!ENTITY size-outguess "216">
 <!ENTITY size-phzip "986">
 <!ENTITY size-phzipfull "4659">
-<!ENTITY size-pandoc "50901">
+<!ENTITY size-pandoc "115026">
 <!ENTITY size-paperkey "55">
 <!ENTITY size-parc "246">
-<!ENTITY size-parted "278">
+<!ENTITY size-parted "279">
 <!ENTITY size-patch "235">
 <!ENTITY size-patchutils "223">
 <!ENTITY size-pax "175">
-<!ENTITY size-pbuilder "958">
+<!ENTITY size-pbuilder "959">
 <!ENTITY size-pciutils "1220">
-<!ENTITY size-pcmciautils "94">
+<!ENTITY size-pcmciautils "90">
 <!ENTITY size-pdfcsvg "26">
 <!ENTITY size-pdftk "3873">
 <!ENTITY size-pdftoipe "62">
 <!ENTITY size-perl "568">
 <!ENTITY size-pflogsumm "111">
-<!ENTITY size-planner "1170">
+<!ENTITY size-planner "1178">
 <!ENTITY size-popplerdata "12219">
 <!ENTITY size-popplerutils "592">
 <!ENTITY size-posh "186">
 <!ENTITY size-poster "49">
-<!ENTITY size-postfix "3966">
+<!ENTITY size-postfix "3967">
 <!ENTITY size-postfixdoc "4099">
-<!ENTITY size-powertop "612">
+<!ENTITY size-powertop "604">
 <!ENTITY size-ppp "940">
 <!ENTITY size-pppconfig "805">
 <!ENTITY size-pppoeconf "290">
-<!ENTITY size-printerdrivergutenprint "881">
-<!ENTITY size-procinfo "122">
+<!ENTITY size-printerdrivergutenprint "882">
+<!ENTITY size-procinfo "123">
 <!ENTITY size-procmail "300">
-<!ENTITY size-procps "720">
+<!ENTITY size-procps "729">
 <!ENTITY size-proftpdbasic "5028">
 <!ENTITY size-psceps "94">
-<!ENTITY size-psmisc "526">
-<!ENTITY size-pstoedit "667">
+<!ENTITY size-psmisc "527">
+<!ENTITY size-pstoedit "984">
 <!ENTITY size-pstotext "126">
 <!ENTITY size-psutils "219">
-<!ENTITY size-pulseaudio "6102">
+<!ENTITY size-pulseaudio "6137">
 <!ENTITY size-pybootchartgui "177">
-<!ENTITY size-pylint "2634">
-<!ENTITY size-python "624">
+<!ENTITY size-pylint "2648">
+<!ENTITY size-python "68">
 <!ENTITY size-pythondocutils "1752">
-<!ENTITY size-qemu "673">
-<!ENTITY size-qemukvm "101">
-<!ENTITY size-qemusystem "92">
-<!ENTITY size-qemuuser "61611">
-<!ENTITY size-qemuutils "5418">
-<!ENTITY size-quilt "711">
+<!ENTITY size-qemu "93">
+<!ENTITY size-qemukvm "103">
+<!ENTITY size-qemusystem "94">
+<!ENTITY size-qemuuser "73104">
+<!ENTITY size-qemuutils "6179">
+<!ENTITY size-quilt "784">
 <!ENTITY size-rc "154">
 <!ENTITY size-rcs "539">
 <!ENTITY size-rdiffbackup "704">
-<!ENTITY size-readpst "NOT_FOUND">
 <!ENTITY size-recode "608">
 <!ENTITY size-reisereprogs "1325">
 <!ENTITY size-reiserfsprogs "891">
 <!ENTITY size-restcweb "527">
-<!ENTITY size-restic "15987">
+<!ENTITY size-restic "16357">
 <!ENTITY size-rsnapshot "452">
 <!ENTITY size-rsync "691">
 <!ENTITY size-ruby "37">
-<!ENTITY size-samba "10995">
+<!ENTITY size-samba "15787">
 <!ENTITY size-sarg "429">
-<!ENTITY size-sash "969">
-<!ENTITY size-saslcbin "410">
+<!ENTITY size-sash "1037">
+<!ENTITY size-saslcbin "414">
 <!ENTITY size-sbuild "285">
 <!ENTITY size-scalpel "82">
-<!ENTITY size-schroot "2659">
-<!ENTITY size-screen "987">
-<!ENTITY size-scribus "19061">
+<!ENTITY size-schroot "2691">
+<!ENTITY size-screen "988">
+<!ENTITY size-scribus "19090">
 <!ENTITY size-scrot "50">
 <!ENTITY size-scroungentfs "45">
 <!ENTITY size-scsitools "365">
@ -540,7 +535,7 @@
 <!ENTITY size-shorewalllite "76">
 <!ENTITY size-shotwell "6635">
 <!ENTITY size-sisu "5341">
-<!ENTITY size-slbackup "146">
+<!ENTITY size-slbackup "153">
 <!ENTITY size-sleepd "79">
 <!ENTITY size-sleuthkit "1113">
 <!ENTITY size-smartmontools "1716">
@ -550,7 +545,7 @@
 <!ENTITY size-splint "2239">
 <!ENTITY size-squid "7112">
 <!ENTITY size-squidd "163">
-<!ENTITY size-squidview "192">
+<!ENTITY size-squidview "189">
 <!ENTITY size-srcctex "622">
 <!ENTITY size-ssft "75">
 <!ENTITY size-sshaskpass "101">
@ -558,104 +553,104 @@
 <!ENTITY size-ssmtp "2">
 <!ENTITY size-stgit "1535">
 <!ENTITY size-strace "1399">
-<!ENTITY size-stunnele "461">
+<!ENTITY size-stunnele "472">
 <!ENTITY size-stxcany "264">
-<!ENTITY size-subversion "4678">
-<!ENTITY size-sudo "3178">
-<!ENTITY size-susvc "15">
-<!ENTITY size-susvd "15">
+<!ENTITY size-subversion "4749">
+<!ENTITY size-sudo "3578">
+<!ENTITY size-susvc "16">
+<!ENTITY size-susvd "16">
 <!ENTITY size-swatch "100">
 <!ENTITY size-synaptic "7794">
 <!ENTITY size-syslinux "299">
 <!ENTITY size-syslogsummary "30">
-<!ENTITY size-sysstat "1454">
-<!ENTITY size-systemd "11936">
+<!ENTITY size-sysstat "1463">
+<!ENTITY size-systemd "11844">
 <!ENTITY size-systemdbootchart "123">
 <!ENTITY size-systemdcron "135">
-<!ENTITY size-systemdsysv "113">
+<!ENTITY size-systemdsysv "114">
 <!ENTITY size-sysvinitcore "225">
 <!ENTITY size-sysvinitutils "110">
 <!ENTITY size-sysvrc "123">
 <!ENTITY size-tbcyrillic "4884">
-<!ENTITY size-tar "2770">
+<!ENTITY size-tar "2872">
 <!ENTITY size-taskgnomedesktop "6">
 <!ENTITY size-taskkdedesktop "6">
 <!ENTITY size-tasklxdedesktop "6">
-<!ENTITY size-tasksel "375">
+<!ENTITY size-tasksel "376">
 <!ENTITY size-taskxfcedesktop "6">
 <!ENTITY size-tcl "21">
 <!ENTITY size-tcpdump "1192">
 <!ENTITY size-tcptrace "392">
 <!ENTITY size-tcs "479">
-<!ENTITY size-tcsh "1306">
+<!ENTITY size-tcsh "1311">
 <!ENTITY size-telnet "157">
 <!ENTITY size-telnetd "103">
 <!ENTITY size-telnetdssl "154">
 <!ENTITY size-telnetssl "208">
-<!ENTITY size-tesseractocr "1032">
+<!ENTITY size-tesseractocr "1044">
 <!ENTITY size-tesseractocreng "4032">
-<!ENTITY size-testdisk "1315">
+<!ENTITY size-testdisk "1319">
 <!ENTITY size-texichtml "1832">
 <!ENTITY size-texlive "69">
-<!ENTITY size-thunderbird "107236">
+<!ENTITY size-thunderbird "107302">
 <!ENTITY size-tidy "83">
 <!ENTITY size-tiger "2485">
 <!ENTITY size-time "82">
 <!ENTITY size-tk "21">
 <!ENTITY size-tkcvs "1498">
 <!ENTITY size-tla "1011">
-<!ENTITY size-tmux "659">
+<!ENTITY size-tmux "673">
 <!ENTITY size-tnef "98">
 <!ENTITY size-tofrodos "51">
 <!ENTITY size-traceroute "154">
-<!ENTITY size-tripwire "11480">
+<!ENTITY size-tripwire "12166">
 <!ENTITY size-trueprint "138">
-<!ENTITY size-tshark "383">
+<!ENTITY size-tshark "395">
 <!ENTITY size-ttfmscorefontsinstaller "92">
-<!ENTITY size-ttfunifont "16943">
+<!ENTITY size-ttfunifont "17016">
 <!ENTITY size-txtchtml "296">
 <!ENTITY size-txtcman "65">
-<!ENTITY size-txtctags "951">
+<!ENTITY size-txtctags "813">
 <!ENTITY size-udo "564">
 <!ENTITY size-unaccent "29">
-<!ENTITY size-unattendedupgrades "252">
+<!ENTITY size-unattendedupgrades "263">
 <!ENTITY size-unhtml "42">
-<!ENTITY size-unison "3452">
+<!ENTITY size-unison "3457">
 <!ENTITY size-unpaper "453">
 <!ENTITY size-unrtf "145">
 <!ENTITY size-unzip "534">
 <!ENTITY size-usbutils "721">
 <!ENTITY size-uswsusp "699">
-<!ENTITY size-utillinux "3328">
+<!ENTITY size-utillinux "3366">
 <!ENTITY size-uudeview "101">
-<!ENTITY size-valgrind "72217">
+<!ENTITY size-valgrind "72218">
 <!ENTITY size-vdmfec "97">
-<!ENTITY size-vim "2660">
-<!ENTITY size-vimruntime "28409">
-<!ENTITY size-vimtiny "1241">
-<!ENTITY size-virtmanager "7722">
-<!ENTITY size-virtualbox "76054">
+<!ENTITY size-vim "2668">
+<!ENTITY size-vimruntime "29056">
+<!ENTITY size-vimtiny "1265">
+<!ENTITY size-virtmanager "7771">
+<!ENTITY size-virtualbox "76179">
 <!ENTITY size-vzctl "1060">
 <!ENTITY size-vzquota "221">
-<!ENTITY size-wdm "2302">
-<!ENTITY size-wdiff "643">
+<!ENTITY size-wdm "2303">
+<!ENTITY size-wdiff "644">
 <!ENTITY size-wdm "876">
-<!ENTITY size-weblintperl "36">
-<!ENTITY size-wget "3069">
-<!ENTITY size-whiptail "70">
+<!ENTITY size-weblintperl "35">
+<!ENTITY size-wget "3044">
+<!ENTITY size-whiptail "74">
 <!ENTITY size-whois "338">
 <!ENTITY size-wicd "35">
 <!ENTITY size-wicdcli "59">
 <!ENTITY size-wicdcurses "175">
-<!ENTITY size-wicddaemon "954">
+<!ENTITY size-wicddaemon "962">
 <!ENTITY size-wicdgtk "574">
-<!ENTITY size-wiggle "166">
-<!ENTITY size-wine "184">
+<!ENTITY size-wiggle "167">
+<!ENTITY size-wine "186">
 <!ENTITY size-wirelesstools "286">
-<!ENTITY size-wireshark "67">
+<!ENTITY size-wireshark "70">
 <!ENTITY size-wpcx "215">
 <!ENTITY size-wpagui "762">
-<!ENTITY size-wpasupplicant "2668">
+<!ENTITY size-wpasupplicant "2669">
 <!ENTITY size-wv "717">
 <!ENTITY size-wvdial "276">
 <!ENTITY size-xbbcommon "305">
@ -663,12 +658,12 @@
 <!ENTITY size-xbbxserverutils "511">
 <!ENTITY size-xbaseclients "46">
 <!ENTITY size-xclip "55">
-<!ENTITY size-xdgutils "325">
+<!ENTITY size-xdgutils "327">
 <!ENTITY size-xdm "665">
 <!ENTITY size-xentools "666">
 <!ENTITY size-xfig "1792">
 <!ENTITY size-xfontsutils "415">
-<!ENTITY size-xfsdump "838">
+<!ENTITY size-xfsdump "834">
 <!ENTITY size-xfsprogs "4664">
 <!ENTITY size-xgridfit "876">
 <!ENTITY size-xmlto "126">
@ -677,7 +672,7 @@
 <!ENTITY size-xsane "909">
 <!ENTITY size-xsel "51">
 <!ENTITY size-xserverxorg "238">
-<!ENTITY size-xsltproc "149">
+<!ENTITY size-xsltproc "154">
 <!ENTITY size-xtrace "333">
 <!ENTITY size-xutilsdev "1466">
 <!ENTITY size-xzutils "515">
@ -686,4 +681,4 @@
 <!ENTITY size-zenmap "2936">
 <!ENTITY size-zerofree "25">
 <!ENTITY size-zip "608">
-<!ENTITY size-zsh "2206">
+<!ENTITY size-zsh "2208">
--- a/po/de.po
+++ b/po/de.po
@ -8070,7 +8070,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
@ -8085,7 +8085,7 @@ msgstr ""
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> und kann sogar noch "
 "weiter aufgebohrt werden, indem \"<literal>eval $(lesspipe)</literal>\" oder "
 "\"<literal>eval $(lessfile)</literal>\" im Shell-Startskript ausgeführt "
-"wird. Weiteres dazu finden Sie in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"wird. Weiteres dazu finden Sie in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\". Die Option \"<literal>-R</literal>\" erlaubt die Ausgabe von "
 "Rohformat-Zeichen und aktiviert ANSI-Color-Escape-Sequenzen. Lesen Sie dazu "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
--- a/po/es.po
+++ b/po/es.po
@ -8057,7 +8057,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
@ -8071,7 +8071,7 @@ msgstr ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> y puede ser mejorado ejecutando «<literal>eval $(lesspipe)</"
 "literal>» o «<literal>eval $(lessfile)</literal>» en el archivo de órdenes "
-"de inicio. Consulte «<literal>/usr/share/doc/lessf/LESSOPEN</literal>». La "
+"de inicio. Consulte «<literal>/usr/share/doc/less/LESSOPEN</literal>». La "
 "opción «<literal>-R</literal>» permite la salida en crudo y permite las "
 "secuencias de escape ANSI coloreadas. Consulte "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
--- a/po/fi.po
+++ b/po/fi.po
@ -6603,7 +6603,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
--- a/po/fr.po
+++ b/po/fr.po
@ -8747,7 +8747,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
@ -8763,7 +8763,7 @@ msgstr ""
 "$(lesspipe)</literal>&nbsp;» ou «&nbsp;<literal>eval $(lessfile)</"
 "literal>&nbsp;» dans le script de démarrage de l’interpréteur de commandes. "
 "Vous trouverez davantage d’informations dans «&nbsp;<literal>/usr/share/doc/"
-"lessf/LESSOPEN</literal>&nbsp;». L’option «&nbsp;<literal>-R</"
+"less/LESSOPEN</literal>&nbsp;». L’option «&nbsp;<literal>-R</"
 "literal>&nbsp;» permet la sortie en mode caractères bruts et permet les "
 "séquences d’échappement de couleurs ANSI. Consultez "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
--- a/po/id.po
+++ b/po/id.po
@ -7111,7 +7111,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
--- a/po/it.po
+++ b/po/it.po
@ -8092,7 +8092,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
@ -8105,7 +8105,7 @@ msgstr ""
 "manvolnum></citerefentry> e può essere fornito di superpoteri eseguendo "
 "\"<literal>eval $(lesspipe)</literal>\" o \"<literal>eval $(lessfile)</"
 "literal>\" nello script di avvio della shell. Vedere ulteriori informazioni "
-"in \"<literal>/usr/share/doc/lessf/LESSOPEN</literal>\". L'opzione "
+"in \"<literal>/usr/share/doc/less/LESSOPEN</literal>\". L'opzione "
 "\"<literal>-R</literal>\" permette output raw e abilita le sequenze di "
 "escape ANSI per i colori. Vedere <citerefentry><refentrytitle>less</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
--- a/po/ja.po
+++ b/po/ja.po
@ -7914,7 +7914,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
@ -7928,7 +7928,7 @@ msgstr ""
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> よりもはるかに高機能"
 "で、\"<literal>eval $(lesspipe)</literal>\" または \"<literal>eval "
 "$(lessfile)</literal>\" をシェルのスタートスクリプト中で実行することで更に機"
-"能が拡充されます。詳しくは、\"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"能が拡充されます。詳しくは、\"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\" を参照下さい。\"<literal>-R</literal>\" オプションを用いると、生の"
 "文字出力やANSI カラーエスケープシーケンスが有効になります。"
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
--- a/po/nb.po
+++ b/po/nb.po
@ -6829,7 +6829,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
--- a/po/pt.po
+++ b/po/pt.po
@ -8231,7 +8231,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
@ -8246,7 +8246,7 @@ msgstr ""
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> e pode ser ampliado ao "
 "executar \"<literal>eval $(lesspipe)</literal>\" ou \"<literal>eval "
 "$(lessfile)</literal>\" no script de arranque de shell. Veja mais em "
-"\"<literal>/usr/share/doc/lessf/LESSOPEN</literal>\". A opção \"<literal>-R</"
+"\"<literal>/usr/share/doc/less/LESSOPEN</literal>\". A opção \"<literal>-R</"
 "literal>\" permite saída em caracteres em bruto e activa sequências de "
 "escape de cores ANSI. Veja <citerefentry><refentrytitle>less</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
--- a/po/zh-cn.po
+++ b/po/zh-cn.po
@ -7629,7 +7629,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
@ -7642,7 +7642,7 @@ msgstr ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> 命令更丰富，通过在脚本的开头执行 \"<literal>eval $(lesspipe)</"
 "literal>\" 或 \"<literal>eval $(lessfile)</literal>\" 它的功能还能变得更加强"
-"大。详细请参考 \"<literal>/usr/share/doc/lessf/LESSOPEN</literal>\"。 "
+"大。详细请参考 \"<literal>/usr/share/doc/less/LESSOPEN</literal>\"。 "
 "\"<literal>-R</literal>\" 选项可以实现原始的字符输出还可以启用 ANSI 颜色转义"
 "序列。详细请参考 <citerefentry><refentrytitle>less</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>。"
--- a/po/zh-tw.po
+++ b/po/zh-tw.po
@ -7626,7 +7626,7 @@ msgid ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and can be supercharged by executing \"<literal>eval "
 "$(lesspipe)</literal>\" or \"<literal>eval $(lessfile)</literal>\" in the "
-"shell startup script. See more in \"<literal>/usr/share/doc/lessf/LESSOPEN</"
+"shell startup script. See more in \"<literal>/usr/share/doc/less/LESSOPEN</"
 "literal>\".  The \"<literal>-R</literal>\" option allows raw character "
 "output and enables ANSI color escape sequences.  See "
 "<citerefentry><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></"
@ -7639,7 +7639,7 @@ msgstr ""
 "<citerefentry><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> 命令更豐富，通過在指令碼的開頭執行 \"<literal>eval "
 "$(lesspipe)</literal>\" 或 \"<literal>eval $(lessfile)</literal>\" 它的功能還"
-"能變得更加強大。詳細請參考 \"<literal>/usr/share/doc/lessf/LESSOPEN</literal>"
+"能變得更加強大。詳細請參考 \"<literal>/usr/share/doc/less/LESSOPEN</literal>"
 "\"。 \"<literal>-R</literal>\" 選項可以實現原始的字元輸出還可以啟用 ANSI 顏色"
 "轉義序列。詳細請參考 <citerefentry><refentrytitle>less</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>。"
--- a/popcon.ent
+++ b/popcon.ent
--- a/xslt/table.xsl
+++ b/xslt/table.xsl
@ -54,7 +54,7 @@ Process raw XML file:
    <xsl:when test="contains(., '@-@popcon1@-@')">
      <!-- column 2 is popcon -->
      <xsl:copy>
-      <xsl:text disable-output-escaping="yes">&lt;ulink url="http://qa.debian.org/popcon.php?package=</xsl:text><xsl:value-of select='normalize-space(../entry[1])'/><xsl:text disable-output-escaping="yes">"&gt;@-@amp@-@pop-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[1]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
+      <xsl:text disable-output-escaping="yes">&lt;ulink url="http://qa.debian.org/popcon-graph.php?packages=</xsl:text><xsl:value-of select='normalize-space(../entry[1])'/><xsl:text disable-output-escaping="yes">"&gt;@-@amp@-@pop-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[1]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
      </xsl:copy>
    </xsl:when>
    <xsl:otherwise>
@ -71,7 +71,7 @@ Process raw XML file:
    <xsl:when test="contains(., '@-@popcon2@-@')">
      <!-- column 3 is popcon -->
      <xsl:copy>
-      <xsl:text disable-output-escaping="yes">&lt;ulink url="http://qa.debian.org/popcon.php?package=</xsl:text><xsl:value-of select='normalize-space(../entry[2])'/><xsl:text disable-output-escaping="yes">"&gt;@-@amp@-@pop-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[2]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
+      <xsl:text disable-output-escaping="yes">&lt;ulink url="http://qa.debian.org/popcon-graph.php?packages=</xsl:text><xsl:value-of select='normalize-space(../entry[2])'/><xsl:text disable-output-escaping="yes">"&gt;@-@amp@-@pop-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[2]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
      </xsl:copy>
    </xsl:when>
    <xsl:when test="contains(., '@-@psize1@-@')">