Sync

(Closes: #499475)

.hgignore

@@ -0,0 +1,4 @@
+(^|/)CVS($|/)
+(^|/)\.hg($|/)
+(^|/)\.hgtags($|/)
+ChangeLog

bin/xen-create-image

@@ -1360,7 +1360,7 @@ sub parseCommandLineArguments
         "swap-dev=s",  \$install{'swap-dev'},
 
         # Networking options
-        "dhcp!",       \$CONFIG{'dhcp'},
+        "dhcp",        \$CONFIG{'dhcp'},
         "gateway=s",   \$CONFIG{'gateway'},
         "hostname=s",  \$CONFIG{'hostname'},
         "ip=s@",       \$CONFIG{'ip'},
@@ -1377,29 +1377,29 @@ sub parseCommandLineArguments
         "install-source=s", \$CONFIG{'install-source'},
 
         # Misc. options
-        "accounts!",    \$CONFIG{'accounts'},
+        "accounts",     \$CONFIG{'accounts'},
         "admins=s",     \$CONFIG{'admins'},
         "arch=s",       \$CONFIG{'arch'},
         "fs=s",         \$CONFIG{'fs'},
-        "boot!",        \$CONFIG{'boot'},
+        "boot",         \$CONFIG{'boot'},
         "cache=s",      \$CONFIG{'cache'},
         "config=s",     \$CONFIG{'config'},
-        "ide!",         \$CONFIG{'ide'},
+        "ide",          \$CONFIG{'ide'},
         "install=i",    \$CONFIG{'install'},
         "hooks=i",      \$CONFIG{'hooks'},
-        "passwd!",      \$CONFIG{'passwd'},
+        "passwd",       \$CONFIG{'passwd'},
         "partitions=s", \$CONFIG{'partitions'},
         "role=s",       \$CONFIG{'role'},
         "role-args=s",  \$CONFIG{'role-args'},
         "roledir=s",    \$CONFIG{'roledir'},
-        "force!",       \$CONFIG{'force'},
-        "keep!",        \$CONFIG{'keep'},
+        "force",        \$CONFIG{'force'},
+        "keep",         \$CONFIG{'keep'},
         "template=s",   \$CONFIG{'template'},
         "output=s",     \$CONFIG{'output'},
         "extension=s",  \$CONFIG{'extension'},
 
         # Help options
-        "debug!",  \$CONFIG{'debug'},
+        "debug",   \$CONFIG{'debug'},
         "help",    \$HELP,
         "manual",  \$MANUAL,
         "verbose", \$CONFIG{'verbose'},

debian/changelog

@@ -1,11 +1,3 @@
-xen-tools (3.9-6) unstable; urgency=low
-
-  - Allow command line flags to be unset.
-    Thanks to Ruud Koolen for the patch.
-    (Closes: #484338)
-
- -- Steve Kemp <skx@debian.org>  Tue, 14 Oct 2008 22:00:22 +0000
-
 xen-tools (3.9-5) unstable; urgency=medium
 
   - Record the ARCH for RPM-based distros.

debian/control

@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Roland Stigge <stigge@antcom.de>
 Uploaders: Radu Spineanu <radu@debian.org>, Steve Kemp <skx@debian.org>
 Build-Depends: debhelper (>= 4.0.0), libtest-pod-perl, libtext-template-perl
-Standards-Version: 3.8.0
+Standards-Version: 3.7.3
 Homepage: http://xen-tools.org/software/xen-tools
 
 Package: xen-tools