Index: trunk/fink/main/finkinfo/macathena-pyhesiodfs.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-pyhesiodfs.info (revision 102)
+++ trunk/fink/main/finkinfo/macathena-pyhesiodfs.info (revision 102)
@@ -0,0 +1,31 @@
+Package: macathena-pyhesiodfs
+Version: 77
+Revision: 2
+Source: http://macathena.mit.edu/dist/pyhesiodfs-svn%v.tar.gz
+Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
+HomePage: http://macathena.mit.edu/
+License: GPL
+Description: Automatically mounts AFS lockers in /mit
+Source-MD5: 2d321c4c4fadb67025aff9eb57e02d5f
+DocFiles: COPYING copyright
+
+Depends: fuse-py25, pydns-py25
+Replaces: pyhesiodfs
+BuildDepends: automake1.9
+PatchScript: sed -i ".bak" -e 's|/usr/local|%p|g' edu.mit.sipb.mit-automounter.plist
+CompileScript: <<
+	python2.5 setup.py build
+<<
+InstallScript: <<
+	cp %p/share/automake-1.9/install-sh %b/
+	cp %p/share/automake-1.9/mkinstalldirs %b/
+	
+	%b/mkinstalldirs %d/mit %d/bin %i/lib/python2.5/site-packages %i
+	python2.5 setup.py install --root=%d
+<<
+PostInstScript: <<
+	launchctl load /Library/LaunchDaemons/edu.mit.sipb.mit-automounter.plist
+<<
+PreRmScript: <<
+	launchctl unload /Library/LaunchDaemons/edu.mit.sipb.mit-automounter.plist
+<<
Index: trunk/fink/main/finkinfo/macathena-basic.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-basic.info (revision 92)
+++ trunk/fink/main/finkinfo/macathena-basic.info (revision 102)
@@ -1,5 +1,5 @@
 Package: macathena-basic
 Version: 0.1
-Revision: 1
+Revision: 2
 Type: bundle
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -8,3 +8,3 @@
 Description: Metapackage providing basic MacAthena software
 
-Depends: pyhesiodfs, macathena-athrun, macathena-moira, macathena-ssl-certificates, macathena-update
+Depends: macathena-athrun, macathena-moira, macathena-pyhesiodfs, macathena-ssl-certificates, macathena-update
Index: trunk/fink/main/finkinfo/macathena-add.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-add.info (revision 81)
+++ trunk/fink/main/finkinfo/macathena-add.info (revision 102)
@@ -1,5 +1,5 @@
 Package: macathena-add
 Version: 78
-Revision: 1
+Revision: 2
 Source: http://macathena.mit.edu/dist/add-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -10,5 +10,5 @@
 DocFiles: copyright
 
-Depends: macathena-athdir, python25, pyhesiodfs
+Depends: macathena-athdir, python25, macathena-pyhesiodfs
 PatchScript: sed -i ".bak" -e 's|@FINKPREFIX@|%p|g' setup.py macathena-add.sh macathena-add.csh attach-add.py
 CompileScript: <<
Index: trunk/fink/main/finkinfo/macathena-attach.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-attach.info (revision 81)
+++ trunk/fink/main/finkinfo/macathena-attach.info (revision 102)
@@ -1,5 +1,5 @@
 Package: macathena-attach
 Version: 78
-Revision: 2
+Revision: 3
 Source: http://macathena.mit.edu/dist/attach-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -10,5 +10,5 @@
 DocFiles: copyright
 
-Depends: macathena-add, python25, pyhesiodfs
+Depends: macathena-add, macathena-pyhesiodfs, python25
 CompileScript: <<
 	python2.5 setup.py build
Index: trunk/fink/main/finkinfo/pyhesiodfs.info
===================================================================
--- trunk/fink/main/finkinfo/pyhesiodfs.info (revision 81)
+++  (revision )
@@ -1,30 +1,0 @@
-Package: pyhesiodfs
-Version: 77
-Revision: 1
-Source: http://macathena.mit.edu/dist/%n-svn%v.tar.gz
-Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
-HomePage: http://macathena.mit.edu/
-License: GPL
-Description: Automatically mounts AFS lockers in /mit
-Source-MD5: 2d321c4c4fadb67025aff9eb57e02d5f
-DocFiles: COPYING copyright
-
-Depends: fuse-py25, pydns-py25
-BuildDepends: automake1.9
-PatchScript: sed -i ".bak" -e 's|/usr/local|%p|g' edu.mit.sipb.mit-automounter.plist
-CompileScript: <<
-	python2.5 setup.py build
-<<
-InstallScript: <<
-	cp %p/share/automake-1.9/install-sh %b/
-	cp %p/share/automake-1.9/mkinstalldirs %b/
-	
-	%b/mkinstalldirs %d/mit %d/bin %i/lib/python2.5/site-packages %i
-	python2.5 setup.py install --root=%d
-<<
-PostInstScript: <<
-	launchctl load /Library/LaunchDaemons/edu.mit.sipb.mit-automounter.plist
-<<
-PreRmScript: <<
-	launchctl unload /Library/LaunchDaemons/edu.mit.sipb.mit-automounter.plist
-<<