[DHG_packages] 03/15: hoogle: Remove all Debian patches
Ilias Tsitsimpis
iliastsi-guest at moszumanska.debian.org
Sun Oct 30 16:52:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
iliastsi-guest pushed a commit to branch master
in repository DHG_packages.
commit be182ae41618ea7ab71666aca53c0416a065a30f
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date: Thu Oct 27 22:25:07 2016 +0300
hoogle: Remove all Debian patches
They are obsolete and do not apply to the latest version of hoogle.
---
p/haskell-hoogle/debian/changelog | 2 +
.../patches/ad-hoc-extend-depend-4-2-10.patch | 26 ----------
.../patches/add-local-location-database.patch | 57 ----------------------
.../debian/patches/cgi-return-res-files.patch | 53 --------------------
.../patches/cgi-use-template-file-always.patch | 23 ---------
p/haskell-hoogle/debian/patches/no-log.patch | 13 -----
6 files changed, 2 insertions(+), 172 deletions(-)
diff --git a/p/haskell-hoogle/debian/changelog b/p/haskell-hoogle/debian/changelog
index 979cc5a..86d47fb 100644
--- a/p/haskell-hoogle/debian/changelog
+++ b/p/haskell-hoogle/debian/changelog
@@ -3,6 +3,8 @@ haskell-hoogle (5.0.1-3) UNRELEASED; urgency=medium
* Remove obsolete d/jquery_1.7.2+dfsg.orig.tar.gz file.
* Remove pre-compiled keyword hoogle database.
This file is not compatible with the latest version of hoogle.
+ * Remove all Debian patches.
+ They are obsolete and do not apply to the latest version of hoogle.
-- Ilias Tsitsimpis <i.tsitsimpis at gmail.com> Fri, 28 Oct 2016 13:02:02 +0300
diff --git a/p/haskell-hoogle/debian/patches/ad-hoc-extend-depend-4-2-10.patch b/p/haskell-hoogle/debian/patches/ad-hoc-extend-depend-4-2-10.patch
deleted file mode 100644
index 0dc3633..0000000
--- a/p/haskell-hoogle/debian/patches/ad-hoc-extend-depend-4-2-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: haskell-hoogle-4.2.10/hoogle.cabal
-===================================================================
---- haskell-hoogle-4.2.10.orig/hoogle.cabal 2012-03-04 20:36:33.000000000 +0900
-+++ haskell-hoogle-4.2.10/hoogle.cabal 2012-09-09 18:08:41.668315804 +0900
-@@ -42,7 +42,7 @@
- safe,
- binary,
- parsec >= 2.1,
-- transformers == 0.2.*,
-+ transformers >= 0.2 && < 0.4,
- uniplate == 1.6.*,
- haskell-src-exts >= 1.9 && < 1.12
-
-@@ -114,9 +114,9 @@
- blaze-builder >= 0.2 && < 0.4,
- http-types == 0.6.*,
- case-insensitive >= 0.2 && < 0.5,
-- conduit == 0.2.*,
-- wai == 1.1.*,
-- warp == 1.1.*,
-+ conduit >= 0.2 && < 0.5,
-+ wai >= 1.1 && < 1.3,
-+ warp >= 1.1 && < 1.3,
- Cabal >= 1.8 && < 1.15
-
- other-modules:
diff --git a/p/haskell-hoogle/debian/patches/add-local-location-database.patch b/p/haskell-hoogle/debian/patches/add-local-location-database.patch
deleted file mode 100644
index c76c91f..0000000
--- a/p/haskell-hoogle/debian/patches/add-local-location-database.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: haskell-hoogle/src/Recipe/Haddock.hs
-===================================================================
---- haskell-hoogle.orig/src/Recipe/Haddock.hs 2015-08-15 14:37:07.203799247 +0200
-+++ haskell-hoogle/src/Recipe/Haddock.hs 2015-08-15 14:37:07.199799164 +0200
-@@ -1,7 +1,7 @@
- {-# LANGUAGE PatternGuards #-}
-
- module Recipe.Haddock(
-- haddockToHTML, haddockHacks
-+ haddockToHTML, haddockHacks, haddockPackageUrl
- ) where
-
- import General.Base
-Index: haskell-hoogle/src/CmdLine/Type.hs
-===================================================================
---- haskell-hoogle.orig/src/CmdLine/Type.hs 2015-08-15 14:37:07.203799247 +0200
-+++ haskell-hoogle/src/CmdLine/Type.hs 2015-08-15 14:37:07.199799164 +0200
-@@ -49,7 +49,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]}
-@@ -112,6 +113,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 information to database"
- } &= help "Convert an input file to a database"
-
- data_ = Data
-Index: haskell-hoogle/src/Console/All.hs
-===================================================================
---- haskell-hoogle.orig/src/Console/All.hs 2015-08-15 14:37:07.203799247 +0200
-+++ haskell-hoogle/src/Console/All.hs 2015-08-15 14:37:07.199799164 +0200
-@@ -40,12 +40,15 @@
-
- action (Log files) = logFiles files
-
--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 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
-+
- addLocalDoc :: Maybe FilePath -> [String] -> [String]
- addLocalDoc doc = if haddock
- then haddockHacks $ addDoc doc
diff --git a/p/haskell-hoogle/debian/patches/cgi-return-res-files.patch b/p/haskell-hoogle/debian/patches/cgi-return-res-files.patch
deleted file mode 100644
index 098e0bf..0000000
--- a/p/haskell-hoogle/debian/patches/cgi-return-res-files.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: haskell-hoogle-4.2.10/src/Web/Server.hs
-===================================================================
---- haskell-hoogle-4.2.10.orig/src/Web/Server.hs 2012-09-13 10:00:53.975656209 +0900
-+++ haskell-hoogle-4.2.10/src/Web/Server.hs 2012-10-05 01:07:30.000000000 +0900
-@@ -1,6 +1,6 @@
- {-# LANGUAGE RecordWildCards, ScopedTypeVariables, PatternGuards #-}
-
--module Web.Server(server) where
-+module Web.Server(server, serveFile) where
-
- import General.Base
- import General.Web
-Index: haskell-hoogle-4.2.10/src/Web/All.hs
-===================================================================
---- haskell-hoogle-4.2.10.orig/src/Web/All.hs 2012-10-05 01:07:30.000000000 +0900
-+++ haskell-hoogle-4.2.10/src/Web/All.hs 2012-10-05 01:23:02.354839824 +0900
-@@ -2,11 +2,13 @@
- module Web.All(action) where
-
- import CmdLine.All
-+import General.System
- import General.Base
- import General.Web
- import Web.Server
- import Web.Response
- import Web.Page
-+import Network.Wai
- import Paths_hoogle
-
-
-@@ -15,4 +17,21 @@
- action q = do
- f <- readFile' =<< getDataFileName ("resources" </> "template" <.> "html")
- let t = loadTemplates f
-- cgiResponse =<< response responseArgs{templates=t} q
-+ d <- getDataDir
-+ p <- getEnvVar "PATH_INFO"
-+ let p' = fromMaybe "" p
-+ cgiResponse =<< go t d p'
-+ where
-+ go t d p | "/res/" `isPrefixOf` p =
-+ serveFile True $ d </> "resources" </> takeFileName p
-+ go t d p | "/file/usr/share/doc/" `isPrefixOf` p =
-+ let p' = if "/" `isSuffixOf` p then p ++ "index.html" else p
-+ in rewriteRootLinks =<< serveFile False (fromJust (stripPrefix "/file" p'))
-+ go t _ _ = rewriteRootLinks =<< response responseArgs{templates=t} q
-+
-+rewriteRootLinks :: Response -> IO Response
-+rewriteRootLinks = responseRewrite $ foldl1 (.) $ map f p
-+ where
-+ p = [("href=\"/", "href=\"/cgi-bin/hoogle/file/")
-+ ,("href='file:/", "href='/cgi-bin/hoogle/file/")]
-+ f (f,t) = lbsReplace (fromString f) (fromString t)
diff --git a/p/haskell-hoogle/debian/patches/cgi-use-template-file-always.patch b/p/haskell-hoogle/debian/patches/cgi-use-template-file-always.patch
deleted file mode 100644
index 5f1d635..0000000
--- a/p/haskell-hoogle/debian/patches/cgi-use-template-file-always.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: haskell-hoogle-4.2.11/src/Web/All.hs
-===================================================================
---- haskell-hoogle-4.2.11.orig/src/Web/All.hs 2012-09-09 02:23:35.650456618 +0900
-+++ haskell-hoogle-4.2.11/src/Web/All.hs 2012-09-09 03:12:11.116913638 +0900
-@@ -2,11 +2,17 @@
- module Web.All(action) where
-
- import CmdLine.All
-+import General.Base
- import General.Web
- import Web.Server
- import Web.Response
-+import Web.Page
-+import Paths_hoogle
-
-
- action :: CmdLine -> IO ()
- action q at Server{} = server q
--action q = cgiResponse =<< response responseArgs q
-+action q = do
-+ f <- readFile' =<< getDataFileName ("resources" </> "template" <.> "html")
-+ let t = loadTemplates f
-+ cgiResponse =<< response responseArgs{templates=t} q
diff --git a/p/haskell-hoogle/debian/patches/no-log.patch b/p/haskell-hoogle/debian/patches/no-log.patch
deleted file mode 100644
index b9cc2e5..0000000
--- a/p/haskell-hoogle/debian/patches/no-log.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: haskell-hoogle-4.2.11/src/Web/Response.hs
-===================================================================
---- haskell-hoogle-4.2.11.orig/src/Web/Response.hs 2012-04-06 03:03:44.000000000 +0900
-+++ haskell-hoogle-4.2.11/src/Web/Response.hs 2012-09-09 02:20:41.369592400 +0900
-@@ -35,7 +35,7 @@
-
- response :: ResponseArgs -> CmdLine -> IO Response
- response ResponseArgs{..} q = do
-- logMessage q
-+ -- logMessage q
- let response x ys = responseOK (headerContentType (fromString x) : ys) . fromString
-
- dbs <- unsafeInterleaveIO $ case queryParsed q of
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list