[DHG_packages] 01/01: hoogle: New upstream release
Ilias Tsitsimpis
iliastsi-guest at moszumanska.debian.org
Sun Jul 23 09:33:04 UTC 2017
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 aa2c0b2ecb6ba730f863264cc5f5395afe48e822
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date: Sun Jul 23 11:50:55 2017 +0300
hoogle: New upstream release
---
p/haskell-hoogle/debian/changelog | 12 ++++
p/haskell-hoogle/debian/control | 81 +++++++++-------------
p/haskell-hoogle/debian/copyright | 4 +-
.../debian/patches/generate_from_multiple_sources | 64 -----------------
p/haskell-hoogle/debian/patches/global_database | 9 ++-
p/haskell-hoogle/debian/patches/new-src-exts.patch | 11 ---
p/haskell-hoogle/debian/patches/series | 2 -
7 files changed, 52 insertions(+), 131 deletions(-)
diff --git a/p/haskell-hoogle/debian/changelog b/p/haskell-hoogle/debian/changelog
index 816d65b..9886600 100644
--- a/p/haskell-hoogle/debian/changelog
+++ b/p/haskell-hoogle/debian/changelog
@@ -1,3 +1,15 @@
+haskell-hoogle (5.0.12+dfsg1-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #869239, #869238)
+ * Update Homepage field in d/control file
+ * Update d/copyright file (bump Copyright years)
+ * Drop generate_from_multiple_sources patch, applied upstream
+ * Drop new-src-exts patch, fixed in newer version
+ * Update patches to apply cleanly
+ * Bump Standards-Version to 4.0.0, no changes needed
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 23 Jul 2017 11:17:50 +0300
+
haskell-hoogle (5.0.1+dfsg1-3) unstable; urgency=medium
* Relax dependencies for new src-exts.
diff --git a/p/haskell-hoogle/debian/control b/p/haskell-hoogle/debian/control
index 9b721a1..c0a1a5f 100644
--- a/p/haskell-hoogle/debian/control
+++ b/p/haskell-hoogle/debian/control
@@ -5,24 +5,28 @@ Uploaders:
Iustin Pop <iustin at debian.org>,
Priority: extra
Section: haskell
-Build-Depends:
+Build-Depends: debhelper (>= 10),
+ haskell-devscripts-minimal | haskell-devscripts (>= 0.9),
cdbs,
- debhelper (>= 9),
- ghc (>= 8),
+ ghc,
ghc-prof,
- haskell-devscripts (>= 0.13),
- libghc-aeson-dev (>= 0.6.1),
+ libghc-quickcheck2-dev,
+ libghc-quickcheck2-prof,
+ libghc-aeson-dev,
libghc-aeson-prof,
- libghc-cmdargs-dev (>= 0.7),
+ libghc-cmdargs-dev,
libghc-cmdargs-prof,
libghc-conduit-dev,
+ libghc-conduit-prof,
libghc-conduit-extra-dev,
libghc-conduit-extra-prof,
- libghc-conduit-prof,
libghc-connection-dev,
libghc-connection-prof,
libghc-extra-dev (>= 1.4),
libghc-extra-prof,
+ libghc-src-exts-dev (>= 1.18),
+ libghc-src-exts-dev (<< 1.20),
+ libghc-src-exts-prof,
libghc-http-conduit-dev,
libghc-http-conduit-prof,
libghc-http-types-dev,
@@ -33,21 +37,16 @@ Build-Depends:
libghc-js-jquery-prof,
libghc-mmap-dev,
libghc-mmap-prof,
- libghc-network-dev,
+ libghc-network-dev (>= 2.6),
libghc-network-prof,
- libghc-network-uri-dev,
+ libghc-network-uri-dev (>= 2.6),
libghc-network-uri-prof,
libghc-old-locale-dev,
libghc-old-locale-prof,
- libghc-quickcheck2-dev,
- libghc-quickcheck2-prof,
+ libghc-process-extras-dev,
+ libghc-process-extras-prof,
libghc-resourcet-dev,
libghc-resourcet-prof,
- libghc-shake-dev (>= 0.14),
- libghc-src-exts-dev (<< 1.19),
- libghc-src-exts-dev (>= 1.16),
- libghc-src-exts-prof,
- libghc-tagsoup-dev (>= 0.11),
libghc-tar-dev,
libghc-tar-prof,
libghc-text-dev,
@@ -59,23 +58,24 @@ Build-Depends:
libghc-vector-dev,
libghc-vector-prof,
libghc-wai-dev,
+ libghc-wai-prof,
libghc-wai-logger-dev,
libghc-wai-logger-prof,
- libghc-wai-prof,
libghc-warp-dev,
libghc-warp-prof,
libghc-warp-tls-dev,
libghc-warp-tls-prof,
libghc-zlib-dev,
libghc-zlib-prof,
-Build-Depends-Indep:
- ghc-doc,
+Build-Depends-Indep: ghc-doc,
+ libghc-quickcheck2-doc,
libghc-aeson-doc,
libghc-cmdargs-doc,
libghc-conduit-doc,
libghc-conduit-extra-doc,
libghc-connection-doc,
libghc-extra-doc,
+ libghc-src-exts-doc,
libghc-http-conduit-doc,
libghc-http-types-doc,
libghc-js-flot-doc,
@@ -84,9 +84,8 @@ Build-Depends-Indep:
libghc-network-doc,
libghc-network-uri-doc,
libghc-old-locale-doc,
- libghc-quickcheck2-doc,
+ libghc-process-extras-doc,
libghc-resourcet-doc,
- libghc-src-exts-doc,
libghc-tar-doc,
libghc-text-doc,
libghc-uniplate-doc,
@@ -97,23 +96,19 @@ Build-Depends-Indep:
libghc-warp-doc,
libghc-warp-tls-doc,
libghc-zlib-doc,
-Standards-Version: 3.9.8
-Homepage: http://www.haskell.org/hoogle/
+Standards-Version: 4.0.0
+Homepage: http://hoogle.haskell.org/
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-hoogle
Vcs-Git: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git
Package: libghc-hoogle-dev
Architecture: any
-Depends:
- ${haskell:Depends},
+Depends: ${haskell:Depends},
${misc:Depends},
${shlibs:Depends},
-Recommends:
- ${haskell:Recommends},
-Suggests:
- ${haskell:Suggests},
-Provides:
- ${haskell:Provides},
+Recommends: ${haskell:Recommends},
+Suggests: ${haskell:Suggests},
+Provides: ${haskell:Provides},
Description: Haskell API Search
Hoogle is a Haskell API search engine, which allows you to
search many standard Haskell libraries by either function name,
@@ -123,15 +118,11 @@ Description: Haskell API Search
Package: libghc-hoogle-prof
Architecture: any
-Depends:
- ${haskell:Depends},
+Depends: ${haskell:Depends},
${misc:Depends},
-Recommends:
- ${haskell:Recommends},
-Suggests:
- ${haskell:Suggests},
-Provides:
- ${haskell:Provides},
+Recommends: ${haskell:Recommends},
+Suggests: ${haskell:Suggests},
+Provides: ${haskell:Provides},
Description: Haskell API Search; profiling libraries
Hoogle is a Haskell API search engine, which allows you to
search many standard Haskell libraries by either function name,
@@ -142,13 +133,10 @@ Description: Haskell API Search; profiling libraries
Package: libghc-hoogle-doc
Architecture: all
Section: doc
-Depends:
- ${haskell:Depends},
+Depends: ${haskell:Depends},
${misc:Depends},
-Recommends:
- ${haskell:Recommends},
-Suggests:
- ${haskell:Suggests},
+Recommends: ${haskell:Recommends},
+Suggests: ${haskell:Suggests},
Description: Haskell API Search; documentation
Hoogle is a Haskell API search engine, which allows you to
search many standard Haskell libraries by either function name,
@@ -159,8 +147,7 @@ Description: Haskell API Search; documentation
Package: hoogle
Architecture: any
Section: misc
-Depends:
- ghc-doc,
+Depends: ghc-doc,
libjs-jquery,
libjs-chosen (>= 0.9.15),
libjs-jquery-cookie,
diff --git a/p/haskell-hoogle/debian/copyright b/p/haskell-hoogle/debian/copyright
index 68e4a80..3ba54ea 100644
--- a/p/haskell-hoogle/debian/copyright
+++ b/p/haskell-hoogle/debian/copyright
@@ -5,14 +5,14 @@ Source: http://hackage.haskell.org/package/hoogle
Files-Excluded: html/plugin
Files: *
-Copyright: 2004-2016 Neil Mitchell
+Copyright: 2004-2017 Neil Mitchell
License: BSD-3-clause
Files: debian/*
Copyright:
2012 Kiwamu Okabe
2012-2013 Joachim Breitner
- 2016 Ilias Tsitsimpis
+ 2016-2017 Ilias Tsitsimpis
License: BSD-3-clause
License: BSD-3-clause
diff --git a/p/haskell-hoogle/debian/patches/generate_from_multiple_sources b/p/haskell-hoogle/debian/patches/generate_from_multiple_sources
deleted file mode 100644
index c674d9b..0000000
--- a/p/haskell-hoogle/debian/patches/generate_from_multiple_sources
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: Generate docs from multiple sources
- Patch generate command to accept the `--local' flag more than once, hence
- enabling Hoogle to generate docs for more than one packages at same database.
-Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
-Forwarded: https://github.com/ndmitchell/hoogle/issues/192
-
-Index: b/src/Action/CmdLine.hs
-===================================================================
---- a/src/Action/CmdLine.hs
-+++ b/src/Action/CmdLine.hs
-@@ -35,7 +35,7 @@ data CmdLine
- ,database :: FilePath
- ,insecure :: Bool
- ,include :: [String]
-- ,local_ :: Maybe FilePath
-+ ,local_ :: [Maybe FilePath]
- ,debug :: Bool
- ,language :: Language
- }
-Index: b/src/Action/Generate.hs
-===================================================================
---- a/src/Action/Generate.hs
-+++ b/src/Action/Generate.hs
-@@ -126,9 +126,9 @@ readHaskellOnline timing settings downlo
- return (cbl, want, source)
-
-
--readHaskellDir :: Timing -> FilePath -> IO (Map.Map String Package, Set.Set String, Source IO (String, URL, LStr))
--readHaskellDir timing dir = do
-- packages <- map (takeBaseName &&& id) . filter ((==) ".txt" . takeExtension) <$> listFiles dir
-+readHaskellDirs :: Timing -> [FilePath] -> IO (Map.Map String Package, Set.Set String, Source IO (String, URL, LStr))
-+readHaskellDirs timing dirs = do
-+ packages <- map (takeBaseName &&& id) . filter ((==) ".txt" . takeExtension) <$> concat <$> mapM listFiles dirs
- let source = forM_ packages $ \(name, file) -> do
- src <- liftIO $ strReadFile file
- yield (name, hackagePackageURL name, lstrFromChunks [src])
-@@ -171,10 +171,10 @@ actionGenerate g at Generate{..} = withTimi
- download <- return $ downloadInput timing insecure download (takeDirectory database)
- settings <- loadSettings
- (cbl, want, source) <- case language of
-- Haskell | Just "" <- local_ -> readHaskellGhcpkg timing settings
-- | Just dir <- local_ -> readHaskellDir timing dir
-- | otherwise -> readHaskellOnline timing settings download
-- Frege | isJust local_ -> errorIO "No support for local Frege databases"
-+ Haskell | [Just ""] <- local_ -> readHaskellGhcpkg timing settings
-+ | [] <- local_ -> readHaskellOnline timing settings download
-+ | otherwise -> readHaskellDirs timing (fromJust <$> local_)
-+ Frege | null local_ -> errorIO "No support for local Frege databases"
- | otherwise -> readFregeOnline timing download
- let (cblErrs, popularity) = packagePopularity cbl
- want <- return $ if include /= [] then Set.fromList include else want
-Index: b/src/Action/Test.hs
-===================================================================
---- a/src/Action/Test.hs
-+++ b/src/Action/Test.hs
-@@ -28,7 +28,7 @@ actionTest Test{..} = withBuffering stdo
- putStrLn ""
-
- putStrLn "Sample database tests"
-- actionGenerate defaultGenerate{database=sample, local_=Just "misc/sample-data"}
-+ actionGenerate defaultGenerate{database=sample, local_=[Just "misc/sample-data"]}
- action_search_test True sample
- action_server_test True sample
- putStrLn ""
diff --git a/p/haskell-hoogle/debian/patches/global_database b/p/haskell-hoogle/debian/patches/global_database
index 36bf15a..7e81e6d 100644
--- a/p/haskell-hoogle/debian/patches/global_database
+++ b/p/haskell-hoogle/debian/patches/global_database
@@ -8,17 +8,16 @@ Index: b/src/Action/CmdLine.hs
===================================================================
--- a/src/Action/CmdLine.hs
+++ b/src/Action/CmdLine.hs
-@@ -71,9 +71,17 @@ getCmdLine args = do
+@@ -80,8 +80,16 @@ getCmdLine args = do
args <- withArgs args $ cmdArgsRun cmdLineMode
-- fill in the default database
+ -- If a database has not been given, and the default does not exist,
+ -- and this is not a generate command, fallback to the Debian database.
args <- if database args /= "" then return args else do
- dir <- getAppUserDataDirectory "hoogle"
-- return $ args{database=dir </> "default-" ++ lower (show $ language args) ++ "-" ++ showVersion version ++ ".hoo"}
-+ let db = dir </> "default-" ++ lower (show $ language args) ++ "- " ++ showVersion version ++ ".hoo"
-+ debdb = "/var/lib/hoogle/databases/default.hoo"
+- db <- defaultDatabaseLang $ language args; return args{database=db}
++ db <- defaultDatabaseLang $ language args
++ let debdb = "/var/lib/hoogle/databases/default.hoo"
+ db_exists <- doesFileExist db
+ case args of
+ Generate{..} -> return $ args{database=db}
diff --git a/p/haskell-hoogle/debian/patches/new-src-exts.patch b/p/haskell-hoogle/debian/patches/new-src-exts.patch
deleted file mode 100644
index 147e720..0000000
--- a/p/haskell-hoogle/debian/patches/new-src-exts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- haskell-hoogle-5.0.1+dfsg1.orig/hoogle.cabal
-+++ haskell-hoogle-5.0.1+dfsg1/hoogle.cabal
-@@ -53,7 +53,7 @@ library
- directory,
- extra >= 1.4,
- filepath,
-- haskell-src-exts >= 1.16 && < 1.18,
-+ haskell-src-exts >= 1.16 && < 1.19,
- http-conduit,
- http-types,
- js-flot,
diff --git a/p/haskell-hoogle/debian/patches/series b/p/haskell-hoogle/debian/patches/series
index 763edb0..7368feb 100644
--- a/p/haskell-hoogle/debian/patches/series
+++ b/p/haskell-hoogle/debian/patches/series
@@ -1,4 +1,2 @@
-generate_from_multiple_sources
global_database
remove_embedded_copies
-new-src-exts.patch
--
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