More changes and cleanups.

.travis.yml

@@ -8,7 +8,7 @@
 #
 #		Project file for the Travis CI remote builder service.
 #
-# Version:	@(#).travis.yml	1.0.11	2018/05/08
+# Version:	@(#).travis.yml	1.0.11	2018/05/09
 #
 # Authors:	Natalia Portillo, <claunia@claunia.com>
 #		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -62,9 +62,9 @@ env:
 
 before_install:
   # Kill off the (most likely running) APT daily update.
-  - sudo systemctl stop apt-daily.service
-# - sudo systemctl kill --kill-who=all apt-daily.service
-  - sleep 5
+# - sudo systemctl stop apt-daily.service
+  - sudo systemctl kill --kill-who=all apt-daily.service
+  - sleep 10
   - sudo rm -f /var/lib/dpkg/lock
   # Now install some packages we need.
   - sudo apt-get install libz-mingw-w64-dev