Imported Upstream version 2.6.4

scripts/augeas/Makefile.am

@@ -5,7 +5,7 @@ EXTRA_DIST = gen-nutupsconf-aug.py nutupsconf.aug.tpl \
 # only call the script to generate Augeas ups.conf lens upon "make dist",
 # and if Python is present
 dist-hook:
-	@if python -c pass; then \
+	@if python -c "import re,glob,codecs"; then \
 		echo "Regenerating Augeas ups.conf lens."; \
 		$(distdir)/gen-nutupsconf-aug.py $(distdir)/; \
 	else \

scripts/augeas/Makefile.in

@@ -155,6 +155,7 @@ MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
+NUT_NETVERSION = @NUT_NETVERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OS_NAME = @OS_NAME@
@@ -168,6 +169,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PIDPATH = @PIDPATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -175,6 +177,7 @@ PORT = @PORT@
 RANLIB = @RANLIB@
 RUN_AS_GROUP = @RUN_AS_GROUP@
 RUN_AS_USER = @RUN_AS_USER@
+SBINDIR = @SBINDIR@
 SED = @SED@
 SERLIBS = @SERLIBS@
 SET_MAKE = @SET_MAKE@
@@ -459,7 +462,7 @@ uninstall-am:
 # only call the script to generate Augeas ups.conf lens upon "make dist",
 # and if Python is present
 dist-hook:
-	@if python -c pass; then \
+	@if python -c "import re,glob,codecs"; then \
 		echo "Regenerating Augeas ups.conf lens."; \
 		$(distdir)/gen-nutupsconf-aug.py $(distdir)/; \
 	else \

scripts/augeas/nutupsconf.aug.in

@@ -58,6 +58,7 @@ let ups_fields   = "driver"
                  | "awd"
                  | "batteryPercentage"
                  | "battext"
+                 | "battvoltmult"
                  | "baud_rate"
                  | "baudrate"
                  | "bus"