[Pkg-haskell-commits] darcs: haskell-hoogle: Refresh add-local-location-database.patch.

[Colin Watson]

Thu Jul  3 23:13:09 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Refresh add-local-location-database.patch.

    M ./changelog +4
    M ./patches/add-local-location-database.patch -13 +20

Thu Jul  3 23:13:09 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Refresh add-local-location-database.patch.
diff -rN -u old-haskell-hoogle/changelog new-haskell-hoogle/changelog
--- old-haskell-hoogle/changelog	2014-07-03 23:38:47.764700495 +0000
+++ new-haskell-hoogle/changelog	2014-07-03 23:38:47.784700514 +0000
@@ -1,7 +1,11 @@
 haskell-hoogle (4.2.33-1) UNRELEASED; urgency=medium
 
+  [ Joachim Breitner ]
   * New upstream release
 
+  [ Colin Watson ]
+  * Refresh add-local-location-database.patch.
+
  -- Joachim Breitner <nomeata at debian.org>  Tue, 17 Jun 2014 22:41:02 -0700
 
 haskell-hoogle (4.2.26-3) unstable; urgency=medium
diff -rN -u old-haskell-hoogle/patches/add-local-location-database.patch new-haskell-hoogle/patches/add-local-location-database.patch
--- old-haskell-hoogle/patches/add-local-location-database.patch	2014-07-03 23:38:47.764700495 +0000
+++ new-haskell-hoogle/patches/add-local-location-database.patch	2014-07-03 23:38:47.780700510 +0000
@@ -1,3 +1,5 @@
+Index: b/src/Recipe/Haddock.hs
+===================================================================
 --- a/src/Recipe/Haddock.hs
 +++ b/src/Recipe/Haddock.hs
 @@ -1,7 +1,7 @@
@@ -9,38 +11,43 @@
      ) where
  
  import General.Base
+Index: b/src/CmdLine/Type.hs
+===================================================================
 --- a/src/CmdLine/Type.hs
 +++ b/src/CmdLine/Type.hs
-@@ -35,7 +35,7 @@
-     | Data {redownload :: Bool, local :: [String], datadir :: FilePath, threads :: Int, actions :: [String]}
-     | Server {port :: Int, local_ :: Bool, databases :: [FilePath], resources :: FilePath, dynamic :: Bool, template :: [FilePath]}
-     | Combine {srcfiles :: [FilePath], outfile :: String}
--    | Convert {srcfile :: String, outfile :: String, doc :: Maybe String, merge :: [String], haddock :: Bool}
-+    | Convert {srcfile :: String, outfile :: String, doc :: Maybe String, merge :: [String], haddock :: Bool, addlocation :: Bool}
+@@ -47,7 +47,8 @@
+         , outfile :: String
+         , doc :: Maybe String
+         , merge :: [String]
+-        , haddock :: Bool}
++        , haddock :: Bool
++        , addlocation :: Bool}
      | Log {logfiles :: [FilePath]}
      | Test {testFiles :: [String], example :: Bool}
      | Dump {database :: String, section :: [String]}
-@@ -97,6 +97,7 @@
+@@ -110,6 +111,7 @@
      ,doc = def &= typDir &= help "Path to the root of local or Hackage documentation for the package (implies --haddock)"
      ,merge = def &= typ "DATABASE" &= help "Merge other databases"
      ,haddock = def &= help "Apply haddock-specific hacks"
-+    ,addlocation = def &= help "Add location infomation to database"
++    ,addlocation = def &= help "Add location information to database"
      } &= help "Convert an input file to a database"
  
  data_ = Data
+Index: b/src/Console/All.hs
+===================================================================
 --- a/src/Console/All.hs
 +++ b/src/Console/All.hs
-@@ -39,12 +39,15 @@
+@@ -40,12 +40,15 @@
  
  action (Log files) = logFiles files
  
--action (Convert from to doc merge haddock) = do
-+action (Convert from to doc merge haddock addloc) = do
+-action (Convert url from to doc merge haddock) = do
++action (Convert url from to doc merge haddock addloc) = do
      when (any isUpper $ takeBaseName to) $ putStrLn $ "Warning: Hoogle databases should be all lower case, " ++ takeBaseName to
      putStrLn $ "Converting " ++ from
      src <- readFileUtf8 from
--    convert merge (takeBaseName from) to $ unlines $ addLocalDoc doc (lines src)
-+    convert merge (takeBaseName from) to $ unlines . fixURLs $ addLocalDoc doc (lines src)
+-    convert url merge (takeBaseName from) to $ unlines $ addLocalDoc doc (lines src)
++    convert url merge (takeBaseName from) to $ unlines . fixURLs $ addLocalDoc doc (lines src)
      where
 +      fixURLs :: [String] -> [String]
 +      fixURLs lns = if not addloc then lns else haddockPackageUrl ("file://" ++ from) lns