Index: trunk/packages/invirt-console/debian/changelog
===================================================================
--- trunk/packages/invirt-console/debian/changelog	(revision 3010)
+++ trunk/packages/invirt-console/debian/changelog	(revision 3011)
@@ -1,2 +1,8 @@
+invirt-console (0.2.14) unstable; urgency=low
+
+  * Use the .. Perl operator to simplify the invirt-console-host prerm.
+
+ -- Evan Broder <broder@mit.edu>  Thu, 27 May 2010 11:55:53 -0400
+
 invirt-console (0.2.13) unstable; urgency=low
 
Index: trunk/packages/invirt-console/debian/invirt-console-host.postinst
===================================================================
--- trunk/packages/invirt-console/debian/invirt-console-host.postinst	(revision 3010)
+++ trunk/packages/invirt-console/debian/invirt-console-host.postinst	(revision 3011)
@@ -21,7 +21,4 @@
 case "$1" in
     configure)
-        # Clean up the old sudoers line before we add it back
-        perl -i.bak -ne 's%^### (BEGIN|END) invirt-console-host\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
-        
         cat >>/etc/sudoers <<EOF
 ### BEGIN invirt-console-host
Index: trunk/packages/invirt-console/debian/invirt-console-host.prerm
===================================================================
--- trunk/packages/invirt-console/debian/invirt-console-host.prerm	(revision 3010)
+++ trunk/packages/invirt-console/debian/invirt-console-host.prerm	(revision 3011)
@@ -20,5 +20,5 @@
 case "$1" in
     remove|upgrade|deconfigure)
-        perl -i.bak -ne 's%^### (BEGIN|END) invirt-console-host\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        perl -i.bak -ne 'print unless /^### BEGIN invirt-console-host/../^### END invirt-console-host/' /etc/sudoers
     ;;
 
Index: trunk/packages/invirt-dev/debian/changelog
===================================================================
--- trunk/packages/invirt-dev/debian/changelog	(revision 3010)
+++ trunk/packages/invirt-dev/debian/changelog	(revision 3011)
@@ -8,6 +8,7 @@
     upgrades, make sure the postinst code to add it back runs on all
     upgrades, too.
-
- -- Evan Broder <broder@mit.edu>  Thu, 17 Dec 2009 16:06:31 -0600
+  * Use the .. Perl operator to simplify the prerm.
+
+ -- Evan Broder <broder@mit.edu>  Thu, 27 May 2010 11:55:06 -0400
 
 invirt-dev (0.0.14) unstable; urgency=low
Index: trunk/packages/invirt-dev/debian/invirt-dev.prerm
===================================================================
--- trunk/packages/invirt-dev/debian/invirt-dev.prerm	(revision 3010)
+++ trunk/packages/invirt-dev/debian/invirt-dev.prerm	(revision 3011)
@@ -22,5 +22,5 @@
         [ "$1" = "remove" ] && update-inetd --disable git
 
-        perl -i.bak -ne 's%^### (BEGIN|END) invirt-dev\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        perl -i.bak -ne 'print unless /^### BEGIN invirt-dev/../^### END invirt-dev/' /etc/sudoers
     ;;
 
Index: trunk/packages/xvm-munin-config/debian/changelog
===================================================================
--- trunk/packages/xvm-munin-config/debian/changelog	(revision 3010)
+++ trunk/packages/xvm-munin-config/debian/changelog	(revision 3011)
@@ -1,2 +1,8 @@
+xvm-munin-config (0.0.12) unstable; urgency=low
+
+  * Use the .. perl operator to simplify the prerms.
+
+ -- Evan Broder <broder@mit.edu>  Thu, 27 May 2010 11:55:31 -0400
+
 xvm-munin-config (0.0.11) unstable; urgency=low
 
Index: trunk/packages/xvm-munin-config/debian/xvm-munin-console-config.prerm
===================================================================
--- trunk/packages/xvm-munin-config/debian/xvm-munin-console-config.prerm	(revision 3010)
+++ trunk/packages/xvm-munin-config/debian/xvm-munin-console-config.prerm	(revision 3011)
@@ -20,5 +20,5 @@
 case "$1" in
     remove|upgrade|deconfigure)
-        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        perl -i.bak -ne 'print unless /^### BEGIN xvm-munin-config/../^### END xvm-munin-config/' /etc/sudoers
     ;;
 
Index: trunk/packages/xvm-munin-config/debian/xvm-munin-host-config.prerm
===================================================================
--- trunk/packages/xvm-munin-config/debian/xvm-munin-host-config.prerm	(revision 3010)
+++ trunk/packages/xvm-munin-config/debian/xvm-munin-host-config.prerm	(revision 3011)
@@ -20,5 +20,5 @@
 case "$1" in
     remove|upgrade|deconfigure)
-        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        perl -i.bak -ne 'print unless /^### BEGIN xvm-munin-config/../^### END xvm-munin-config/' /etc/sudoers
     ;;
 
Index: trunk/packages/xvm-munin-config/debian/xvm-munin-master-config.prerm
===================================================================
--- trunk/packages/xvm-munin-config/debian/xvm-munin-master-config.prerm	(revision 3010)
+++ trunk/packages/xvm-munin-config/debian/xvm-munin-master-config.prerm	(revision 3011)
@@ -20,5 +20,5 @@
 case "$1" in
     remove|upgrade|deconfigure)
-        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        perl -i.bak -ne 'print unless /^### BEGIN xvm-munin-config/../^### END xvm-munin-config/' /etc/sudoers
     ;;
 
Index: trunk/packages/xvm-munin-config/debian/xvm-munin-remote-config.prerm
===================================================================
--- trunk/packages/xvm-munin-config/debian/xvm-munin-remote-config.prerm	(revision 3010)
+++ trunk/packages/xvm-munin-config/debian/xvm-munin-remote-config.prerm	(revision 3011)
@@ -20,5 +20,5 @@
 case "$1" in
     remove|upgrade|deconfigure)
-        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        perl -i.bak -ne 'print unless /^### BEGIN xvm-munin-config/../^### END xvm-munin-config/' /etc/sudoers
     ;;