=== modified file 'conf/ups.conf.sample'
--- conf/ups.conf.sample	2014-04-22 20:46:12 +0000
+++ conf/ups.conf.sample	2015-01-10 22:13:31 +0000
@@ -96,7 +96,10 @@
 #
 # Anything else is passed through to the hardware-specific part of
 # the driver.
-# 
+
+# Set maxretry to 3 by default, this should mitigate race with slow devices:
+maxretry = 3
+
 # Examples
 # --------
 #
@@ -120,6 +123,3 @@
 #
 # To find out if your driver supports any extra settings, start it with
 # the -h option and/or read the driver's documentation.
-
-# Set maxretry to 3 by default, this should mitigate race with slow devices:
-maxretry = 3

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-22 20:46:12 +0000
+++ debian/changelog	2014-12-26 17:49:13 +0000
@@ -1,3 +1,11 @@
+nut (2.7.2-1ubuntu-pkg-import-still-broken-btw1) UNRELEASED; urgency=low
+
+  * debian/patches/0009-ups-conf-reorder.patch: Move maxretry setting
+    above Examples section, closer to the "outside of a driver definition"
+    comment.
+
+ -- Tuomas Heino <iheino+ub@cc.hut.fi>  Fri, 26 Dec 2014 19:36:45 +0200
+
 nut (2.7.2-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'debian/patches/0006-ups-conf-maxretry.patch'
--- debian/patches/0006-ups-conf-maxretry.patch	2014-04-22 20:46:12 +0000
+++ debian/patches/0006-ups-conf-maxretry.patch	2015-01-10 22:13:31 +0000
@@ -25,10 +25,15 @@
  # 
  # These directives are common to all drivers that support ups.conf:
  #
-@@ -102,3 +120,6 @@
+@@ -78,7 +96,10 @@
  #
- # To find out if your driver supports any extra settings, start it with
- # the -h option and/or read the driver's documentation.
+ # Anything else is passed through to the hardware-specific part of
+ # the driver.
+-# 
 +
 +# Set maxretry to 3 by default, this should mitigate race with slow devices:
 +maxretry = 3
++
+ # Examples
+ # --------
+ #