Diff of the two buildlogs:

--
--- b1/build.log	2023-06-09 16:31:14.795836646 +0000
+++ b2/build.log	2023-06-09 16:45:47.449700231 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Fri Jun  9 04:22:07 -12 2023
-I: pbuilder-time-stamp: 1686327727
+I: Current time: Sat Jun 10 06:32:20 +14 2023
+I: pbuilder-time-stamp: 1686328340
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz]
 I: copying local configuration
@@ -15,7 +15,7 @@
 I: copying [x11-apps_7.7+9.dsc]
 I: copying [./x11-apps_7.7+9.tar.gz]
 I: Extracting source
-gpgv: Signature made Thu Apr 21 05:07:01 2022 -12
+gpgv: Signature made Fri Apr 22 07:07:01 2022 +14
 gpgv:                using RSA key 752DE27C4DEB17019B4B6623CB703165A88984DC
 gpgv: Can't check signature: No public key
 dpkg-source: warning: cannot verify inline signature for ./x11-apps_7.7+9.dsc: no acceptable signature found
@@ -23,135 +23,167 @@
 dpkg-source: info: unpacking x11-apps_7.7+9.tar.gz
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/21032/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/32004/tmp/hooks/D01_modify_environment starting
+debug: Running on ff4a.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Jun 10 06:32 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/32004/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/32004/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='armhf'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3 '
-  DISTRIBUTION='bookworm'
-  HOME='/root'
-  HOST_ARCH='armhf'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="15" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf")
+  BASH_VERSION='5.2.15(1)-release'
+  BUILDDIR=/build
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=armhf
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4 '
+  DIRSTACK=()
+  DISTRIBUTION=bookworm
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=arm
+  HOST_ARCH=armhf
   IFS=' 	
   '
-  INVOCATION_ID='db20585888ce4cb9b549244acdf9bff1'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='21032'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=c9e5e3e6bb434730a45772ce77607085
+  LANG=C
+  LANGUAGE=it_CH:it
+  LC_ALL=C
+  MACHTYPE=arm-unknown-linux-gnueabihf
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnueabihf
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=32004
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.FLMddEGF/pbuilderrc_fBbM --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.FLMddEGF/b1 --logfile b1/build.log x11-apps_7.7+9.dsc'
-  SUDO_GID='114'
-  SUDO_UID='108'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://10.0.0.15:3142/'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.FLMddEGF/pbuilderrc_rSU7 --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.FLMddEGF/b2 --logfile b2/build.log --extrapackages usrmerge x11-apps_7.7+9.dsc'
+  SUDO_GID=113
+  SUDO_UID=107
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://10.0.0.15:3142/
 I: uname -a
-  Linux jtx1a 5.10.0-23-arm64 #1 SMP Debian 5.10.179-1 (2023-05-12) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 5.10.0-23-armmp-lpae #1 SMP Debian 5.10.179-1 (2023-05-12) armv7l GNU/Linux
 I: ls -l /bin
   total 5072
-  -rwxr-xr-x 1 root root 838488 Apr 23 09:24 bash
-  -rwxr-xr-x 3 root root  67144 Sep 18  2022 bunzip2
-  -rwxr-xr-x 3 root root  67144 Sep 18  2022 bzcat
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root   2225 Sep 18  2022 bzdiff
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root   4893 Nov 27  2021 bzexe
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root   3775 Sep 18  2022 bzgrep
-  -rwxr-xr-x 3 root root  67144 Sep 18  2022 bzip2
-  -rwxr-xr-x 1 root root  67112 Sep 18  2022 bzip2recover
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzless -> bzmore
-  -rwxr-xr-x 1 root root   1297 Sep 18  2022 bzmore
-  -rwxr-xr-x 1 root root  67632 Sep 20  2022 cat
-  -rwxr-xr-x 1 root root  67676 Sep 20  2022 chgrp
-  -rwxr-xr-x 1 root root  67644 Sep 20  2022 chmod
-  -rwxr-xr-x 1 root root  67684 Sep 20  2022 chown
-  -rwxr-xr-x 1 root root 133532 Sep 20  2022 cp
-  -rwxr-xr-x 1 root root 132868 Jan  5 01:20 dash
-  -rwxr-xr-x 1 root root 133220 Sep 20  2022 date
-  -rwxr-xr-x 1 root root  67732 Sep 20  2022 dd
-  -rwxr-xr-x 1 root root  68104 Sep 20  2022 df
-  -rwxr-xr-x 1 root root 133632 Sep 20  2022 dir
-  -rwxr-xr-x 1 root root  59128 Mar 22 21:02 dmesg
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 domainname -> hostname
-  -rwxr-xr-x 1 root root  67560 Sep 20  2022 echo
-  -rwxr-xr-x 1 root root     41 Jan 24 02:43 egrep
-  -rwxr-xr-x 1 root root  67548 Sep 20  2022 false
-  -rwxr-xr-x 1 root root     41 Jan 24 02:43 fgrep
-  -rwxr-xr-x 1 root root  55748 Mar 22 21:02 findmnt
-  -rwsr-xr-x 1 root root  26208 Mar 22 20:15 fusermount
-  -rwxr-xr-x 1 root root 128608 Jan 24 02:43 grep
-  -rwxr-xr-x 2 root root   2346 Apr  9  2022 gunzip
-  -rwxr-xr-x 1 root root   6447 Apr  9  2022 gzexe
-  -rwxr-xr-x 1 root root  64220 Apr  9  2022 gzip
-  -rwxr-xr-x 1 root root  67032 Dec 19 01:33 hostname
-  -rwxr-xr-x 1 root root  67720 Sep 20  2022 ln
-  -rwxr-xr-x 1 root root  35132 Mar 22 21:51 login
-  -rwxr-xr-x 1 root root 133632 Sep 20  2022 ls
-  -rwxr-xr-x 1 root root 136808 Mar 22 21:02 lsblk
-  -rwxr-xr-x 1 root root  67800 Sep 20  2022 mkdir
-  -rwxr-xr-x 1 root root  67764 Sep 20  2022 mknod
-  -rwxr-xr-x 1 root root  67596 Sep 20  2022 mktemp
-  -rwxr-xr-x 1 root root  38504 Mar 22 21:02 more
-  -rwsr-xr-x 1 root root  38496 Mar 22 21:02 mount
-  -rwxr-xr-x 1 root root   9824 Mar 22 21:02 mountpoint
-  -rwxr-xr-x 1 root root 133532 Sep 20  2022 mv
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root     14 Apr  2 18:25 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root  67608 Sep 20  2022 pwd
-  lrwxrwxrwx 1 root root      4 Apr 23 09:24 rbash -> bash
-  -rwxr-xr-x 1 root root  67600 Sep 20  2022 readlink
-  -rwxr-xr-x 1 root root  67672 Sep 20  2022 rm
-  -rwxr-xr-x 1 root root  67600 Sep 20  2022 rmdir
-  -rwxr-xr-x 1 root root  67400 Nov  2  2022 run-parts
-  -rwxr-xr-x 1 root root 133372 Jan  5 07:55 sed
-  lrwxrwxrwx 1 root root      4 Jan  5 01:20 sh -> dash
-  -rwxr-xr-x 1 root root  67584 Sep 20  2022 sleep
-  -rwxr-xr-x 1 root root  67644 Sep 20  2022 stty
-  -rwsr-xr-x 1 root root  50800 Mar 22 21:02 su
-  -rwxr-xr-x 1 root root  67584 Sep 20  2022 sync
-  -rwxr-xr-x 1 root root 336764 Apr  6 02:25 tar
-  -rwxr-xr-x 1 root root  67144 Nov  2  2022 tempfile
-  -rwxr-xr-x 1 root root 133224 Sep 20  2022 touch
-  -rwxr-xr-x 1 root root  67548 Sep 20  2022 true
-  -rwxr-xr-x 1 root root   9768 Mar 22 20:15 ulockmgr_server
-  -rwsr-xr-x 1 root root  22108 Mar 22 21:02 umount
-  -rwxr-xr-x 1 root root  67572 Sep 20  2022 uname
-  -rwxr-xr-x 2 root root   2346 Apr  9  2022 uncompress
-  -rwxr-xr-x 1 root root 133632 Sep 20  2022 vdir
-  -rwxr-xr-x 1 root root  42608 Mar 22 21:02 wdctl
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root   1984 Apr  9  2022 zcat
-  -rwxr-xr-x 1 root root   1678 Apr  9  2022 zcmp
-  -rwxr-xr-x 1 root root   6460 Apr  9  2022 zdiff
-  -rwxr-xr-x 1 root root     29 Apr  9  2022 zegrep
-  -rwxr-xr-x 1 root root     29 Apr  9  2022 zfgrep
-  -rwxr-xr-x 1 root root   2081 Apr  9  2022 zforce
-  -rwxr-xr-x 1 root root   8103 Apr  9  2022 zgrep
-  -rwxr-xr-x 1 root root   2206 Apr  9  2022 zless
-  -rwxr-xr-x 1 root root   1842 Apr  9  2022 zmore
-  -rwxr-xr-x 1 root root   4577 Apr  9  2022 znew
-I: user script /srv/workspace/pbuilder/21032/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 838488 Apr 24 11:24 bash
+  -rwxr-xr-x 3 root root  67144 Sep 19  2022 bunzip2
+  -rwxr-xr-x 3 root root  67144 Sep 19  2022 bzcat
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root   2225 Sep 19  2022 bzdiff
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root   4893 Nov 28  2021 bzexe
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root   3775 Sep 19  2022 bzgrep
+  -rwxr-xr-x 3 root root  67144 Sep 19  2022 bzip2
+  -rwxr-xr-x 1 root root  67112 Sep 19  2022 bzip2recover
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzless -> bzmore
+  -rwxr-xr-x 1 root root   1297 Sep 19  2022 bzmore
+  -rwxr-xr-x 1 root root  67632 Sep 21  2022 cat
+  -rwxr-xr-x 1 root root  67676 Sep 21  2022 chgrp
+  -rwxr-xr-x 1 root root  67644 Sep 21  2022 chmod
+  -rwxr-xr-x 1 root root  67684 Sep 21  2022 chown
+  -rwxr-xr-x 1 root root 133532 Sep 21  2022 cp
+  -rwxr-xr-x 1 root root 132868 Jan  6 03:20 dash
+  -rwxr-xr-x 1 root root 133220 Sep 21  2022 date
+  -rwxr-xr-x 1 root root  67732 Sep 21  2022 dd
+  -rwxr-xr-x 1 root root  68104 Sep 21  2022 df
+  -rwxr-xr-x 1 root root 133632 Sep 21  2022 dir
+  -rwxr-xr-x 1 root root  59128 Mar 23 23:02 dmesg
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 domainname -> hostname
+  -rwxr-xr-x 1 root root  67560 Sep 21  2022 echo
+  -rwxr-xr-x 1 root root     41 Jan 25 04:43 egrep
+  -rwxr-xr-x 1 root root  67548 Sep 21  2022 false
+  -rwxr-xr-x 1 root root     41 Jan 25 04:43 fgrep
+  -rwxr-xr-x 1 root root  55748 Mar 23 23:02 findmnt
+  -rwsr-xr-x 1 root root  26208 Mar 23 22:15 fusermount
+  -rwxr-xr-x 1 root root 128608 Jan 25 04:43 grep
+  -rwxr-xr-x 2 root root   2346 Apr 10  2022 gunzip
+  -rwxr-xr-x 1 root root   6447 Apr 10  2022 gzexe
+  -rwxr-xr-x 1 root root  64220 Apr 10  2022 gzip
+  -rwxr-xr-x 1 root root  67032 Dec 20 03:33 hostname
+  -rwxr-xr-x 1 root root  67720 Sep 21  2022 ln
+  -rwxr-xr-x 1 root root  35132 Mar 23 23:51 login
+  -rwxr-xr-x 1 root root 133632 Sep 21  2022 ls
+  -rwxr-xr-x 1 root root 136808 Mar 23 23:02 lsblk
+  -rwxr-xr-x 1 root root  67800 Sep 21  2022 mkdir
+  -rwxr-xr-x 1 root root  67764 Sep 21  2022 mknod
+  -rwxr-xr-x 1 root root  67596 Sep 21  2022 mktemp
+  -rwxr-xr-x 1 root root  38504 Mar 23 23:02 more
+  -rwsr-xr-x 1 root root  38496 Mar 23 23:02 mount
+  -rwxr-xr-x 1 root root   9824 Mar 23 23:02 mountpoint
+  -rwxr-xr-x 1 root root 133532 Sep 21  2022 mv
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root     14 Apr  3 20:25 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root  67608 Sep 21  2022 pwd
+  lrwxrwxrwx 1 root root      4 Apr 24 11:24 rbash -> bash
+  -rwxr-xr-x 1 root root  67600 Sep 21  2022 readlink
+  -rwxr-xr-x 1 root root  67672 Sep 21  2022 rm
+  -rwxr-xr-x 1 root root  67600 Sep 21  2022 rmdir
+  -rwxr-xr-x 1 root root  67400 Nov  3  2022 run-parts
+  -rwxr-xr-x 1 root root 133372 Jan  6 09:55 sed
+  lrwxrwxrwx 1 root root      9 Jun 10 06:32 sh -> /bin/bash
+  -rwxr-xr-x 1 root root  67584 Sep 21  2022 sleep
+  -rwxr-xr-x 1 root root  67644 Sep 21  2022 stty
+  -rwsr-xr-x 1 root root  50800 Mar 23 23:02 su
+  -rwxr-xr-x 1 root root  67584 Sep 21  2022 sync
+  -rwxr-xr-x 1 root root 336764 Apr  7 04:25 tar
+  -rwxr-xr-x 1 root root  67144 Nov  3  2022 tempfile
+  -rwxr-xr-x 1 root root 133224 Sep 21  2022 touch
+  -rwxr-xr-x 1 root root  67548 Sep 21  2022 true
+  -rwxr-xr-x 1 root root   9768 Mar 23 22:15 ulockmgr_server
+  -rwsr-xr-x 1 root root  22108 Mar 23 23:02 umount
+  -rwxr-xr-x 1 root root  67572 Sep 21  2022 uname
+  -rwxr-xr-x 2 root root   2346 Apr 10  2022 uncompress
+  -rwxr-xr-x 1 root root 133632 Sep 21  2022 vdir
+  -rwxr-xr-x 1 root root  42608 Mar 23 23:02 wdctl
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root   1984 Apr 10  2022 zcat
+  -rwxr-xr-x 1 root root   1678 Apr 10  2022 zcmp
+  -rwxr-xr-x 1 root root   6460 Apr 10  2022 zdiff
+  -rwxr-xr-x 1 root root     29 Apr 10  2022 zegrep
+  -rwxr-xr-x 1 root root     29 Apr 10  2022 zfgrep
+  -rwxr-xr-x 1 root root   2081 Apr 10  2022 zforce
+  -rwxr-xr-x 1 root root   8103 Apr 10  2022 zgrep
+  -rwxr-xr-x 1 root root   2206 Apr 10  2022 zless
+  -rwxr-xr-x 1 root root   1842 Apr 10  2022 zmore
+  -rwxr-xr-x 1 root root   4577 Apr 10  2022 znew
+I: user script /srv/workspace/pbuilder/32004/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -348,7 +380,7 @@
 Get: 113 http://deb.debian.org/debian bookworm/main armhf quilt all 0.67+really0.66-1 [303 kB]
 Get: 114 http://deb.debian.org/debian bookworm/main armhf xbitmaps all 1.1.1-2.2 [25.1 kB]
 Get: 115 http://deb.debian.org/debian bookworm/main armhf xutils-dev armhf 1:7.7+6 [239 kB]
-Fetched 33.1 MB in 1s (32.7 MB/s)
+Fetched 33.1 MB in 2s (16.4 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package sensible-utils.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19324 files and directories currently installed.)
@@ -828,10 +860,17 @@
 Reading package lists...
 Building dependency tree...
 Reading state information...
+usrmerge is already the newest version (35).
 fakeroot is already the newest version (1.31-1.2).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/x11-apps-7.7+9/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../x11-apps_7.7+9_source.changes
+I: user script /srv/workspace/pbuilder/32004/tmp/hooks/A99_set_merged_usr starting
+Re-configuring usrmerge...
+removed '/etc/unsupported-skip-usrmerge-conversion'
+The system has been successfully converted.
+I: user script /srv/workspace/pbuilder/32004/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/x11-apps-7.7+9/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../x11-apps_7.7+9_source.changes
 dpkg-buildpackage: info: source package x11-apps
 dpkg-buildpackage: info: source version 7.7+9
 dpkg-buildpackage: info: source distribution unstable
@@ -1333,7 +1372,7 @@
 	cd bitmap-build && ../bitmap/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -1367,7 +1406,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -1428,7 +1467,7 @@
 	cd ico-build && ../ico/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -1462,7 +1501,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -1516,7 +1555,7 @@
 	cd oclock-build && ../oclock/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -1550,7 +1589,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -1604,7 +1643,7 @@
 	cd rendercheck-build && ../rendercheck/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -1639,7 +1678,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -1694,7 +1733,7 @@
 	cd transset-build && ../transset/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -1728,7 +1767,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -1782,7 +1821,7 @@
 	cd x11perf-build && ../x11perf/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -1816,7 +1855,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -1875,7 +1914,7 @@
 	cd xbiff-build && ../xbiff/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -1909,7 +1948,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -1965,7 +2004,7 @@
 	cd xcalc-build && ../xcalc/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -1999,7 +2038,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2055,7 +2094,7 @@
 	cd xclipboard-build && ../xclipboard/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2090,7 +2129,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2145,7 +2184,7 @@
 	cd xclock-build && ../xclock/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2179,7 +2218,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2224,8 +2263,8 @@
 checking for shared library run path origin... done
 checking 32-bit host C ABI... yes
 checking how to run the C preprocessor... gcc -E
-checking for grep that handles long lines and -e... /bin/grep
-checking for egrep... /bin/grep -E
+checking for grep that handles long lines and -e... /usr/bin/grep
+checking for egrep... /usr/bin/grep -E
 checking for ELF binary format... yes
 checking for the common suffixes of directories in the library search path... lib,lib,lib
 checking for iconv... yes
@@ -2277,7 +2316,7 @@
 checking whether _XOPEN_SOURCE should be defined... no
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2292,7 +2331,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2375,7 +2414,7 @@
 checking whether _XOPEN_SOURCE should be defined... no
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2390,7 +2429,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2445,7 +2484,7 @@
 	cd xditview-build && ../xditview/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2479,7 +2518,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2535,7 +2574,7 @@
 	cd xedit-build && ../xedit/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2569,7 +2608,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2634,7 +2673,7 @@
 	cd xeyes-build && ../xeyes/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2668,7 +2707,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2724,7 +2763,7 @@
 	cd xgc-build && ../xgc/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2758,7 +2797,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2839,7 +2878,7 @@
 checking whether _XOPEN_SOURCE should be defined... no
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2854,7 +2893,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -2913,7 +2952,7 @@
 	cd xlogo-build && ../xlogo/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -2947,7 +2986,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -3002,7 +3041,7 @@
 	cd xmag-build && ../xmag/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -3036,7 +3075,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -3096,7 +3135,7 @@
 	cd xman-build && ../xman/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -3130,7 +3169,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -3189,7 +3228,7 @@
 	cd xmore-build && ../xmore/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -3223,7 +3262,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -3278,7 +3317,7 @@
 	cd xwd-build && ../xwd/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -3312,7 +3351,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -3366,7 +3405,7 @@
 	cd xwud-build && ../xwud/configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking --libdir=\${prefix}/lib --disable-silent-rules MANCONF=/etc/manpath.config MKTEMP=/bin/mktemp
 checking for a BSD-compatible install... /usr/bin/install -c
 checking whether build environment is sane... yes
-checking for a race-free mkdir -p... /bin/mkdir -p
+checking for a race-free mkdir -p... /usr/bin/mkdir -p
 checking for gawk... no
 checking for mawk... mawk
 checking whether make sets $(MAKE)... yes
@@ -3400,7 +3439,7 @@
 checking pkg-config is at least version 0.9.0... yes
 checking build system type... arm-unknown-linux-gnueabihf
 checking host system type... arm-unknown-linux-gnueabihf
-checking for a sed that does not truncate output... /bin/sed
+checking for a sed that does not truncate output... /usr/bin/sed
 checking if gcc supports -Werror=unknown-warning-option... no
 checking if gcc supports -Werror=unused-command-line-argument... no
 checking if gcc supports -Wall... yes
@@ -3451,20 +3490,21 @@
 make[1]: Entering directory '/build/x11-apps-7.7+9'
 mkdir -p stampdir
 dh_auto_build -Dbitmap -Bbitmap-build
-	cd bitmap-build && make -j3
+	cd bitmap-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/bitmap-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/bitmap-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/bitmap-build/man'
-/bin/sed -e 's|__vendorversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xorgversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../bitmap/man/bitmap.man > bitmap.1
-/bin/sed -e 's|__vendorversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xorgversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../bitmap/man/atobm.man > atobm.1
-/bin/sed -e 's|__vendorversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xorgversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../bitmap/man/bmtoa.man > bmtoa.1
+/usr/bin/sed -e 's|__vendorversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xorgversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../bitmap/man/bitmap.man > bitmap.1
+/usr/bin/sed -e 's|__vendorversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xorgversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../bitmap/man/atobm.man > atobm.1
+/usr/bin/sed -e 's|__vendorversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xorgversion__|"bitmap 1.0.9" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../bitmap/man/bmtoa.man > bmtoa.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/bitmap-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/bitmap-build'
 gcc -DHAVE_CONFIG_H -I. -I../bitmap   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bitmap-BitEdit.o `test -f 'BitEdit.c' || echo '../bitmap/'`BitEdit.c
 gcc -DHAVE_CONFIG_H -I. -I../bitmap   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bitmap-CutPaste.o `test -f 'CutPaste.c' || echo '../bitmap/'`CutPaste.c
 gcc -DHAVE_CONFIG_H -I. -I../bitmap   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bitmap-Graphics.o `test -f 'Graphics.c' || echo '../bitmap/'`Graphics.c
+gcc -DHAVE_CONFIG_H -I. -I../bitmap   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bitmap-ReqMach.o `test -f 'ReqMach.c' || echo '../bitmap/'`ReqMach.c
 ../bitmap/BitEdit.c:74:5: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    74 |   { "-axes",        "*bitmap.axes",         XrmoptionNoArg,     "True"},
       |     ^~~~~~~
@@ -3930,6 +3970,12 @@
 ../bitmap/Dialog.h:53:36: note: expected 'String' {aka 'char *'} but argument is of type 'const char *'
    53 | extern Dialog CreateDialog(Widget, String, unsigned long);
       |                                    ^~~~~~
+../bitmap/BitEdit.c:1114:45: warning: passing argument 2 of 'CreateDialog' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+ 1114 |     qsave_dialog = CreateDialog(top_widget, "qsave", Yes | No | Cancel);
+      |                                             ^~~~~~~
+../bitmap/Dialog.h:53:36: note: expected 'String' {aka 'char *'} but argument is of type 'const char *'
+   53 | extern Dialog CreateDialog(Widget, String, unsigned long);
+      |                                    ^~~~~~
 ../bitmap/Graphics.c: In function 'BWDrawCircle':
 ../bitmap/Graphics.c:430:35: warning: cast from function call of type 'double' to non-matching type 'short int' [-Wbad-function-cast]
   430 |         BWDrawPoint(w, origin_x - (Position) floor(radius), origin_y, value);
@@ -3937,12 +3983,6 @@
 ../bitmap/Graphics.c:431:35: warning: cast from function call of type 'double' to non-matching type 'short int' [-Wbad-function-cast]
   431 |         BWDrawPoint(w, origin_x + (Position) floor(radius), origin_y, value);
       |                                   ^
-../bitmap/BitEdit.c:1114:45: warning: passing argument 2 of 'CreateDialog' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
- 1114 |     qsave_dialog = CreateDialog(top_widget, "qsave", Yes | No | Cancel);
-      |                                             ^~~~~~~
-../bitmap/Dialog.h:53:36: note: expected 'String' {aka 'char *'} but argument is of type 'const char *'
-   53 | extern Dialog CreateDialog(Widget, String, unsigned long);
-      |                                    ^~~~~~
 ../bitmap/Graphics.c:432:45: warning: cast from function call of type 'double' to non-matching type 'short int' [-Wbad-function-cast]
   432 |         BWDrawPoint(w, origin_x, origin_y - (Position) floor(radius), value);
       |                                             ^
@@ -3959,7 +3999,6 @@
 ../bitmap/Graphics.c:466:21: warning: cast from function call of type 'double' to non-matching type 'short int' [-Wbad-function-cast]
   466 |     for(i = 1; i <= (Position) floor(radius); i++) {
       |                     ^
-gcc -DHAVE_CONFIG_H -I. -I../bitmap   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bitmap-ReqMach.o `test -f 'ReqMach.c' || echo '../bitmap/'`ReqMach.c
 gcc -DHAVE_CONFIG_H -I. -I../bitmap   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bitmap-Bitmap.o `test -f 'Bitmap.c' || echo '../bitmap/'`Bitmap.c
 ../bitmap/Bitmap.c:71:43: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    71 |      Offset(foreground_pixel), XtRString, XtDefaultForeground},
@@ -4104,6 +4143,7 @@
 ../bitmap/Bitmap.c:94:2: note: in expansion of macro 'XtNmargin'
    94 | {XtNmargin, XtCMargin, XtRDimension, sizeof(Dimension),
       |  ^~~~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../bitmap   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bitmap-Dialog.o `test -f 'Dialog.c' || echo '../bitmap/'`Dialog.c
 ../bitmap/Bitmap.h:99:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    99 | #define XtNxHot "xHot"
       |                 ^~~~~~
@@ -4434,7 +4474,6 @@
 ../bitmap/Bitmap.c:320:41: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   320 |     /* class_name               */      "Bitmap",
       |                                         ^~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../bitmap   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bitmap-Dialog.o `test -f 'Dialog.c' || echo '../bitmap/'`Dialog.c
 ../bitmap/Dialog.c:50:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    50 |   {"set-dialog-button", SetDialogButton},
       |    ^~~~~~~~~~~~~~~~~~~
@@ -4471,13 +4510,13 @@
 >stampdir/build-bitmap
 mkdir -p stampdir
 dh_auto_build -Dico -Bico-build
-	cd ico-build && make -j3
+	cd ico-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/ico-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/ico-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/ico-build/man'
-/bin/sed -e 's|__vendorversion__|"ico 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"ico 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../ico/man/ico.man > ico.1
+/usr/bin/sed -e 's|__vendorversion__|"ico 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"ico 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../ico/man/ico.man > ico.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/ico-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/ico-build'
 gcc -DHAVE_CONFIG_H -I. -I../ico   -Wdate-time -D_FORTIFY_SOURCE=2   -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o ico.o ../ico/ico.c
@@ -4516,13 +4555,13 @@
 >stampdir/build-ico
 mkdir -p stampdir
 dh_auto_build -Doclock -Boclock-build
-	cd oclock-build && make -j3
+	cd oclock-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/oclock-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/oclock-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/oclock-build/man'
-/bin/sed -e 's|__vendorversion__|"oclock 1.0.4" "X Version 11"|' 	-e 's|__xorgversion__|"oclock 1.0.4" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../oclock/man/oclock.man > oclock.1
+/usr/bin/sed -e 's|__vendorversion__|"oclock 1.0.4" "X Version 11"|' 	-e 's|__xorgversion__|"oclock 1.0.4" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../oclock/man/oclock.man > oclock.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/oclock-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/oclock-build'
 gcc -DHAVE_CONFIG_H -I. -I../oclock   -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o Clock.o ../oclock/Clock.c
@@ -4711,16 +4750,17 @@
 >stampdir/build-oclock
 mkdir -p stampdir
 dh_auto_build -Drendercheck -Brendercheck-build
-	cd rendercheck-build && make -j3
+	cd rendercheck-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/rendercheck-build'
 Making all in man
 make[3]: Entering directory '/build/x11-apps-7.7+9/rendercheck-build/man'
-/bin/sed -e 's|__vendorversion__|"rendercheck 1.5" "X Version 11"|' 	-e 's|__xorgversion__|"rendercheck 1.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../rendercheck/man/rendercheck.man > rendercheck.1
+/usr/bin/sed -e 's|__vendorversion__|"rendercheck 1.5" "X Version 11"|' 	-e 's|__xorgversion__|"rendercheck 1.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../rendercheck/man/rendercheck.man > rendercheck.1
 make[3]: Leaving directory '/build/x11-apps-7.7+9/rendercheck-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/rendercheck-build'
 gcc -DPACKAGE_NAME=\"rendercheck\" -DPACKAGE_TARNAME=\"rendercheck\" -DPACKAGE_VERSION=\"1.5\" -DPACKAGE_STRING=\"rendercheck\ 1.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=xorg\" -DPACKAGE_URL=\"\" -DPACKAGE=\"rendercheck\" -DVERSION=\"1.5\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DPACKAGE_VERSION_MAJOR=1 -DPACKAGE_VERSION_MINOR=5 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE_ERR_H=1 -I. -I../rendercheck  -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-shadow -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o main.o ../rendercheck/main.c
 gcc -DPACKAGE_NAME=\"rendercheck\" -DPACKAGE_TARNAME=\"rendercheck\" -DPACKAGE_VERSION=\"1.5\" -DPACKAGE_STRING=\"rendercheck\ 1.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=xorg\" -DPACKAGE_URL=\"\" -DPACKAGE=\"rendercheck\" -DVERSION=\"1.5\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DPACKAGE_VERSION_MAJOR=1 -DPACKAGE_VERSION_MINOR=5 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE_ERR_H=1 -I. -I../rendercheck  -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-shadow -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o ops.o ../rendercheck/ops.c
 gcc -DPACKAGE_NAME=\"rendercheck\" -DPACKAGE_TARNAME=\"rendercheck\" -DPACKAGE_VERSION=\"1.5\" -DPACKAGE_STRING=\"rendercheck\ 1.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=xorg\" -DPACKAGE_URL=\"\" -DPACKAGE=\"rendercheck\" -DVERSION=\"1.5\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DPACKAGE_VERSION_MAJOR=1 -DPACKAGE_VERSION_MINOR=5 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE_ERR_H=1 -I. -I../rendercheck  -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-shadow -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o tests.o ../rendercheck/tests.c
+gcc -DPACKAGE_NAME=\"rendercheck\" -DPACKAGE_TARNAME=\"rendercheck\" -DPACKAGE_VERSION=\"1.5\" -DPACKAGE_STRING=\"rendercheck\ 1.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=xorg\" -DPACKAGE_URL=\"\" -DPACKAGE=\"rendercheck\" -DVERSION=\"1.5\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DPACKAGE_VERSION_MAJOR=1 -DPACKAGE_VERSION_MINOR=5 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE_ERR_H=1 -I. -I../rendercheck  -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-shadow -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o t_blend.o ../rendercheck/t_blend.c
 ../rendercheck/main.c: In function 'describe_format':
 ../rendercheck/main.c:96:25: warning: ignoring return value of 'asprintf' declared with attribute 'warn_unused_result' [-Wunused-result]
    96 |                         asprintf(desc, "%s%s%s%s%s", prefix, ad, rd, gd, bd);
@@ -4757,7 +4797,6 @@
       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    56 |                                    __va_arg_pack ());
       |                                    ~~~~~~~~~~~~~~~~~
-gcc -DPACKAGE_NAME=\"rendercheck\" -DPACKAGE_TARNAME=\"rendercheck\" -DPACKAGE_VERSION=\"1.5\" -DPACKAGE_STRING=\"rendercheck\ 1.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=xorg\" -DPACKAGE_URL=\"\" -DPACKAGE=\"rendercheck\" -DVERSION=\"1.5\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DPACKAGE_VERSION_MAJOR=1 -DPACKAGE_VERSION_MINOR=5 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE_ERR_H=1 -I. -I../rendercheck  -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-shadow -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o t_blend.o ../rendercheck/t_blend.c
 gcc -DPACKAGE_NAME=\"rendercheck\" -DPACKAGE_TARNAME=\"rendercheck\" -DPACKAGE_VERSION=\"1.5\" -DPACKAGE_STRING=\"rendercheck\ 1.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=xorg\" -DPACKAGE_URL=\"\" -DPACKAGE=\"rendercheck\" -DVERSION=\"1.5\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DPACKAGE_VERSION_MAJOR=1 -DPACKAGE_VERSION_MINOR=5 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE_ERR_H=1 -I. -I../rendercheck  -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-shadow -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o t_bug7366.o ../rendercheck/t_bug7366.c
 gcc -DPACKAGE_NAME=\"rendercheck\" -DPACKAGE_TARNAME=\"rendercheck\" -DPACKAGE_VERSION=\"1.5\" -DPACKAGE_STRING=\"rendercheck\ 1.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=xorg\" -DPACKAGE_URL=\"\" -DPACKAGE=\"rendercheck\" -DVERSION=\"1.5\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DPACKAGE_VERSION_MAJOR=1 -DPACKAGE_VERSION_MINOR=5 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE_ERR_H=1 -I. -I../rendercheck  -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-shadow -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o t_composite.o ../rendercheck/t_composite.c
 gcc -DPACKAGE_NAME=\"rendercheck\" -DPACKAGE_TARNAME=\"rendercheck\" -DPACKAGE_VERSION=\"1.5\" -DPACKAGE_STRING=\"rendercheck\ 1.5\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=xorg\" -DPACKAGE_URL=\"\" -DPACKAGE=\"rendercheck\" -DVERSION=\"1.5\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DPACKAGE_VERSION_MAJOR=1 -DPACKAGE_VERSION_MINOR=5 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE_ERR_H=1 -I. -I../rendercheck  -D_GNU_SOURCE -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-shadow -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o t_dstcoords.o ../rendercheck/t_dstcoords.c
@@ -4776,13 +4815,13 @@
 >stampdir/build-rendercheck
 mkdir -p stampdir
 dh_auto_build -Dtransset -Btransset-build
-	cd transset-build && make -j3
+	cd transset-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/transset-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/transset-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/transset-build/man'
-/bin/sed -e 's|__vendorversion__|"transset 1.0.2" "X Version 11"|' 	-e 's|__xorgversion__|"transset 1.0.2" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../transset/man/transset.man > transset.1
+/usr/bin/sed -e 's|__vendorversion__|"transset 1.0.2" "X Version 11"|' 	-e 's|__xorgversion__|"transset 1.0.2" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../transset/man/transset.man > transset.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/transset-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/transset-build'
 gcc -DHAVE_CONFIG_H -I. -I../transset   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o transSet.o ../transset/transSet.c
@@ -4794,15 +4833,15 @@
 >stampdir/build-transset
 mkdir -p stampdir
 dh_auto_build -Dx11perf -Bx11perf-build
-	cd x11perf-build && make -j3
+	cd x11perf-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/x11perf-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/x11perf-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/x11perf-build/man'
-/bin/sed -e 's|__vendorversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xorgversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../x11perf/man/x11perfcomp.man > x11perfcomp.1
-/bin/sed -e 's|__vendorversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xorgversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../x11perf/man/x11perf.man > x11perf.1
-/bin/sed -e 's|__vendorversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xorgversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../x11perf/man/Xmark.man > Xmark.1
+/usr/bin/sed -e 's|__vendorversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xorgversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../x11perf/man/x11perfcomp.man > x11perfcomp.1
+/usr/bin/sed -e 's|__vendorversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xorgversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../x11perf/man/x11perf.man > x11perf.1
+/usr/bin/sed -e 's|__vendorversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xorgversion__|"x11perf 1.6.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../x11perf/man/Xmark.man > Xmark.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/x11perf-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/x11perf-build'
 gcc -DHAVE_CONFIG_H -I. -I../x11perf   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I/usr/include/freetype2 -I/usr/include/libpng16    -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bitmaps.o ../x11perf/bitmaps.c
@@ -4822,6 +4861,7 @@
 gcc -DHAVE_CONFIG_H -I. -I../x11perf   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I/usr/include/freetype2 -I/usr/include/libpng16    -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o do_valgc.o ../x11perf/do_valgc.c
 gcc -DHAVE_CONFIG_H -I. -I../x11perf   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I/usr/include/freetype2 -I/usr/include/libpng16    -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o do_windows.o ../x11perf/do_windows.c
 gcc -DHAVE_CONFIG_H -I. -I../x11perf   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I/usr/include/freetype2 -I/usr/include/libpng16    -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o x11perf.o ../x11perf/x11perf.c
+/usr/bin/sed -e 's|@x11perfcompdir[@]|/usr/lib/X11/x11perfcomp|g' -e 's|@MKTEMP[@]|/bin/mktemp|g' < ../x11perf/x11perfcomp.in > x11perfcomp
 ../x11perf/x11perf.c: In function 'CreateClipWindows':
 ../x11perf/x11perf.c:601:34: warning: declaration of 'clips' shadows a global declaration [-Wshadow]
   601 | CreateClipWindows(XParms xp, int clips)
@@ -4875,7 +4915,6 @@
 ../x11perf/x11perf.c:953:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   953 |                 cp2 = "-";
       |                     ^
-/bin/sed -e 's|@x11perfcompdir[@]|/usr/lib/X11/x11perfcomp|g' -e 's|@MKTEMP[@]|/bin/mktemp|g' < ../x11perf/x11perfcomp.in > x11perfcomp
 gcc -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I/usr/include/freetype2 -I/usr/include/libpng16    -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security  -Wl,-z,relro -o x11perf bitmaps.o do_arcs.o do_blt.o do_complex.o do_dots.o do_lines.o do_movewin.o do_rects.o do_segs.o do_simple.o do_tests.o do_text.o do_traps.o do_tris.o do_valgc.o do_windows.o x11perf.o -lXext  -lXft  -lXrender -lX11  -lX11 -lXmuu  -lm 
 make[4]: Leaving directory '/build/x11-apps-7.7+9/x11perf-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/x11perf-build'
@@ -4883,13 +4922,13 @@
 >stampdir/build-x11perf
 mkdir -p stampdir
 dh_auto_build -Dxbiff -Bxbiff-build
-	cd xbiff-build && make -j3
+	cd xbiff-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xbiff-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xbiff-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xbiff-build/man'
-/bin/sed -e 's|__vendorversion__|"xbiff 1.0.4" "X Version 11"|' 	-e 's|__xorgversion__|"xbiff 1.0.4" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xbiff/man/xbiff.man > xbiff.1
+/usr/bin/sed -e 's|__vendorversion__|"xbiff 1.0.4" "X Version 11"|' 	-e 's|__xorgversion__|"xbiff 1.0.4" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xbiff/man/xbiff.man > xbiff.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xbiff-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xbiff-build'
 gcc -DHAVE_CONFIG_H -I. -I../xbiff   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -D_CONST_X_STRING -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o Mailbox.o ../xbiff/Mailbox.c
@@ -4960,13 +4999,13 @@
 >stampdir/build-xbiff
 mkdir -p stampdir
 dh_auto_build -Dxcalc -Bxcalc-build
-	cd xcalc-build && make -j3
+	cd xcalc-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xcalc-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xcalc-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xcalc-build/man'
-/bin/sed -e 's|__vendorversion__|"xcalc 1.1.1" "X Version 11"|' 	-e 's|__xorgversion__|"xcalc 1.1.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xcalc/man/xcalc.man > xcalc.1
+/usr/bin/sed -e 's|__vendorversion__|"xcalc 1.1.1" "X Version 11"|' 	-e 's|__xorgversion__|"xcalc 1.1.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xcalc/man/xcalc.man > xcalc.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xcalc-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xcalc-build'
 gcc -DHAVE_CONFIG_H -I. -I../xcalc   -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -D_CONST_X_STRING -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o actions.o ../xcalc/actions.c
@@ -5024,14 +5063,14 @@
 >stampdir/build-xcalc
 mkdir -p stampdir
 dh_auto_build -Dxclipboard -Bxclipboard-build
-	cd xclipboard-build && make -j3
+	cd xclipboard-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xclipboard-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xclipboard-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xclipboard-build/man'
-/bin/sed -e 's|__vendorversion__|"xclipboard 1.1.3" "X Version 11"|' 	-e 's|__xorgversion__|"xclipboard 1.1.3" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xclipboard/man/xclipboard.man > xclipboard.1
-/bin/sed -e 's|__vendorversion__|"xclipboard 1.1.3" "X Version 11"|' 	-e 's|__xorgversion__|"xclipboard 1.1.3" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xclipboard/man/xcutsel.man > xcutsel.1
+/usr/bin/sed -e 's|__vendorversion__|"xclipboard 1.1.3" "X Version 11"|' 	-e 's|__xorgversion__|"xclipboard 1.1.3" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xclipboard/man/xclipboard.man > xclipboard.1
+/usr/bin/sed -e 's|__vendorversion__|"xclipboard 1.1.3" "X Version 11"|' 	-e 's|__xorgversion__|"xclipboard 1.1.3" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xclipboard/man/xcutsel.man > xcutsel.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xclipboard-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xclipboard-build'
 gcc -DHAVE_CONFIG_H -I. -I../xclipboard   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xclipboard.o ../xclipboard/xclipboard.c
@@ -5187,13 +5226,13 @@
 >stampdir/build-xclipboard
 mkdir -p stampdir
 dh_auto_build -Dxclock -Bxclock-build
-	cd xclock-build && make -j3
+	cd xclock-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xclock-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xclock-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xclock-build/man'
-/bin/sed -e 's|__vendorversion__|"xclock 1.1.1" "X Version 11"|' 	-e 's|__xorgversion__|"xclock 1.1.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xclock/man/xclock.man > xclock.1
+/usr/bin/sed -e 's|__vendorversion__|"xclock 1.1.1" "X Version 11"|' 	-e 's|__xorgversion__|"xclock 1.1.1" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xclock/man/xclock.man > xclock.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xclock-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xclock-build'
 gcc -DHAVE_CONFIG_H -I. -I../xclock  -D_CONST_X_STRING -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I/usr/include/freetype2 -I/usr/include/libpng16   -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o Clock.o ../xclock/Clock.c
@@ -5418,13 +5457,13 @@
 >stampdir/build-xclock
 mkdir -p stampdir
 dh_auto_build -Dxconsole -Bxconsole-build
-	cd xconsole-build && make -j3
+	cd xconsole-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xconsole-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xconsole-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xconsole-build/man'
-/bin/sed -e 's|__vendorversion__|"xconsole 1.0.7" "X Version 11"|' 	-e 's|__xorgversion__|"xconsole 1.0.7" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xconsole/man/xconsole.man > xconsole.1
+/usr/bin/sed -e 's|__vendorversion__|"xconsole 1.0.7" "X Version 11"|' 	-e 's|__xorgversion__|"xconsole 1.0.7" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xconsole/man/xconsole.man > xconsole.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xconsole-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xconsole-build'
 gcc -DHAVE_CONFIG_H -I. -I../xconsole   -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xconsole.o ../xconsole/xconsole.c
@@ -5596,13 +5635,13 @@
 >stampdir/build-xconsole
 mkdir -p stampdir
 dh_auto_build -Dxcursorgen -Bxcursorgen-build
-	cd xcursorgen-build && make -j3
+	cd xcursorgen-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xcursorgen-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xcursorgen-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xcursorgen-build/man'
-/bin/sed -e 's|__vendorversion__|"xcursorgen 1.0.7" "X Version 11"|' 	-e 's|__xorgversion__|"xcursorgen 1.0.7" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xcursorgen/man/xcursorgen.man > xcursorgen.1
+/usr/bin/sed -e 's|__vendorversion__|"xcursorgen 1.0.7" "X Version 11"|' 	-e 's|__xorgversion__|"xcursorgen 1.0.7" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xcursorgen/man/xcursorgen.man > xcursorgen.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xcursorgen-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xcursorgen-build'
 gcc -DHAVE_CONFIG_H -I. -I../xcursorgen   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I/usr/include/libpng16  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xcursorgen.o ../xcursorgen/xcursorgen.c
@@ -5613,13 +5652,13 @@
 >stampdir/build-xcursorgen
 mkdir -p stampdir
 dh_auto_build -Dxditview -Bxditview-build
-	cd xditview-build && make -j3
+	cd xditview-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xditview-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xditview-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xditview-build/man'
-/bin/sed -e 's|__vendorversion__|"xditview 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"xditview 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xditview/man/xditview.man > xditview.1
+/usr/bin/sed -e 's|__vendorversion__|"xditview 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"xditview 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xditview/man/xditview.man > xditview.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xditview-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xditview-build'
 gcc -DHAVE_CONFIG_H -I. -I../xditview   -Wdate-time -D_FORTIFY_SOURCE=2  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o draw.o ../xditview/draw.c
@@ -5638,18 +5677,19 @@
 >stampdir/build-xditview
 mkdir -p stampdir
 dh_auto_build -Dxedit -Bxedit-build
-	cd xedit-build && make -j3
+	cd xedit-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xedit-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xedit-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xedit-build/man'
-/bin/sed -e 's|__vendorversion__|"xedit 1.2.3" "X Version 11"|' 	-e 's|__xorgversion__|"xedit 1.2.3" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xedit/man/xedit.man > xedit.1
+/usr/bin/sed -e 's|__vendorversion__|"xedit 1.2.3" "X Version 11"|' 	-e 's|__xorgversion__|"xedit 1.2.3" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xedit/man/xedit.man > xedit.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xedit-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xedit-build'
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I../xedit/lisp/re -D_BSD_SOURCE -DXEDIT -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xedit-commands.o `test -f 'commands.c' || echo '../xedit/'`commands.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I../xedit/lisp/re -D_BSD_SOURCE -DXEDIT -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xedit-hash.o `test -f 'hash.c' || echo '../xedit/'`hash.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I../xedit/lisp/re -D_BSD_SOURCE -DXEDIT -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xedit-hook.o `test -f 'hook.c' || echo '../xedit/'`hook.c
+gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I../xedit/lisp/re -D_BSD_SOURCE -DXEDIT -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xedit-ispell.o `test -f 'ispell.c' || echo '../xedit/'`ispell.c
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/string.h:26,
                  from /usr/include/X11/Xfuncs.h:46,
@@ -5658,6 +5698,12 @@
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
+                 from /usr/include/stdlib.h:26,
+                 from ../xedit/hash.c:27:
+/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+      |   ^~~~~~~
+In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
                  from ../xedit/xedit.h:31,
                  from ../xedit/hook.c:40:
@@ -5665,19 +5711,12 @@
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
-                 from /usr/include/stdlib.h:26,
-                 from ../xedit/hash.c:27:
+                 from /usr/include/stdio.h:27,
+                 from ../xedit/xedit.h:31,
+                 from ../xedit/ispell.c:33:
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
-../xedit/hook.c: In function 'AutoReplaceCallback':
-../xedit/hook.c:366:17: warning: ignoring return value of 'wctomb' declared with attribute 'warn_unused_result' [-Wunused-result]
-  366 |                 wctomb(mb, ((wchar_t*)text.ptr)[i]);
-      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../xedit/hook.c: In function 'AutoReplace':
-../xedit/hook.c:311:17: warning: ignoring return value of 'wctomb' declared with attribute 'warn_unused_result' [-Wunused-result]
-  311 |                 wctomb(mb, ((wchar_t*)block.ptr)[i]);
-      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ../xedit/commands.c: In function 'SourceChanged':
 ../xedit/commands.c:530:9: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   530 |         XtSetArg(args[num_args], XtNleftBitmap, flist.pixmap);  ++num_args;
@@ -5728,14 +5767,14 @@
 ../xedit/commands.c:1032:13: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  1032 |             XtSetArg(args[1], XtNnumberStrings, n_entries);
       |             ^~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I../xedit/lisp/re -D_BSD_SOURCE -DXEDIT -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xedit-ispell.o `test -f 'ispell.c' || echo '../xedit/'`ispell.c
-In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
-                 from /usr/include/stdio.h:27,
-                 from ../xedit/xedit.h:31,
-                 from ../xedit/ispell.c:33:
-/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-      |   ^~~~~~~
+../xedit/hook.c: In function 'AutoReplaceCallback':
+../xedit/hook.c:366:17: warning: ignoring return value of 'wctomb' declared with attribute 'warn_unused_result' [-Wunused-result]
+  366 |                 wctomb(mb, ((wchar_t*)text.ptr)[i]);
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../xedit/hook.c: In function 'AutoReplace':
+../xedit/hook.c:311:17: warning: ignoring return value of 'wctomb' declared with attribute 'warn_unused_result' [-Wunused-result]
+  311 |                 wctomb(mb, ((wchar_t*)block.ptr)[i]);
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ../xedit/ispell.c:89:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    89 |     {"text",    TEXT},
       |      ^~~~~~
@@ -6116,9 +6155,6 @@
 ../xedit/ispell.c:1129:5: warning: ignoring return value of 'write' declared with attribute 'warn_unused_result' [-Wunused-result]
  1129 |     write(ispell.ofd[1], ispell.sendbuf, len);
       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../xedit/commands.c:1049:13: warning: '__builtin_strncpy' output may be truncated copying 8190 bytes from a string of length 8191 [-Wstringop-truncation]
- 1049 |             strncpy(path, label, sizeof(path) - 2);
-      |             ^
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I../xedit/lisp/re -D_BSD_SOURCE -DXEDIT -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xedit-lisp.o `test -f 'lisp.c' || echo '../xedit/'`lisp.c
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
@@ -6234,6 +6270,9 @@
 ../xedit/options.c:520:13: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   520 |             XtSetArg(args[0], XtNdisplayCaret, True);
       |             ^~~~~~~~
+../xedit/commands.c:1049:13: warning: '__builtin_strncpy' output may be truncated copying 8190 bytes from a string of length 8191 [-Wstringop-truncation]
+ 1049 |             strncpy(path, label, sizeof(path) - 2);
+      |             ^
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I../xedit/lisp/re -D_BSD_SOURCE -DXEDIT -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xedit-tags.o `test -f 'tags.c' || echo '../xedit/'`tags.c
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
@@ -6242,10 +6281,6 @@
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
-../xedit/tags.c: In function 'FindTag':
-../xedit/tags.c:495:38: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  495 |     static String       params[] = { "vertical", NULL };
-      |                                      ^~~~~~~~~~
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -I../xedit/lisp/re -D_BSD_SOURCE -DXEDIT -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xedit-util.o `test -f 'util.c' || echo '../xedit/'`util.c
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
@@ -6253,6 +6288,10 @@
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
+../xedit/tags.c: In function 'FindTag':
+../xedit/tags.c:495:38: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  495 |     static String       params[] = { "vertical", NULL };
+      |                                      ^~~~~~~~~~
 ../xedit/util.c: In function 'XeditPrintf':
 ../xedit/util.c:94:5: warning: function 'XeditPrintf' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
    94 |     size = vsnprintf(buffer, sizeof(buffer), format, va);
@@ -6389,7 +6428,6 @@
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\" -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp_lsp-hash.o `test -f 'hash.c' || echo '../xedit/'`hash.c
 ../xedit/xedit.c:40:2: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    40 | {"quit", QuitAction},
       |  ^~~~~~
@@ -6571,26 +6609,27 @@
 ../xedit/xedit.c:436:9: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   436 |         XtSetArg(arglist[0], XtNwrap, &wrapmodes[num_args]);
       |         ^~~~~~~~
-In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
-                 from /usr/include/stdlib.h:26,
-                 from ../xedit/hash.c:27:
-/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-      |   ^~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\" -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp_lsp-hash.o `test -f 'hash.c' || echo '../xedit/'`hash.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\" -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/lsp-lsp.o `test -f 'lisp/lsp.c' || echo '../xedit/'`lisp/lsp.c
+gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/re/tests-tests.o `test -f 'lisp/re/tests.c' || echo '../xedit/'`lisp/re/tests.c
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
                  from ../xedit/lisp/lsp.c:32:
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/re/tests-tests.o `test -f 'lisp/re/tests.c' || echo '../xedit/'`lisp/re/tests.c
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
                  from ../xedit/lisp/re/tests.c:36:
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
+In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
+                 from /usr/include/stdlib.h:26,
+                 from ../xedit/hash.c:27:
+/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+      |   ^~~~~~~
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-bytecode.o `test -f 'lisp/bytecode.c' || echo '../xedit/'`lisp/bytecode.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-core.o `test -f 'lisp/core.c' || echo '../xedit/'`lisp/core.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-debugger.o `test -f 'lisp/debugger.c' || echo '../xedit/'`lisp/debugger.c
@@ -6602,6 +6641,7 @@
 ../xedit/lisp/compile.c:1398:12: note: shadowed declaration is here
  1398 |     int i, count, base;
       |            ^~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-format.o `test -f 'lisp/format.c' || echo '../xedit/'`lisp/format.c
 ../xedit/lisp/bytecode.c: In function 'MakeBytecodeObject':
 ../xedit/lisp/bytecode.c:1242:34: warning: declaration of 'cons' shadows a global declaration [-Wshadow]
  1242 |     LispObj **constants, *code, *cons, *prev;
@@ -6609,23 +6649,11 @@
 ../xedit/lisp/bytecode.c:335:17: note: shadowed declaration is here
   335 | static LispObj *cons, *cons1, *cons2, *cons3, *cons4, *cons5, *cons6, *cons7;
       |                 ^~~~
-../xedit/lisp/core.c: In function 'Lisp_XeditVectorStore':
-../xedit/lisp/core.c:6950:14: warning: declaration of 'offset' shadows a previous local [-Wshadow]
- 6950 |         long offset = FIXNUM_VALUE(CAR(values));
-      |              ^~~~~~
-../xedit/lisp/core.c:6929:33: note: shadowed declaration is here
- 6929 |     long rank, count, sequence, offset, accum;
-      |                                 ^~~~~~
-../xedit/lisp/core.c: In function 'Lisp_Quit':
-../xedit/lisp/core.c:4318:1: warning: function might be candidate for attribute 'noreturn' [-Wsuggest-attribute=noreturn]
- 4318 | Lisp_Quit(LispBuiltin *builtin)
-      | ^~~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-format.o `test -f 'lisp/format.c' || echo '../xedit/'`lisp/format.c
+gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-hash.o `test -f 'lisp/hash.c' || echo '../xedit/'`lisp/hash.c
 ../xedit/lisp/format.c: In function 'format_case_conversion':
 ../xedit/lisp/format.c:1082:15: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  1082 |     str = ptr = LispGetSstring(SSTREAMP(string), &length);
       |               ^
-gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-hash.o `test -f 'lisp/hash.c' || echo '../xedit/'`lisp/hash.c
 ../xedit/lisp/hash.c: In function 'LispHash':
 ../xedit/lisp/hash.c:189:21: warning: declaration of 'hash_table' shadows a global declaration [-Wshadow]
   189 |     LispObj *okey, *hash_table, *value;
@@ -6693,6 +6721,17 @@
 ../xedit/util.h:36:33: note: shadowed declaration is here
    36 | typedef struct _hash_table      hash_table;
       |                                 ^~~~~~~~~~
+../xedit/lisp/core.c: In function 'Lisp_XeditVectorStore':
+../xedit/lisp/core.c:6950:14: warning: declaration of 'offset' shadows a previous local [-Wshadow]
+ 6950 |         long offset = FIXNUM_VALUE(CAR(values));
+      |              ^~~~~~
+../xedit/lisp/core.c:6929:33: note: shadowed declaration is here
+ 6929 |     long rank, count, sequence, offset, accum;
+      |                                 ^~~~~~
+../xedit/lisp/core.c: In function 'Lisp_Quit':
+../xedit/lisp/core.c:4318:1: warning: function might be candidate for attribute 'noreturn' [-Wsuggest-attribute=noreturn]
+ 4318 | Lisp_Quit(LispBuiltin *builtin)
+      | ^~~~~~~~~
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-helper.o `test -f 'lisp/helper.c' || echo '../xedit/'`lisp/helper.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-io.o `test -f 'lisp/io.c' || echo '../xedit/'`lisp/io.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-lisp.o `test -f 'lisp/lisp.c' || echo '../xedit/'`lisp/lisp.c
@@ -6721,7 +6760,6 @@
  5084 | LispExecute(char *str)
       |             ~~~~~~^~~
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-math.o `test -f 'lisp/math.c' || echo '../xedit/'`lisp/math.c
-gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-package.o `test -f 'lisp/package.c' || echo '../xedit/'`lisp/package.c
 In file included from ../xedit/lisp/math.h:35,
                  from ../xedit/lisp/math.c:32:
 ../xedit/lisp/math.c: In function 'Lisp_Isqrt':
@@ -6741,19 +6779,14 @@
 ../xedit/lisp/lisp.c:648:1: warning: function might be candidate for attribute 'noreturn' [-Wsuggest-attribute=noreturn]
   648 | LispDestroy(const char *fmt, ...)
       | ^~~~~~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-package.o `test -f 'lisp/package.c' || echo '../xedit/'`lisp/package.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-pathname.o `test -f 'lisp/pathname.c' || echo '../xedit/'`lisp/pathname.c
-../xedit/lisp/pathname.c: In function 'Lisp_UserHomedirPathname':
-../xedit/lisp/pathname.c:1073:9: warning: '__builtin___strncpy_chk' output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
- 1073 |         strncpy(data, home, length);
-      |         ^
-../xedit/lisp/pathname.c:1072:18: note: length computed here
- 1072 |         length = strlen(home);
-      |                  ^~~~~~~~~~~~
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-read.o `test -f 'lisp/read.c' || echo '../xedit/'`lisp/read.c
 ../xedit/lisp/read.c: In function 'LispReadError':
 ../xedit/lisp/read.c:609:5: warning: function 'LispReadError' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
   609 |     vsnprintf(string, sizeof(string), fmt, ap);
       |     ^~~~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-regex.o `test -f 'lisp/regex.c' || echo '../xedit/'`lisp/regex.c
 ../xedit/lisp/read.c: In function 'LispReadArray':
 ../xedit/lisp/read.c:1918:18: warning: declaration of 'array' shadows a previous local [-Wshadow]
  1918 |         LispObj *array;
@@ -6761,9 +6794,16 @@
 ../xedit/lisp/read.c:1901:49: note: shadowed declaration is here
  1901 |     LispObj *arguments, *initial, *dim, *cons, *array, *data;
       |                                                 ^~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-regex.o `test -f 'lisp/regex.c' || echo '../xedit/'`lisp/regex.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-require.o `test -f 'lisp/require.c' || echo '../xedit/'`lisp/require.c
+../xedit/lisp/pathname.c: In function 'Lisp_UserHomedirPathname':
+../xedit/lisp/pathname.c:1073:9: warning: '__builtin___strncpy_chk' output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
+ 1073 |         strncpy(data, home, length);
+      |         ^
+../xedit/lisp/pathname.c:1072:18: note: length computed here
+ 1072 |         length = strlen(home);
+      |                  ^~~~~~~~~~~~
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-stream.o `test -f 'lisp/stream.c' || echo '../xedit/'`lisp/stream.c
+gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-string.o `test -f 'lisp/string.c' || echo '../xedit/'`lisp/string.c
 ../xedit/lisp/stream.c: In function 'Lisp_MakePipe':
 ../xedit/lisp/stream.c:716:17: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   716 |         argv[0] = "sh";
@@ -6780,7 +6820,6 @@
 ../xedit/lisp/stream.c:722:9: warning: ignoring return value of 'pipe' declared with attribute 'warn_unused_result' [-Wunused-result]
   722 |         pipe(efd);
       |         ^~~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-string.o `test -f 'lisp/string.c' || echo '../xedit/'`lisp/string.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-struct.o `test -f 'lisp/struct.c' || echo '../xedit/'`lisp/struct.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-time.o `test -f 'lisp/time.c' || echo '../xedit/'`lisp/time.c
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -I../xedit/lisp/re -I../xedit/lisp/mp -DLISP -DLISPDIR=\"/usr/lib/X11/xedit/lisp\"  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/liblisp_a-write.o `test -f 'lisp/write.c' || echo '../xedit/'`lisp/write.c
@@ -6879,9 +6918,6 @@
   846 |         if (rept == Rer_AnyTimes || rept == Rer_Maybe || rept == Re_AtLeast) {
       |                                                               ^~
 gcc -DHAVE_CONFIG_H -I. -I../xedit   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lisp/re/libre_a-reo.o `test -f 'lisp/re/reo.c' || echo '../xedit/'`lisp/re/reo.c
-rm -f liblisp.a
-ar cru liblisp.a lisp/liblisp_a-bytecode.o lisp/liblisp_a-core.o lisp/liblisp_a-debugger.o lisp/liblisp_a-format.o lisp/liblisp_a-hash.o lisp/liblisp_a-helper.o lisp/liblisp_a-io.o lisp/liblisp_a-lisp.o lisp/liblisp_a-math.o lisp/liblisp_a-package.o lisp/liblisp_a-pathname.o lisp/liblisp_a-read.o lisp/liblisp_a-regex.o lisp/liblisp_a-require.o lisp/liblisp_a-stream.o lisp/liblisp_a-string.o lisp/liblisp_a-struct.o lisp/liblisp_a-time.o lisp/liblisp_a-write.o lisp/liblisp_a-xedit.o  
-ar: `u' modifier ignored since `D' is the default (see `U')
 ../xedit/lisp/re/reo.c: In function 'orec_str_list':
 ../xedit/lisp/re/reo.c:657:32: warning: declaration of 'str' shadows a parameter [-Wshadow]
   657 |         unsigned char ci, cj, *str;
@@ -6889,11 +6925,14 @@
 ../xedit/lisp/re/reo.c:576:48: note: shadowed declaration is here
   576 | orec_str_list(orec_inf *inf, rec_alt *alt, int str, int count)
       |                                            ~~~~^~~
-ranlib liblisp.a
 rm -f libmp.a
 ar cru libmp.a lisp/mp/libmp_a-mp.o lisp/mp/libmp_a-mpi.o lisp/mp/libmp_a-mpr.o 
 ar: `u' modifier ignored since `D' is the default (see `U')
 ranlib libmp.a
+rm -f liblisp.a
+ar cru liblisp.a lisp/liblisp_a-bytecode.o lisp/liblisp_a-core.o lisp/liblisp_a-debugger.o lisp/liblisp_a-format.o lisp/liblisp_a-hash.o lisp/liblisp_a-helper.o lisp/liblisp_a-io.o lisp/liblisp_a-lisp.o lisp/liblisp_a-math.o lisp/liblisp_a-package.o lisp/liblisp_a-pathname.o lisp/liblisp_a-read.o lisp/liblisp_a-regex.o lisp/liblisp_a-require.o lisp/liblisp_a-stream.o lisp/liblisp_a-string.o lisp/liblisp_a-struct.o lisp/liblisp_a-time.o lisp/liblisp_a-write.o lisp/liblisp_a-xedit.o  
+ar: `u' modifier ignored since `D' is the default (see `U')
+ranlib liblisp.a
 rm -f libre.a
 ar cru libre.a lisp/re/libre_a-re.o lisp/re/libre_a-rec.o lisp/re/libre_a-reo.o 
 ar: `u' modifier ignored since `D' is the default (see `U')
@@ -6907,13 +6946,13 @@
 >stampdir/build-xedit
 mkdir -p stampdir
 dh_auto_build -Dxeyes -Bxeyes-build
-	cd xeyes-build && make -j3
+	cd xeyes-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xeyes-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xeyes-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xeyes-build/man'
-/bin/sed -e 's|__vendorversion__|"xeyes 1.2.0" "X Version 11"|' 	-e 's|__xorgversion__|"xeyes 1.2.0" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xeyes/man/xeyes.man > xeyes.1
+/usr/bin/sed -e 's|__vendorversion__|"xeyes 1.2.0" "X Version 11"|' 	-e 's|__xorgversion__|"xeyes 1.2.0" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xeyes/man/xeyes.man > xeyes.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xeyes-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xeyes-build'
 gcc -DHAVE_CONFIG_H -I. -I../xeyes   -Wdate-time -D_FORTIFY_SOURCE=2     -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o Eyes.o ../xeyes/Eyes.c
@@ -6926,34 +6965,41 @@
 >stampdir/build-xeyes
 mkdir -p stampdir
 dh_auto_build -Dxgc -Bxgc-build
-	cd xgc-build && make -j3
+	cd xgc-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xgc-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xgc-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xgc-build/man'
-/bin/sed -e 's|__vendorversion__|"xgc 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"xgc 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xgc/man/xgc.man > xgc.1
+/usr/bin/sed -e 's|__vendorversion__|"xgc 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"xgc 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xgc/man/xgc.man > xgc.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xgc-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xgc-build'
 gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o choice.o ../xgc/choice.c
 gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o dashlist.o ../xgc/dashlist.c
 gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o getfile.o ../xgc/getfile.c
+gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o gram.o ../xgc/gram.c
+In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
+                 from /usr/include/X11/Xlib.h:38,
+                 from /usr/include/X11/Intrinsic.h:53,
+                 from ../xgc/getfile.c:6:
+/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+      |   ^~~~~~~
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
                  from ../xgc/dashlist.c:11:
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
-In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
-                 from /usr/include/X11/Xlib.h:38,
-                 from /usr/include/X11/Intrinsic.h:53,
-                 from ../xgc/getfile.c:6:
+In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
+                 from /usr/include/stdio.h:27,
+                 from ../xgc/choice.c:9:
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
-                 from ../xgc/choice.c:9:
+                 from gram.y:8:
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
@@ -6976,6 +7022,11 @@
 ../xgc/getfile.c:82:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    82 |     {XtNfromHoriz,      (XtArgVal) NULL},
       |      ^~~~~~~~~~~~
+gram.c:1119:5: warning: redundant redeclaration of 'yyparse' [-Wredundant-decls]
+In file included from gram.y:11:
+../xgc/xgc.h:158:12: note: previous declaration of 'yyparse' with type 'int(void)'
+  158 | extern int yyparse(void);
+      |            ^~~~~~~
 ../xgc/choice.c: In function 'create_choice':
 ../xgc/choice.c:58:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    58 |     {XtNvertDistance, (XtArgVal) 4}
@@ -6995,10 +7046,6 @@
 ../xgc/choice.c:67:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    67 |     {XtNradioGroup,    (XtArgVal) NULL},
       |      ^~~~~~~~~~~~~
-../xgc/choice.c: In function 'select_button':
-../xgc/choice.c:185:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  185 |     {XtNstate,   (XtArgVal) True}
-      |      ^~~~~~~~
 ../xgc/dashlist.c: In function 'create_dashlist_choice':
 ../xgc/dashlist.c:47:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    47 |     {XtNvertDistance, (XtArgVal) 4}
@@ -7015,6 +7062,10 @@
 ../xgc/dashlist.c:58:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    58 |     {XtNstate,              (XtArgVal) False},
       |      ^~~~~~~~
+../xgc/choice.c: In function 'select_button':
+../xgc/choice.c:185:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  185 |     {XtNstate,   (XtArgVal) True}
+      |      ^~~~~~~~
 ../xgc/dashlist.c: In function 'change_dashlist':
 ../xgc/dashlist.c:129:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   129 |     {XtNstate,    (XtArgVal) NULL}
@@ -7023,33 +7074,31 @@
 ../xgc/dashlist.c:162:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   162 |     {XtNstate,   (XtArgVal) NULL}
       |      ^~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o gram.o ../xgc/gram.c
-In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
-                 from /usr/include/stdio.h:27,
-                 from gram.y:8:
-/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-      |   ^~~~~~~
 gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o interpret.o ../xgc/interpret.c
+gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lex.o ../xgc/lex.c
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
                  from ../xgc/interpret.c:7:
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o lex.o ../xgc/lex.c
-gram.c:1119:5: warning: redundant redeclaration of 'yyparse' [-Wredundant-decls]
-In file included from gram.y:11:
-../xgc/xgc.h:158:12: note: previous declaration of 'yyparse' with type 'int(void)'
-  158 | extern int yyparse(void);
-      |            ^~~~~~~
 In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
                  from /usr/include/stdio.h:27,
                  from lex.c:19:
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o main.o ../xgc/main.c
+lex.l:14:5: warning: redundant redeclaration of 'yylineno' [-Wredundant-decls]
+lex.c:342:5: note: previous definition of 'yylineno' with type 'int'
 ../xgc/interpret.c: In function 'change_test':
+In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
+                 from /usr/include/X11/Xlib.h:38,
+                 from /usr/include/X11/Intrinsic.h:53,
+                 from ../xgc/main.c:38:
+/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+      |   ^~~~~~~
 ../xgc/interpret.c:318:17: warning: declaration of 'test' shadows a global declaration [-Wshadow]
   318 | change_test(int test, Boolean feedback)
       |             ~~~~^~~~
@@ -7057,8 +7106,6 @@
 ../xgc/xgc.h:80:15: note: shadowed declaration is here
    80 | extern Widget test;
       |               ^~~~
-lex.l:14:5: warning: redundant redeclaration of 'yylineno' [-Wredundant-decls]
-lex.c:342:5: note: previous definition of 'yylineno' with type 'int'
 lex.c:1956:12: warning: redundant redeclaration of 'isatty' [-Wredundant-decls]
 In file included from lex.c:732:
 /usr/include/unistd.h:809:12: note: previous declaration of 'isatty' with type 'int(int)'
@@ -7066,14 +7113,6 @@
       |            ^~~~~~
 lex.c:1775:16: warning: 'input' defined but not used [-Wunused-function]
 lex.c:1734:17: warning: 'yyunput' defined but not used [-Wunused-function]
-gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o main.o ../xgc/main.c
-In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
-                 from /usr/include/X11/Xlib.h:38,
-                 from /usr/include/X11/Intrinsic.h:53,
-                 from ../xgc/main.c:38:
-/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-      |   ^~~~~~~
 ../xgc/main.c:208:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   208 |     {"quit",    quitAction}
       |      ^~~~~~
@@ -7149,6 +7188,7 @@
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o record.o ../xgc/record.c
 ../xgc/planemask.c: In function 'create_planemask_choice':
 ../xgc/planemask.c:46:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    46 |     {XtNvertDistance,    (XtArgVal) 4}
@@ -7173,6 +7213,20 @@
 ../xgc/planemask.c:168:6: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   168 |     {XtNstate,     (XtArgVal) NULL}
       |      ^~~~~~~~
+In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
+                 from /usr/include/X11/Xlib.h:38,
+                 from /usr/include/X11/Intrinsic.h:53,
+                 from ../xgc/record.c:7:
+/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+      |   ^~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o testfrac.o ../xgc/testfrac.c
+In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
+                 from /usr/include/stdio.h:27,
+                 from ../xgc/testfrac.c:8:
+/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+      |   ^~~~~~~
 ../xgc/planemask.c: In function 'create_planemask_choice':
 ../xgc/planemask.c:109:43: warning: '%d' directive output may be truncated writing between 1 and 10 bytes into a region of size 3 [-Wformat-truncation=]
   109 |     snprintf(name, sizeof name, "planemask%d",i);
@@ -7191,21 +7245,6 @@
       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    56 |                                    __va_arg_pack ());
       |                                    ~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o record.o ../xgc/record.c
-In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
-                 from /usr/include/X11/Xlib.h:38,
-                 from /usr/include/X11/Intrinsic.h:53,
-                 from ../xgc/record.c:7:
-/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-      |   ^~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xgc   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_BSD_SOURCE -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o testfrac.o ../xgc/testfrac.c
-In file included from /usr/include/arm-linux-gnueabihf/bits/libc-header-start.h:33,
-                 from /usr/include/stdio.h:27,
-                 from ../xgc/testfrac.c:8:
-/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-      |   ^~~~~~~
 ../xgc/testfrac.c: In function 'slider_jump':
 ../xgc/testfrac.c:43:9: warning: declaration of 'oldpercent' shadows a global declaration [-Wshadow]
    43 |   float oldpercent;             /* where the scrollbar is */
@@ -7285,18 +7324,19 @@
 >stampdir/build-xgc
 mkdir -p stampdir
 dh_auto_build -Dxload -Bxload-build
-	cd xload-build && make -j3
+	cd xload-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xload-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xload-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xload-build/man'
-/bin/sed -e 's|__vendorversion__|"xload 1.1.4" "X Version 11"|' 	-e 's|__xorgversion__|"xload 1.1.4" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xload/man/xload.man > xload.1
+/usr/bin/sed -e 's|__vendorversion__|"xload 1.1.4" "X Version 11"|' 	-e 's|__xorgversion__|"xload 1.1.4" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xload/man/xload.man > xload.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xload-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xload-build'
 gcc -DHAVE_CONFIG_H -I. -I../xload  -D_CONST_X_STRING -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o get_load.o ../xload/get_load.c
 gcc -DHAVE_CONFIG_H -I. -I../xload  -D_CONST_X_STRING -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o get_rload.o ../xload/get_rload.c
 gcc -DHAVE_CONFIG_H -I. -I../xload  -D_CONST_X_STRING -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xload.o ../xload/xload.c
+xgettext -d xload -n ../xload/get_load.c ../xload/get_rload.c ../xload/xload.c ../xload/xload.h
 ../xload/xload.c:100:3: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   100 |  {"-scale",             "*load.minScale",       XrmoptionSepArg,        NULL},
       |   ^~~~~~~~
@@ -7357,7 +7397,6 @@
 ../xload/xload.c:108:25: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   108 |  {"-remote",            "*remote",              XrmoptionSepArg,        NULL},
       |                         ^~~~~~~~~
-xgettext -d xload -n ../xload/get_load.c ../xload/get_rload.c ../xload/xload.c ../xload/xload.h
 gcc -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security  -Wl,-z,relro -o xload get_load.o get_rload.o xload.o -lXaw7 -lXmu -lXt -lX11  
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xload-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xload-build'
@@ -7365,13 +7404,13 @@
 >stampdir/build-xload
 mkdir -p stampdir
 dh_auto_build -Dxlogo -Bxlogo-build
-	cd xlogo-build && make -j3
+	cd xlogo-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xlogo-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xlogo-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xlogo-build/man'
-/bin/sed -e 's|__vendorversion__|"xlogo 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"xlogo 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xlogo/man/xlogo.man > xlogo.1
+/usr/bin/sed -e 's|__vendorversion__|"xlogo 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"xlogo 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xlogo/man/xlogo.man > xlogo.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xlogo-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xlogo-build'
 gcc -DHAVE_CONFIG_H -I. -I../xlogo   -Wdate-time -D_FORTIFY_SOURCE=2 -I/usr/include/freetype2 -I/usr/include/libpng16  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o Logo.o ../xlogo/Logo.c
@@ -7513,22 +7552,142 @@
 >stampdir/build-xlogo
 mkdir -p stampdir
 dh_auto_build -Dxmag -Bxmag-build
-	cd xmag-build && make -j3
+	cd xmag-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xmag-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xmag-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xmag-build/man'
-/bin/sed -e 's|__vendorversion__|"xmag 1.0.6" "X Version 11"|' 	-e 's|__xorgversion__|"xmag 1.0.6" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xmag/man/xmag.man > xmag.1
+/usr/bin/sed -e 's|__vendorversion__|"xmag 1.0.6" "X Version 11"|' 	-e 's|__xorgversion__|"xmag 1.0.6" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xmag/man/xmag.man > xmag.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xmag-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xmag-build'
 gcc -DHAVE_CONFIG_H -I. -I../xmag   -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o CutPaste.o ../xmag/CutPaste.c
 gcc -DHAVE_CONFIG_H -I. -I../xmag   -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o RootWin.o ../xmag/RootWin.c
 gcc -DHAVE_CONFIG_H -I. -I../xmag   -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o Scale.o ../xmag/Scale.c
+gcc -DHAVE_CONFIG_H -I. -I../xmag   -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xmag.o ../xmag/xmag.c
 ../xmag/RootWin.c:39:41: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    39 |     /* class_name               */      "RootWindow",
       |                                         ^~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xmag   -Wdate-time -D_FORTIFY_SOURCE=2  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xmag.o ../xmag/xmag.c
+../xmag/xmag.c:158:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  158 |   {"geometry", "Geometry", XtRString, sizeof(String),
+      |    ^~~~~~~~~~
+../xmag/xmag.c:158:16: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  158 |   {"geometry", "Geometry", XtRString, sizeof(String),
+      |                ^~~~~~~~~~
+../xmag/xmag.c:160:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  160 |   {"mag", "Mag", XtRString, sizeof(String),
+      |    ^~~~~
+../xmag/xmag.c:160:11: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  160 |   {"mag", "Mag", XtRString, sizeof(String),
+      |           ^~~~~
+../xmag/xmag.c:162:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  162 |   {"source", "Source", XtRString, sizeof(String),
+      |    ^~~~~~~~
+../xmag/xmag.c:162:14: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  162 |   {"source", "Source", XtRString, sizeof(String),
+      |              ^~~~~~~~
+../xmag/xmag.c:164:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  164 |   {"title", XtCString, XtRString, sizeof(char *),
+      |    ^~~~~~~
+../xmag/xmag.c:165:32: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  165 |      Offset(title), XtRString, "xmag"},
+      |                                ^~~~~~
+../xmag/xmag.c:170:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  170 |   {"-bd",         "*borderColor", XrmoptionSepArg, (XtPointer)NULL},
+      |    ^~~~~
+../xmag/xmag.c:170:19: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  170 |   {"-bd",         "*borderColor", XrmoptionSepArg, (XtPointer)NULL},
+      |                   ^~~~~~~~~~~~~~
+../xmag/xmag.c:171:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  171 |   {"-bg",         "*background",   XrmoptionSepArg, (XtPointer)NULL},
+      |    ^~~~~
+../xmag/xmag.c:171:19: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  171 |   {"-bg",         "*background",   XrmoptionSepArg, (XtPointer)NULL},
+      |                   ^~~~~~~~~~~~~
+../xmag/xmag.c:172:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  172 |   {"-bw",         "*borderWidth", XrmoptionSepArg, (XtPointer)NULL},
+      |    ^~~~~
+../xmag/xmag.c:172:19: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  172 |   {"-bw",         "*borderWidth", XrmoptionSepArg, (XtPointer)NULL},
+      |                   ^~~~~~~~~~~~~~
+../xmag/xmag.c:174:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  174 |   {"-geometry", "*geometry", XrmoptionSepArg, (XtPointer)NULL},
+      |    ^~~~~~~~~~~
+../xmag/xmag.c:174:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  174 |   {"-geometry", "*geometry", XrmoptionSepArg, (XtPointer)NULL},
+      |                 ^~~~~~~~~~~
+../xmag/xmag.c:175:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  175 |   {"-mag",      "*mag",                XrmoptionSepArg, (XtPointer)NULL},
+      |    ^~~~~~
+../xmag/xmag.c:175:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  175 |   {"-mag",      "*mag",                XrmoptionSepArg, (XtPointer)NULL},
+      |                 ^~~~~~
+../xmag/xmag.c:176:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  176 |   {"-source",   "*source",             XrmoptionSepArg, (XtPointer)NULL},
+      |    ^~~~~~~~~
+../xmag/xmag.c:176:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  176 |   {"-source",   "*source",             XrmoptionSepArg, (XtPointer)NULL},
+      |                 ^~~~~~~~~
+../xmag/xmag.c:177:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  177 |   {"-title",    "*title",              XrmoptionSepArg, (XtPointer)NULL},
+      |    ^~~~~~~~
+../xmag/xmag.c:177:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  177 |   {"-title",    "*title",              XrmoptionSepArg, (XtPointer)NULL},
+      |                 ^~~~~~~~
+../xmag/xmag.c:185:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  185 |   {"close", CloseAP},
+      |    ^~~~~~~
+../xmag/xmag.c:186:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  186 |   {"set-colors", SetCmapPropsAP},
+      |    ^~~~~~~~~~~~
+../xmag/xmag.c:187:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  187 |   {"unset-colors", UnsetCmapPropsAP},
+      |    ^~~~~~~~~~~~~~
+../xmag/xmag.c:188:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  188 |   {"new", NewAP},
+      |    ^~~~~
+../xmag/xmag.c:189:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  189 |   {"replace", ReplaceAP},
+      |    ^~~~~~~~~
+../xmag/xmag.c:190:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  190 |   {"popup-pixel", PopupPixelAP},
+      |    ^~~~~~~~~~~~~
+../xmag/xmag.c:191:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  191 |   {"update-pixel", UpdatePixelAP},
+      |    ^~~~~~~~~~~~~~
+../xmag/xmag.c:192:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  192 |   {"popdown-pixel", PopdownPixelAP},
+      |    ^~~~~~~~~~~~~~~
+../xmag/xmag.c:193:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  193 |   {"select-region", SelectRegionAP}
+      |    ^~~~~~~~~~~~~~~
+../xmag/xmag.c: In function 'Error':
+../xmag/xmag.c:203:16: warning: declaration of 'dpy' shadows a global declaration [-Wshadow]
+  203 | Error(Display *dpy, XErrorEvent *err)
+      |       ~~~~~~~~~^~~
+../xmag/xmag.c:107:17: note: shadowed declaration is here
+  107 | static Display *dpy;
+      |                 ^~~
+../xmag/xmag.c: In function 'CloseAP':
+../xmag/xmag.c:221:5: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  221 |     XtSetArg(wargs[0], XtNuserData, &data); n++;
+      |     ^~~~~~~~
+../xmag/xmag.c: In function 'SetCmapPropsAP':
+../xmag/xmag.c:240:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  240 |   XtSetArg(wargs[0], XtNuserData, &data); n++;
+      |   ^~~~~~~~
+../xmag/xmag.c: In function 'UnsetCmapPropsAP':
+../xmag/xmag.c:260:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  260 |   XtSetArg(wargs[0], XtNuserData, &data); n++;
+      |   ^~~~~~~~
+../xmag/xmag.c: In function 'ReplaceAP':
+../xmag/xmag.c:291:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  291 |   XtSetArg(wargs[0], XtNuserData, &data); n++;
+      |   ^~~~~~~~
+../xmag/xmag.c: In function 'PopupPixelAP':
+../xmag/xmag.c:313:5: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  313 |     XtSetArg(wargs[0], XtNuserData, &data); n++;
+      |     ^~~~~~~~
 In file included from ../xmag/ScaleP.h:36,
                  from ../xmag/Scale.c:46:
 ../xmag/Scale.h:85:20: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
@@ -7543,6 +7702,10 @@
 ../xmag/Scale.c:70:14: note: in expansion of macro 'XtCGravity'
    70 | {XtNgravity, XtCGravity, XtRGravity, sizeof(XtGravity),
       |              ^~~~~~~~~~
+../xmag/xmag.c: In function 'UpdatePixelAP':
+../xmag/xmag.c:361:5: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  361 |     XtSetArg(wargs[0], XtNuserData, &data); n++;
+      |     ^~~~~~~~
 ../xmag/Scale.h:79:22: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    79 | #define XtNautoscale "autoscale"
       |                      ^~~~~~~~~~~
@@ -7579,12 +7742,16 @@
 ../xmag/Scale.c:82:13: note: in expansion of macro 'XtCScaleFactor'
    82 | {XtNscaleX, XtCScaleFactor, XtRString, sizeof(String),
       |             ^~~~~~~~~~~~~~
+../xmag/xmag.c: In function 'PopdownPixelAP':
 ../xmag/Scale.h:77:19: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    77 | #define XtNscaleY "scaleY"
       |                   ^~~~~~~~
 ../xmag/Scale.c:84:2: note: in expansion of macro 'XtNscaleY'
    84 | {XtNscaleY, XtCScaleFactor, XtRString, sizeof(String),
       |  ^~~~~~~~~
+../xmag/xmag.c:393:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  393 |   XtSetArg(wargs[0], XtNuserData, &data); n++;
+      |   ^~~~~~~~
 ../xmag/Scale.h:78:24: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    78 | #define XtCScaleFactor "ScaleFactor"
       |                        ^~~~~~~~~~~~~
@@ -7713,6 +7880,7 @@
   537 |     *img_y = (Position) floor(y / sw->scale.scale_y);
       |              ^
 ../xmag/Scale.c: In function 'Redisplay':
+../xmag/xmag.c: In function 'PopupNewScale':
 ../xmag/Scale.c:574:25: warning: cast from function call of type 'double' to non-matching type 'short int' [-Wbad-function-cast]
   574 |         img_x = min(max((Position) floor((float) x
       |                         ^
@@ -7722,6 +7890,9 @@
 ../xmag/Scale.c:574:21: note: in expansion of macro 'max'
   574 |         img_x = min(max((Position) floor((float) x
       |                     ^~~
+../xmag/xmag.c:998:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  998 |   XtSetArg(warg, XtNuserData, data);
+      |   ^~~~~~~~
 ../xmag/Scale.c:574:25: warning: cast from function call of type 'double' to non-matching type 'short int' [-Wbad-function-cast]
   574 |         img_x = min(max((Position) floor((float) x
       |                         ^
@@ -7731,6 +7902,9 @@
 ../xmag/Scale.c:574:21: note: in expansion of macro 'max'
   574 |         img_x = min(max((Position) floor((float) x
       |                     ^~~
+../xmag/xmag.c:1011:44: warning: cast from function call of type 'Pixel' {aka 'long unsigned int'} to non-matching type 'void *' [-Wbad-function-cast]
+ 1011 |                             XtNforeground, (XtPointer)GetMaxIntensity(data),
+      |                                            ^
 ../xmag/Scale.c:574:25: warning: cast from function call of type 'double' to non-matching type 'short int' [-Wbad-function-cast]
   574 |         img_x = min(max((Position) floor((float) x
       |                         ^
@@ -7740,6 +7914,9 @@
 ../xmag/Scale.c:574:21: note: in expansion of macro 'max'
   574 |         img_x = min(max((Position) floor((float) x
       |                     ^~~
+../xmag/xmag.c:1012:44: warning: cast from function call of type 'Pixel' {aka 'long unsigned int'} to non-matching type 'void *' [-Wbad-function-cast]
+ 1012 |                             XtNbackground, (XtPointer)GetMinIntensity(data),
+      |                                            ^
 ../xmag/Scale.c:574:25: warning: cast from function call of type 'double' to non-matching type 'short int' [-Wbad-function-cast]
   574 |         img_x = min(max((Position) floor((float) x
       |                         ^
@@ -7802,144 +7979,6 @@
 ../xmag/Scale.c:991:5: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   991 |     XtSetArg(wargs[n], XtNimage, (XtArgVal) image); n++;
       |     ^~~~~~~~
-../xmag/xmag.c:158:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  158 |   {"geometry", "Geometry", XtRString, sizeof(String),
-      |    ^~~~~~~~~~
-../xmag/xmag.c:158:16: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  158 |   {"geometry", "Geometry", XtRString, sizeof(String),
-      |                ^~~~~~~~~~
-../xmag/xmag.c:160:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  160 |   {"mag", "Mag", XtRString, sizeof(String),
-      |    ^~~~~
-../xmag/xmag.c:160:11: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  160 |   {"mag", "Mag", XtRString, sizeof(String),
-      |           ^~~~~
-../xmag/xmag.c:162:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  162 |   {"source", "Source", XtRString, sizeof(String),
-      |    ^~~~~~~~
-../xmag/xmag.c:162:14: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  162 |   {"source", "Source", XtRString, sizeof(String),
-      |              ^~~~~~~~
-../xmag/xmag.c:164:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  164 |   {"title", XtCString, XtRString, sizeof(char *),
-      |    ^~~~~~~
-../xmag/xmag.c:165:32: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  165 |      Offset(title), XtRString, "xmag"},
-      |                                ^~~~~~
-../xmag/xmag.c:170:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  170 |   {"-bd",         "*borderColor", XrmoptionSepArg, (XtPointer)NULL},
-      |    ^~~~~
-../xmag/xmag.c:170:19: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  170 |   {"-bd",         "*borderColor", XrmoptionSepArg, (XtPointer)NULL},
-      |                   ^~~~~~~~~~~~~~
-../xmag/xmag.c:171:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  171 |   {"-bg",         "*background",   XrmoptionSepArg, (XtPointer)NULL},
-      |    ^~~~~
-../xmag/xmag.c:171:19: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  171 |   {"-bg",         "*background",   XrmoptionSepArg, (XtPointer)NULL},
-      |                   ^~~~~~~~~~~~~
-../xmag/xmag.c:172:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  172 |   {"-bw",         "*borderWidth", XrmoptionSepArg, (XtPointer)NULL},
-      |    ^~~~~
-../xmag/xmag.c:172:19: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  172 |   {"-bw",         "*borderWidth", XrmoptionSepArg, (XtPointer)NULL},
-      |                   ^~~~~~~~~~~~~~
-../xmag/xmag.c:174:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  174 |   {"-geometry", "*geometry", XrmoptionSepArg, (XtPointer)NULL},
-      |    ^~~~~~~~~~~
-../xmag/xmag.c:174:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  174 |   {"-geometry", "*geometry", XrmoptionSepArg, (XtPointer)NULL},
-      |                 ^~~~~~~~~~~
-../xmag/xmag.c:175:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  175 |   {"-mag",      "*mag",                XrmoptionSepArg, (XtPointer)NULL},
-      |    ^~~~~~
-../xmag/xmag.c:175:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  175 |   {"-mag",      "*mag",                XrmoptionSepArg, (XtPointer)NULL},
-      |                 ^~~~~~
-../xmag/xmag.c:176:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  176 |   {"-source",   "*source",             XrmoptionSepArg, (XtPointer)NULL},
-      |    ^~~~~~~~~
-../xmag/xmag.c:176:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  176 |   {"-source",   "*source",             XrmoptionSepArg, (XtPointer)NULL},
-      |                 ^~~~~~~~~
-../xmag/xmag.c:177:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  177 |   {"-title",    "*title",              XrmoptionSepArg, (XtPointer)NULL},
-      |    ^~~~~~~~
-../xmag/xmag.c:177:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  177 |   {"-title",    "*title",              XrmoptionSepArg, (XtPointer)NULL},
-      |                 ^~~~~~~~
-../xmag/xmag.c:185:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  185 |   {"close", CloseAP},
-      |    ^~~~~~~
-../xmag/xmag.c:186:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  186 |   {"set-colors", SetCmapPropsAP},
-      |    ^~~~~~~~~~~~
-../xmag/xmag.c:187:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  187 |   {"unset-colors", UnsetCmapPropsAP},
-      |    ^~~~~~~~~~~~~~
-../xmag/xmag.c:188:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  188 |   {"new", NewAP},
-      |    ^~~~~
-../xmag/xmag.c:189:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  189 |   {"replace", ReplaceAP},
-      |    ^~~~~~~~~
-../xmag/xmag.c:190:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  190 |   {"popup-pixel", PopupPixelAP},
-      |    ^~~~~~~~~~~~~
-../xmag/xmag.c:191:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  191 |   {"update-pixel", UpdatePixelAP},
-      |    ^~~~~~~~~~~~~~
-../xmag/xmag.c:192:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  192 |   {"popdown-pixel", PopdownPixelAP},
-      |    ^~~~~~~~~~~~~~~
-../xmag/xmag.c:193:4: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  193 |   {"select-region", SelectRegionAP}
-      |    ^~~~~~~~~~~~~~~
-../xmag/xmag.c: In function 'Error':
-../xmag/xmag.c:203:16: warning: declaration of 'dpy' shadows a global declaration [-Wshadow]
-  203 | Error(Display *dpy, XErrorEvent *err)
-      |       ~~~~~~~~~^~~
-../xmag/xmag.c:107:17: note: shadowed declaration is here
-  107 | static Display *dpy;
-      |                 ^~~
-../xmag/xmag.c: In function 'CloseAP':
-../xmag/xmag.c:221:5: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  221 |     XtSetArg(wargs[0], XtNuserData, &data); n++;
-      |     ^~~~~~~~
-../xmag/xmag.c: In function 'SetCmapPropsAP':
-../xmag/xmag.c:240:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  240 |   XtSetArg(wargs[0], XtNuserData, &data); n++;
-      |   ^~~~~~~~
-../xmag/xmag.c: In function 'UnsetCmapPropsAP':
-../xmag/xmag.c:260:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  260 |   XtSetArg(wargs[0], XtNuserData, &data); n++;
-      |   ^~~~~~~~
-../xmag/xmag.c: In function 'ReplaceAP':
-../xmag/xmag.c:291:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  291 |   XtSetArg(wargs[0], XtNuserData, &data); n++;
-      |   ^~~~~~~~
-../xmag/xmag.c: In function 'PopupPixelAP':
-../xmag/xmag.c:313:5: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  313 |     XtSetArg(wargs[0], XtNuserData, &data); n++;
-      |     ^~~~~~~~
-../xmag/xmag.c: In function 'UpdatePixelAP':
-../xmag/xmag.c:361:5: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  361 |     XtSetArg(wargs[0], XtNuserData, &data); n++;
-      |     ^~~~~~~~
-../xmag/xmag.c: In function 'PopdownPixelAP':
-../xmag/xmag.c:393:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  393 |   XtSetArg(wargs[0], XtNuserData, &data); n++;
-      |   ^~~~~~~~
-../xmag/xmag.c: In function 'PopupNewScale':
-../xmag/xmag.c:998:3: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-  998 |   XtSetArg(warg, XtNuserData, data);
-      |   ^~~~~~~~
-../xmag/xmag.c:1011:44: warning: cast from function call of type 'Pixel' {aka 'long unsigned int'} to non-matching type 'void *' [-Wbad-function-cast]
- 1011 |                             XtNforeground, (XtPointer)GetMaxIntensity(data),
-      |                                            ^
-../xmag/xmag.c:1012:44: warning: cast from function call of type 'Pixel' {aka 'long unsigned int'} to non-matching type 'void *' [-Wbad-function-cast]
- 1012 |                             XtNbackground, (XtPointer)GetMinIntensity(data),
-      |                                            ^
 gcc  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security  -Wl,-z,relro -o xmag CutPaste.o RootWin.o Scale.o xmag.o -lXaw7 -lXmu -lXt -lX11  -lm 
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xmag-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xmag-build'
@@ -7947,18 +7986,19 @@
 >stampdir/build-xmag
 mkdir -p stampdir
 dh_auto_build -Dxman -Bxman-build
-	cd xman-build && make -j3
+	cd xman-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xman-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xman-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xman-build/man'
-/bin/sed -e 's|__vendorversion__|"xman 1.1.5" "X Version 11"|' 	-e 's|__xorgversion__|"xman 1.1.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xman/man/xman.man > xman.1
+/usr/bin/sed -e 's|__vendorversion__|"xman 1.1.5" "X Version 11"|' 	-e 's|__xorgversion__|"xman 1.1.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xman/man/xman.man > xman.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xman-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xman-build'
 gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o buttons.o ../xman/buttons.c
 gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o globals.o ../xman/globals.c
 gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o handler.o ../xman/handler.c
+gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o help.o ../xman/help.c
 In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
                  from /usr/include/X11/Xlib.h:38,
                  from /usr/include/X11/Intrinsic.h:53,
@@ -7981,7 +8021,6 @@
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o help.o ../xman/help.c
 In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
                  from /usr/include/X11/Xlib.h:38,
                  from /usr/include/X11/Intrinsic.h:53,
@@ -7991,6 +8030,17 @@
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o main.o ../xman/main.c
+gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o man.o ../xman/man.c
+In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
+                 from /usr/include/X11/Xlib.h:38,
+                 from /usr/include/X11/Intrinsic.h:53,
+                 from ../xman/man.h:37,
+                 from ../xman/globals.h:34,
+                 from ../xman/main.c:37:
+/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+      |   ^~~~~~~
 ../xman/handler.c: In function 'SaveFormattedPage':
 ../xman/handler.c:357:58: warning: '%s' directive output may be truncated writing up to 8191 bytes into a region of size 8157 [-Wformat-truncation=]
   357 |                      "Error while executing the command '%s'.\n", cmdbuf);
@@ -8008,13 +8058,12 @@
       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    56 |                                    __va_arg_pack ());
       |                                    ~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o main.o ../xman/main.c
 In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
                  from /usr/include/X11/Xlib.h:38,
                  from /usr/include/X11/Intrinsic.h:53,
                  from ../xman/man.h:37,
                  from ../xman/globals.h:34,
-                 from ../xman/main.c:37:
+                 from ../xman/man.c:32:
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
@@ -8126,16 +8175,6 @@
 ../xman/main.c:111:17: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   111 |     {"-iconic", "iconic", XrmoptionNoArg, (caddr_t) "True"},
       |                 ^~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o man.o ../xman/man.c
-In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
-                 from /usr/include/X11/Xlib.h:38,
-                 from /usr/include/X11/Intrinsic.h:53,
-                 from ../xman/man.h:37,
-                 from ../xman/globals.h:34,
-                 from ../xman/man.c:32:
-/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-      |   ^~~~~~~
 gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o misc.o ../xman/misc.c
 gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o ScrollByL.o ../xman/ScrollByL.c
 In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
@@ -8153,6 +8192,7 @@
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o search.o ../xman/search.c
 ../xman/ScrollByL.c:71:37: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    71 |      Offset(foreground), XtRString, "XtDefaultForeground"},
       |                                     ^~~~~~~~~~~~~~~~~~~~~
@@ -8182,6 +8222,15 @@
 ../xman/ScrollByL.h:53:26: note: in definition of macro 'MANPAGE_SYMBOL'
    53 | #define MANPAGE_SYMBOL   "*-symbol-medium-r-normal--*-120-*"
       |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
+                 from /usr/include/X11/Xlib.h:38,
+                 from /usr/include/X11/Intrinsic.h:53,
+                 from ../xman/man.h:37,
+                 from ../xman/globals.h:34,
+                 from ../xman/search.c:32:
+/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+      |   ^~~~~~~
 ../xman/misc.c: In function 'UncompressNamed':
 ../xman/misc.c:432:55: warning: '%s' directive output may be truncated writing up to 8191 bytes into a region of size 8152 [-Wformat-truncation=]
   432 |              "Error while uncompressing, command was: %s", cmdbuf);
@@ -8197,6 +8246,34 @@
       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    56 |                                    __va_arg_pack ());
       |                                    ~~~~~~~~~~~~~~~~~
+../xman/search.c: In function 'DoSearch':
+../xman/search.c:219:58: warning: '%s' directive output may be truncated writing up to 8191 bytes into a region of size 8157 [-Wformat-truncation=]
+  219 |                      "Something went wrong trying to run %s\n", cmdbuf);
+      |                                                          ^~     ~~~~~~
+In file included from /usr/include/stdio.h:906,
+                 from ../xman/man.h:45:
+In function 'snprintf',
+    inlined from 'DoSearch' at ../xman/search.c:218:13:
+/usr/include/arm-linux-gnueabihf/bits/stdio2.h:54:10: note: '__builtin___snprintf_chk' output between 37 and 8228 bytes into a destination of size 8192
+   54 |   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
+      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   55 |                                    __glibc_objsize (__s), __fmt,
+      |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   56 |                                    __va_arg_pack ());
+      |                                    ~~~~~~~~~~~~~~~~~
+../xman/search.c: In function 'DoSearch':
+../xman/search.c:268:19: warning: '%s' directive output may be truncated writing up to 8191 bytes into a region of size 80 [-Wformat-truncation=]
+  268 |                  "%s", label);
+      |                   ^~   ~~~~~
+In function 'snprintf',
+    inlined from 'DoSearch' at ../xman/search.c:267:9:
+/usr/include/arm-linux-gnueabihf/bits/stdio2.h:54:10: note: '__builtin_snprintf' output between 1 and 8192 bytes into a destination of size 80
+   54 |   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
+      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   55 |                                    __glibc_objsize (__s), __fmt,
+      |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   56 |                                    __va_arg_pack ());
+      |                                    ~~~~~~~~~~~~~~~~~
 ../xman/misc.c: In function 'Format':
 ../xman/misc.c:865:44: warning: '%s' directive output may be truncated writing 3 bytes into a region of size between 0 and 8191 [-Wformat-truncation=]
   865 |         snprintf(input, sizeof(input), "%s.%s", filename, BZIP2_EXTENSION);
@@ -8434,6 +8511,13 @@
       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    56 |                                    __va_arg_pack ());
       |                                    ~~~~~~~~~~~~~~~~~
+gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o tkfuncs.o ../xman/tkfuncs.c
+In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
+                 from /usr/include/X11/Xos.h:42,
+                 from ../xman/tkfuncs.c:32:
+/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+      |   ^~~~~~~
 ../xman/misc.c: In function 'FindManualFile':
 ../xman/misc.c:221:46: warning: '%s' directive output may be truncated writing 3 bytes into a region of size between 0 and 8191 [-Wformat-truncation=]
   221 |     snprintf(filename, sizeof(filename), "%s/%s%s/%s",
@@ -8512,23 +8596,6 @@
       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    56 |                                    __va_arg_pack ());
       |                                    ~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o search.o ../xman/search.c
-gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o tkfuncs.o ../xman/tkfuncs.c
-In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
-                 from /usr/include/X11/Xlib.h:38,
-                 from /usr/include/X11/Intrinsic.h:53,
-                 from ../xman/man.h:37,
-                 from ../xman/globals.h:34,
-                 from ../xman/search.c:32:
-/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-      |   ^~~~~~~
-In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
-                 from /usr/include/X11/Xos.h:42,
-                 from ../xman/tkfuncs.c:32:
-/usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-  194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-      |   ^~~~~~~
 gcc -DHAVE_CONFIG_H -I. -I../xman   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vendor.o ../xman/vendor.c
 In file included from /usr/include/arm-linux-gnueabihf/sys/types.h:25,
                  from /usr/include/X11/Xlib.h:38,
@@ -8539,34 +8606,6 @@
 /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
   194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       |   ^~~~~~~
-../xman/search.c: In function 'DoSearch':
-../xman/search.c:219:58: warning: '%s' directive output may be truncated writing up to 8191 bytes into a region of size 8157 [-Wformat-truncation=]
-  219 |                      "Something went wrong trying to run %s\n", cmdbuf);
-      |                                                          ^~     ~~~~~~
-In file included from /usr/include/stdio.h:906,
-                 from ../xman/man.h:45:
-In function 'snprintf',
-    inlined from 'DoSearch' at ../xman/search.c:218:13:
-/usr/include/arm-linux-gnueabihf/bits/stdio2.h:54:10: note: '__builtin___snprintf_chk' output between 37 and 8228 bytes into a destination of size 8192
-   54 |   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
-      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   55 |                                    __glibc_objsize (__s), __fmt,
-      |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   56 |                                    __va_arg_pack ());
-      |                                    ~~~~~~~~~~~~~~~~~
-../xman/search.c: In function 'DoSearch':
-../xman/search.c:268:19: warning: '%s' directive output may be truncated writing up to 8191 bytes into a region of size 80 [-Wformat-truncation=]
-  268 |                  "%s", label);
-      |                   ^~   ~~~~~
-In function 'snprintf',
-    inlined from 'DoSearch' at ../xman/search.c:267:9:
-/usr/include/arm-linux-gnueabihf/bits/stdio2.h:54:10: note: '__builtin_snprintf' output between 1 and 8192 bytes into a destination of size 80
-   54 |   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
-      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   55 |                                    __glibc_objsize (__s), __fmt,
-      |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   56 |                                    __va_arg_pack ());
-      |                                    ~~~~~~~~~~~~~~~~~
 gcc -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -D_CONST_X_STRING -D_BSD_SOURCE -DHELPFILE=\"/usr/share/X11/xman.help\" -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security  -Wl,-z,relro -o xman buttons.o globals.o handler.o help.o main.o man.o misc.o ScrollByL.o search.o tkfuncs.o vendor.o -lXaw7 -lXt -lX11  
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xman-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xman-build'
@@ -8574,13 +8613,13 @@
 >stampdir/build-xman
 mkdir -p stampdir
 dh_auto_build -Dxmore -Bxmore-build
-	cd xmore-build && make -j3
+	cd xmore-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xmore-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xmore-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xmore-build/man'
-/bin/sed -e 's|__vendorversion__|"xmore 1.0.3" "X Version 11"|' 	-e 's|__xorgversion__|"xmore 1.0.3" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xmore/man/xmore.man > xmore.1
+/usr/bin/sed -e 's|__vendorversion__|"xmore 1.0.3" "X Version 11"|' 	-e 's|__xorgversion__|"xmore 1.0.3" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__|/etc/X11/app-defaults|g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xmore/man/xmore.man > xmore.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xmore-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xmore-build'
 gcc -DHAVE_CONFIG_H -I. -I../xmore   -Wdate-time -D_FORTIFY_SOURCE=2  -DXMORE -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xmore.o ../xmore/xmore.c
@@ -8644,13 +8683,13 @@
 >stampdir/build-xmore
 mkdir -p stampdir
 dh_auto_build -Dxwd -Bxwd-build
-	cd xwd-build && make -j3
+	cd xwd-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xwd-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xwd-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xwd-build/man'
-/bin/sed -e 's|__vendorversion__|"xwd 1.0.8" "X Version 11"|' 	-e 's|__xorgversion__|"xwd 1.0.8" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xwd/man/xwd.man > xwd.1
+/usr/bin/sed -e 's|__vendorversion__|"xwd 1.0.8" "X Version 11"|' 	-e 's|__xorgversion__|"xwd 1.0.8" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xwd/man/xwd.man > xwd.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xwd-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xwd-build'
 gcc -DHAVE_CONFIG_H -I. -I../xwd   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o clientwin.o ../xwd/clientwin.c
@@ -8665,13 +8704,13 @@
 >stampdir/build-xwd
 mkdir -p stampdir
 dh_auto_build -Dxwud -Bxwud-build
-	cd xwud-build && make -j3
+	cd xwud-build && make -j4
 make[2]: Entering directory '/build/x11-apps-7.7+9/xwud-build'
 make  all-recursive
 make[3]: Entering directory '/build/x11-apps-7.7+9/xwud-build'
 Making all in man
 make[4]: Entering directory '/build/x11-apps-7.7+9/xwud-build/man'
-/bin/sed -e 's|__vendorversion__|"xwud 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"xwud 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xwud/man/xwud.man > xwud.1
+/usr/bin/sed -e 's|__vendorversion__|"xwud 1.0.5" "X Version 11"|' 	-e 's|__xorgversion__|"xwud 1.0.5" "X Version 11"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|/usr|g' 	-e 's|__apploaddir__||g' 	-e 's|__appmansuffix__|1|g' 	-e 's|__drivermansuffix__|4|g' 	-e 's|__adminmansuffix__|8|g' 	-e 's|__libmansuffix__|3|g' 	-e 's|__miscmansuffix__|7|g' 	-e 's|__filemansuffix__|5|g' < ../../xwud/man/xwud.man > xwud.1
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xwud-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xwud-build'
 gcc -DHAVE_CONFIG_H -I. -I../xwud   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing  -g -O2 -ffile-prefix-map=/build/x11-apps-7.7+9=. -fstack-protector-strong -Wformat -Werror=format-security -c -o xwud.o ../xwud/xwud.c
@@ -8702,17 +8741,17 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/bitmap-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/bitmap-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 bitmap.1 atobm.1 bmtoa.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/bitmap-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/bitmap-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/bitmap-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/bitmap-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c bitmap bmtoa atobm '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../bitmap/app-defaults/Bitmap-color ../bitmap/app-defaults/Bitmap-nocase ../bitmap/app-defaults/Bitmap '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/include/X11/bitmaps'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/include/X11/bitmaps'
  /usr/bin/install -c -m 644 ../bitmap/Dashes ../bitmap/Down ../bitmap/Excl ../bitmap/FlipHoriz ../bitmap/FlipVert ../bitmap/Fold ../bitmap/Left ../bitmap/Right ../bitmap/RotateLeft ../bitmap/RotateRight ../bitmap/Stipple ../bitmap/Term ../bitmap/Up '/build/x11-apps-7.7+9/debian/tmp/usr/include/X11/bitmaps'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/bitmap-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/bitmap-build'
@@ -8722,13 +8761,13 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/ico-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/ico-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 ico.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/ico-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/ico-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/ico-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/ico-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c ico '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
 make[4]: Nothing to be done for 'install-data-am'.
 make[4]: Leaving directory '/build/x11-apps-7.7+9/ico-build'
@@ -8739,15 +8778,15 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/oclock-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/oclock-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 oclock.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/oclock-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/oclock-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/oclock-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/oclock-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c oclock '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../oclock/app-defaults/Clock-color '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/oclock-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/oclock-build'
@@ -8757,13 +8796,13 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/rendercheck-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/rendercheck-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 rendercheck.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/rendercheck-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/rendercheck-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/rendercheck-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/rendercheck-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c rendercheck '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
 make[4]: Nothing to be done for 'install-data-am'.
 make[4]: Leaving directory '/build/x11-apps-7.7+9/rendercheck-build'
@@ -8774,13 +8813,13 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/transset-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/transset-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 transset.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/transset-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/transset-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/transset-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/transset-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c transset '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
 make[4]: Nothing to be done for 'install-data-am'.
 make[4]: Leaving directory '/build/x11-apps-7.7+9/transset-build'
@@ -8791,17 +8830,17 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/x11perf-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/x11perf-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 x11perfcomp.1 x11perf.1 Xmark.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/x11perf-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/x11perf-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/x11perf-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/x11perf-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c x11perf '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
  /usr/bin/install -c x11perfcomp '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/lib/X11/x11perfcomp'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/lib/X11/x11perfcomp'
  /usr/bin/install -c ../x11perf/fillblnk ../x11perf/perfboth ../x11perf/perfratio ../x11perf/Xmark '/build/x11-apps-7.7+9/debian/tmp/usr/lib/X11/x11perfcomp'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/x11perf-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/x11perf-build'
@@ -8811,13 +8850,13 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xbiff-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xbiff-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xbiff.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xbiff-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xbiff-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xbiff-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xbiff-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xbiff '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
 make[4]: Nothing to be done for 'install-data-am'.
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xbiff-build'
@@ -8828,15 +8867,15 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xcalc-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xcalc-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xcalc.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xcalc-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xcalc-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xcalc-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xcalc-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xcalc '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xcalc/app-defaults/XCalc ../xcalc/app-defaults/XCalc-color '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xcalc-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xcalc-build'
@@ -8846,15 +8885,15 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xclipboard-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xclipboard-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xclipboard.1 xcutsel.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xclipboard-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xclipboard-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xclipboard-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xclipboard-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xclipboard xcutsel '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xclipboard/app-defaults/XClipboard '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xclipboard-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xclipboard-build'
@@ -8864,15 +8903,15 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xclock-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xclock-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xclock.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xclock-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xclock-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xclock-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xclock-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xclock '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xclock/app-defaults/XClock-color ../xclock/app-defaults/XClock '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xclock-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xclock-build'
@@ -8882,15 +8921,15 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xconsole-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xconsole-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xconsole.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xconsole-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xconsole-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xconsole-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xconsole-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xconsole '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xconsole/app-defaults/XConsole '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xconsole-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xconsole-build'
@@ -8900,13 +8939,13 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xcursorgen-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xcursorgen-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xcursorgen.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xcursorgen-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xcursorgen-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xcursorgen-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xcursorgen-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xcursorgen '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
 make[4]: Nothing to be done for 'install-data-am'.
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xcursorgen-build'
@@ -8917,17 +8956,17 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xditview-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xditview-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xditview.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xditview-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xditview-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xditview-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xditview-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xditview '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xditview/app-defaults/Xditview ../xditview/app-defaults/Xditview-chrtr '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/include/X11/bitmaps'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/include/X11/bitmaps'
  /usr/bin/install -c -m 644 ../xditview/ldblarrow ../xditview/rdblarrow '/build/x11-apps-7.7+9/debian/tmp/usr/include/X11/bitmaps'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xditview-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xditview-build'
@@ -8937,19 +8976,19 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xedit-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xedit-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xedit.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xedit-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xedit-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xedit-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xedit-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xedit '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xedit/app-defaults/Xedit-color ../xedit/app-defaults/Xedit '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/lib/X11/xedit/lisp'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/lib/X11/xedit/lisp'
  /usr/bin/install -c -m 644 ../xedit/lisp/modules/lisp.lsp ../xedit/lisp/modules/xedit.lsp ../xedit/lisp/modules/syntax.lsp ../xedit/lisp/modules/indent.lsp '/build/x11-apps-7.7+9/debian/tmp/usr/lib/X11/xedit/lisp'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/lib/X11/xedit/lisp/progmodes'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/lib/X11/xedit/lisp/progmodes'
  /usr/bin/install -c -m 644 ../xedit/lisp/modules/progmodes/auto.lsp ../xedit/lisp/modules/progmodes/c.lsp ../xedit/lisp/modules/progmodes/html.lsp ../xedit/lisp/modules/progmodes/imake.lsp ../xedit/lisp/modules/progmodes/lisp.lsp ../xedit/lisp/modules/progmodes/make.lsp ../xedit/lisp/modules/progmodes/man.lsp ../xedit/lisp/modules/progmodes/patch.lsp ../xedit/lisp/modules/progmodes/perl.lsp ../xedit/lisp/modules/progmodes/python.lsp ../xedit/lisp/modules/progmodes/rpm.lsp ../xedit/lisp/modules/progmodes/sgml.lsp ../xedit/lisp/modules/progmodes/sh.lsp ../xedit/lisp/modules/progmodes/xconf.lsp ../xedit/lisp/modules/progmodes/xlog.lsp ../xedit/lisp/modules/progmodes/xrdb.lsp '/build/x11-apps-7.7+9/debian/tmp/usr/lib/X11/xedit/lisp/progmodes'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xedit-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xedit-build'
@@ -8959,13 +8998,13 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xeyes-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xeyes-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xeyes.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xeyes-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xeyes-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xeyes-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xeyes-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xeyes '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
 make[4]: Nothing to be done for 'install-data-am'.
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xeyes-build'
@@ -8978,15 +9017,15 @@
 make[4]: Entering directory '/build/x11-apps-7.7+9/xgc-build/man'
 make[5]: Entering directory '/build/x11-apps-7.7+9/xgc-build/man'
 make[5]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xgc.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[5]: Leaving directory '/build/x11-apps-7.7+9/xgc-build/man'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xgc-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xgc-build'
 make[5]: Entering directory '/build/x11-apps-7.7+9/xgc-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xgc '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xgc/app-defaults/Xgc ../xgc/app-defaults/Xgc-color '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[5]: Leaving directory '/build/x11-apps-7.7+9/xgc-build'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xgc-build'
@@ -8997,15 +9036,15 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xload-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xload-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xload.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xload-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xload-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xload-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xload-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xload '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xload/app-defaults/XLoad '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xload-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xload-build'
@@ -9015,15 +9054,15 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xlogo-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xlogo-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xlogo.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xlogo-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xlogo-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xlogo-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xlogo-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xlogo '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xlogo/app-defaults/XLogo ../xlogo/app-defaults/XLogo-color '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xlogo-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xlogo-build'
@@ -9033,15 +9072,15 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xmag-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xmag-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xmag.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xmag-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xmag-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xmag-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xmag-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xmag '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xmag/app-defaults/Xmag '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xmag-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xmag-build'
@@ -9051,17 +9090,17 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xman-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xman-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xman.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xman-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xman-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xman-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xman-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xman '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xman/app-defaults/Xman '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/X11'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/X11'
  /usr/bin/install -c -m 644 ../xman/xman.help '/build/x11-apps-7.7+9/debian/tmp/usr/share/X11'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xman-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xman-build'
@@ -9071,15 +9110,15 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xmore-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xmore-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xmore.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xmore-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xmore-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xmore-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xmore-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xmore '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
  /usr/bin/install -c -m 644 ../xmore/app-defaults/XMore '/build/x11-apps-7.7+9/debian/tmp/etc/X11/app-defaults'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xmore-build'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xmore-build'
@@ -9089,13 +9128,13 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xwd-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xwd-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xwd.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xwd-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xwd-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xwd-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xwd-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xwd '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
 make[4]: Nothing to be done for 'install-data-am'.
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xwd-build'
@@ -9106,13 +9145,13 @@
 make[3]: Entering directory '/build/x11-apps-7.7+9/xwud-build/man'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xwud-build/man'
 make[4]: Nothing to be done for 'install-exec-am'.
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
  /usr/bin/install -c -m 644 xwud.1 '/build/x11-apps-7.7+9/debian/tmp/usr/share/man/man1'
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xwud-build/man'
 make[3]: Leaving directory '/build/x11-apps-7.7+9/xwud-build/man'
 make[3]: Entering directory '/build/x11-apps-7.7+9/xwud-build'
 make[4]: Entering directory '/build/x11-apps-7.7+9/xwud-build'
- /bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
+ /usr/bin/mkdir -p '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
   /usr/bin/install -c xwud '/build/x11-apps-7.7+9/debian/tmp/usr/bin'
 make[4]: Nothing to be done for 'install-data-am'.
 make[4]: Leaving directory '/build/x11-apps-7.7+9/xwud-build'
@@ -9141,8 +9180,8 @@
    dh_gencontrol
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'x11-apps-dbgsym' in '../x11-apps-dbgsym_7.7+9_armhf.deb'.
 dpkg-deb: building package 'x11-apps' in '../x11-apps_7.7+9_armhf.deb'.
+dpkg-deb: building package 'x11-apps-dbgsym' in '../x11-apps-dbgsym_7.7+9_armhf.deb'.
  dpkg-genbuildinfo --build=binary -O../x11-apps_7.7+9_armhf.buildinfo
  dpkg-genchanges --build=binary -O../x11-apps_7.7+9_armhf.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -9150,12 +9189,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: including full source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/32004/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/32004/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/21032 and its subdirectories
-I: Current time: Fri Jun  9 04:31:05 -12 2023
-I: pbuilder-time-stamp: 1686328265
+I: removing directory /srv/workspace/pbuilder/32004 and its subdirectories
+I: Current time: Sat Jun 10 06:45:41 +14 2023
+I: pbuilder-time-stamp: 1686329141