Merge remote-tracking branch 'origin/pr/170'

* origin/pr/170:
  use long rather than short option names;

debian/qubes-core-agent-passwordless-root.postrm

@@ -37,13 +37,12 @@ set -e
 # the debian-policy package
 
 if [ "${1}" = "remove" ] ; then
-    gpasswd -d user sudo
+    gpasswd --delete user sudo
     if [ "$(passwd -S root|cut -f 2 -d ' ')" = "NP" ]; then
-        passwd -l root
+        passwd --lock root
     fi
 fi
 
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.