spri-shortcuts: switch from chem to ucam_wpkg conventions

packages/spri-shortcuts.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--  vim: set softtabstop=3: -->
 <packages>
-   <package id="spri-shortcuts" name="SPRI shortcuts" revision="%version%.1" priority="0" reboot="false">
+   <package id="spri-shortcuts" name="SPRI shortcuts" revision="%version%.2" priority="0" reboot="false">
       <variable name="version" value="1.0" />
 
-      <check type='registry' condition='equals' path='HKLM\software\ch.cam.ac.uk\WPKG\spri-shortcuts' value="%version%"/>
+      <check type='registry' condition='equals' path='HKLM\software\ucam_wpkg.cam.ac.uk\spri-shortcuts\version' value="%version%"/>
 
-      <install cmd='reg add HKLM\software\ch.cam.ac.uk\WPKG /t reg_sz /v spri-shortcuts /d %version% /f'/>
-      <install cmd='cscript %software%\wpkg\tools\create-shortcut.js /folder:"SPRI" /linkname:"SPRI Wiki" /target:"http://wikis.ch.cam.ac.uk/spri/"' />
+      <install cmd='reg add HKLM\software\ucam_wpkg.cam.ac.uk\spri-shortcuts /t reg_sz /v version /d %version% /f'/>
+      <install cmd='cscript %WPKGSOFTWARE%\wpkg\tools\create-shortcut.js /folder:"SPRI" /linkname:"SPRI Wiki" /target:"http://wikis.ch.cam.ac.uk/spri/"' />
 
       <upgrade include='remove' />
       <upgrade include='install' />
 
-      <remove cmd='cscript %software%\wpkg\tools\delete-shortcut.js /folder:"SPRI" /linkname:"SPRI Wiki"'/>
-      <remove cmd='reg delete HKLM\software\ch.cam.ac.uk\WPKG /v spri-shortcuts /f'/>
+      <remove cmd='cscript %WPKGSOFTWARE%\wpkg\tools\delete-shortcut.js /folder:"SPRI" /linkname:"SPRI Wiki"'/>
+      <remove cmd='reg delete HKLM\software\ucam_wpkg.cam.ac.uk /v spri-shortcuts /f'/>
 
 </package>
 </packages>