Index: trunk/scripts/git-migration/rules.mako
===================================================================
--- trunk/scripts/git-migration/rules.mako	(revision 1912)
+++ trunk/scripts/git-migration/rules.mako	(revision 1914)
@@ -6,4 +6,5 @@
 
     doubled_packages = {
+        'sipb-xen-guest-installer': (310, 310),
         'sipb-xen-base': (314, 315),
         'sipb-xen-database': (311, 313),
@@ -14,6 +15,10 @@
 
     punt = {
+        'xvm-console-devconfig': 700,
         'sipb-xen-guest-installer': 742,
+        'sipb-xen-remote-server': 1176,
         'sipb-xen-dns': 1184,
+        'sipb-xen-console-server': 1187,
+        'sipb-xen-console': 1201,
         'sipb-xen-base': 1350,
         'sipb-xen-chrony-config': 1351,
@@ -33,4 +38,6 @@
         'invirt-console-host': 1816,
         'invirt-console-server': 1816,
+        'invirt-remote-host': 1822,
+        'invirt-remote-server': 1822,
     }
 
@@ -81,4 +88,24 @@
 end match
 
+match /package_tags/sipb-xen-console/2(/|$)
+  min revision 347
+  max revision 349
+end match
+
+match /package_tags/sipb-xen-console/7.1/sipb-xen-console(/|$)
+  min revision 401
+  max revision 401
+end match
+
+match /package_tags/sipb-xen-guest-installer/1.0/sipb-xen-guest-installer(/|$)
+  min revision 452
+  max revision 452
+end match
+
+match /package_tags/sipb-xen-dev/14/sipb-xen-dev(/|$)
+  min revision 462
+  max revision 463
+end match
+
 match /trunk/packages/sipb-xen-autoinstaller(/|$)
   min revision 742
@@ -110,15 +137,19 @@
 
 match /trunk/packages/tmp/${package}(/|$)
+  min revision ${doubled_packages[package][0]}
+  max revision ${doubled_packages[package][0]}
+end match
+
+match /trunk/packages/${package}(/|$)
+  min revision ${doubled_packages[package][1]}
+  max revision ${doubled_packages[package][1]}
+end match
+% endif
+
+match /trunk/packages/${package}(/|$)
   repository ${get_repo(package)}
   branch ${get_branch(package)}
-  max revision ${doubled_packages[package][1] - 1}
-end match
-% endif
-
-match /trunk/packages/${package}(/|$)
-  repository ${get_repo(package)}
-  branch ${get_branch(package)}
-% if package in doubled_packages:
-  min revision ${doubled_packages[package][1]}
+% if package in doubled_packages:
+  min revision ${doubled_packages[package][1] + 1}
 % endif
 % if package in punt:
@@ -160,5 +191,5 @@
   repository ${get_repo('sipb-xen-www')}
   branch ${get_branch('sipb-xen-www')}
-  max revision 302
+  max revision 303
 end match
 
@@ -169,4 +200,5 @@
   repository ${get_repo('sipb-xen-vnc-client')}
   branch ${get_branch('sipb-xen-vnc-client')}
+  max revision 304
 end match
 
@@ -174,4 +206,5 @@
   repository ${get_repo('sipb-xen-vnc-server')}
   branch ${get_branch('sipb-xen-vnc-server')}
+  max revision 286
 end match