[Pkg-haskell-commits] darcs: haskell-hoogle: Fix typo in patch name.

[Colin Watson]

Thu Jul  3 23:09:02 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Fix typo in patch name.

     ./patches/add-local-loction-database.patch -> ./patches/add-local-location-database.patch
    M ./patches/series -1 +1

Thu Jul  3 23:09:02 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Fix typo in patch name.
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	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hoogle/patches/add-local-location-database.patch	2014-07-03 23:09:18.427030652 +0000
@@ -0,0 +1,50 @@
+--- a/src/Recipe/Haddock.hs
++++ b/src/Recipe/Haddock.hs
+@@ -1,7 +1,7 @@
+ {-# LANGUAGE PatternGuards #-}
+ 
+ module Recipe.Haddock(
+-    haddockToHTML, haddockHacks
++    haddockToHTML, haddockHacks, haddockPackageUrl
+     ) where
+ 
+ import General.Base
+--- 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}
+     | Log {logfiles :: [FilePath]}
+     | Test {testFiles :: [String], example :: Bool}
+     | Dump {database :: String, section :: [String]}
+@@ -97,6 +97,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"
+     } &= help "Convert an input file to a database"
+ 
+ data_ = Data
+--- a/src/Console/All.hs
++++ b/src/Console/All.hs
+@@ -39,12 +39,15 @@
+ 
+ action (Log files) = logFiles files
+ 
+-action (Convert from to doc merge haddock) = do
++action (Convert 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)
+     where
++      fixURLs :: [String] -> [String]
++      fixURLs lns = if not addloc then lns else haddockPackageUrl ("file://" ++ from) lns
++
+       addLocalDoc :: Maybe FilePath -> [String] -> [String]
+       addLocalDoc doc = if haddock
+                           then haddockHacks $ addDoc doc
diff -rN -u old-haskell-hoogle/patches/add-local-loction-database.patch new-haskell-hoogle/patches/add-local-loction-database.patch
--- old-haskell-hoogle/patches/add-local-loction-database.patch	2014-07-03 23:09:18.379030614 +0000
+++ new-haskell-hoogle/patches/add-local-loction-database.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
---- a/src/Recipe/Haddock.hs
-+++ b/src/Recipe/Haddock.hs
-@@ -1,7 +1,7 @@
- {-# LANGUAGE PatternGuards #-}
- 
- module Recipe.Haddock(
--    haddockToHTML, haddockHacks
-+    haddockToHTML, haddockHacks, haddockPackageUrl
-     ) where
- 
- import General.Base
---- 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}
-     | Log {logfiles :: [FilePath]}
-     | Test {testFiles :: [String], example :: Bool}
-     | Dump {database :: String, section :: [String]}
-@@ -97,6 +97,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"
-     } &= help "Convert an input file to a database"
- 
- data_ = Data
---- a/src/Console/All.hs
-+++ b/src/Console/All.hs
-@@ -39,12 +39,15 @@
- 
- action (Log files) = logFiles files
- 
--action (Convert from to doc merge haddock) = do
-+action (Convert 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)
-     where
-+      fixURLs :: [String] -> [String]
-+      fixURLs lns = if not addloc then lns else haddockPackageUrl ("file://" ++ from) lns
-+
-       addLocalDoc :: Maybe FilePath -> [String] -> [String]
-       addLocalDoc doc = if haddock
-                           then haddockHacks $ addDoc doc
diff -rN -u old-haskell-hoogle/patches/series new-haskell-hoogle/patches/series
--- old-haskell-hoogle/patches/series	2014-07-03 23:09:18.411030641 +0000
+++ new-haskell-hoogle/patches/series	2014-07-03 23:09:18.431030655 +0000
@@ -1 +1 @@
-add-local-loction-database.patch
+add-local-location-database.patch