Imported Upstream version 2.6.1

scripts/augeas/Makefile.in

@@ -43,7 +43,6 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/nutupssetconf.aug.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
-	$(top_srcdir)/m4/ax_create_stdint_h.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 \

scripts/augeas/nutupsconf.aug.in

@@ -51,6 +51,7 @@ let ups_fields   = "driver"
                  | "OffDelay"
                  | "OnDelay"
                  | "SD"
+                 | "advorder"
                  | "authPassword"
                  | "authProtocol"
                  | "batteryPercentage"
@@ -143,6 +144,7 @@ let ups_fields   = "driver"
                  | "vendorid"
                  | "voltage"
                  | "wait"
+                 | "wugrace"
 
 
 let ups_entry    = IniFile.indented_entry (ups_global|ups_fields) ups_sep ups_comment