fix distributionupdate build

Including avoiding needing cabal's defines for Utility.URI

Build/DistributionUpdate.hs

@@ -36,7 +36,7 @@ makeinfos = do
 		v <- lookupFile f
 		case v of
 			Nothing -> noop
-			Just (k, _b) -> whenM (inAnnex k) $ do
+			Just k -> whenM (inAnnex k) $ do
 				liftIO $ putStrLn f
 				let infofile = f ++ ".info"
 				liftIO $ writeFile infofile $ show $ GitAnnexDistribution

Utility/URI.hs

@@ -10,9 +10,11 @@
 module Utility.URI where
 
 -- Old versions of network lacked an Ord for URI
+#ifdef VERSION_network
 #if ! MIN_VERSION_network(2,4,0)
 import Network.URI
 
 instance Ord URI where
 	a `compare` b = show a `compare` show b
 #endif
+#endif