[DHG_packages] 02/06: servant-server: Upgrading from 0.7.1 to 0.8.1
Clint Adams
clint at moszumanska.debian.org
Mon Oct 17 23:11:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch experimental
in repository DHG_packages.
commit 3428275119fda9b5a4dcb6628a831339a0ffd292
Author: Clint Adams <clint at debian.org>
Date: Fri Oct 7 23:18:39 2016 -0400
servant-server: Upgrading from 0.7.1 to 0.8.1
---
p/haskell-servant-server/debian/changelog | 6 +
p/haskell-servant-server/debian/control | 151 ++++++++++++---------
.../debian/patches/assume-newer-wai-app-static | 32 -----
p/haskell-servant-server/debian/patches/series | 1 -
4 files changed, 91 insertions(+), 99 deletions(-)
diff --git a/p/haskell-servant-server/debian/changelog b/p/haskell-servant-server/debian/changelog
index 297a8bf..babe5fb 100644
--- a/p/haskell-servant-server/debian/changelog
+++ b/p/haskell-servant-server/debian/changelog
@@ -1,3 +1,9 @@
+haskell-servant-server (0.8.1-1) experimental; urgency=medium
+
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Fri, 07 Oct 2016 23:18:39 -0400
+
haskell-servant-server (0.7.1-1) unstable; urgency=low
* Initial release
diff --git a/p/haskell-servant-server/debian/control b/p/haskell-servant-server/debian/control
index 1ab4b51..b8ddd3a 100644
--- a/p/haskell-servant-server/debian/control
+++ b/p/haskell-servant-server/debian/control
@@ -1,97 +1,102 @@
Source: haskell-servant-server
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Clint Adams <clint at debian.org>
+Uploaders:
+ Clint Adams <clint at debian.org>,
Priority: extra
Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.9),
+Build-Depends:
cdbs,
- ghc,
+ debhelper (>= 9),
+ ghc (>= 8),
ghc-prof,
+ haskell-devscripts (>= 0.9),
+ libghc-aeson-dev,
+ libghc-aeson-dev (<< 1.1),
libghc-aeson-dev (>= 0.7),
- libghc-aeson-dev (<< 0.12),
libghc-aeson-prof,
- libghc-attoparsec-dev (>= 0.12),
libghc-attoparsec-dev (<< 0.14),
+ libghc-attoparsec-dev (>= 0.12),
libghc-attoparsec-prof,
+ libghc-base-compat-dev,
+ libghc-base-compat-dev (<< 0.10),
libghc-base-compat-dev (>= 0.9),
libghc-base-compat-prof,
- libghc-base64-bytestring-dev (>= 1.0),
+ libghc-base64-bytestring-dev,
libghc-base64-bytestring-dev (<< 1.1),
+ libghc-base64-bytestring-dev (>= 1.0),
libghc-base64-bytestring-prof,
- libghc-http-api-data-dev (>= 0.1),
+ libghc-bytestring-conversion-dev,
+ libghc-doctest-dev,
+ libghc-exceptions-dev,
+ libghc-filemanip-dev,
+ libghc-hspec-dev (<< 3),
+ libghc-hspec-dev (>= 2),
+ libghc-hspec-wai-dev,
libghc-http-api-data-dev (<< 0.3),
+ libghc-http-api-data-dev (>= 0.1),
libghc-http-api-data-prof,
- libghc-http-types-dev (>= 0.8),
+ libghc-http-types-dev,
libghc-http-types-dev (<< 0.10),
+ libghc-http-types-dev (>= 0.8),
libghc-http-types-prof,
+ libghc-mtl-dev,
+ libghc-mtl-dev (<< 2.3),
libghc-mtl-dev (>= 2),
- libghc-mtl-dev (<< 3),
libghc-mtl-prof,
- libghc-network-dev (>= 2.6),
libghc-network-dev (<< 2.7),
+ libghc-network-dev (>= 2.6),
libghc-network-prof,
- libghc-network-uri-dev (>= 2.6),
libghc-network-uri-dev (<< 2.7),
+ libghc-network-uri-dev (>= 2.6),
libghc-network-uri-prof,
- libghc-safe-dev (>= 0.3),
+ libghc-parsec3-dev,
+ libghc-quickcheck2-dev,
+ libghc-safe-dev,
libghc-safe-dev (<< 0.4),
+ libghc-safe-dev (>= 0.3),
libghc-safe-prof,
- libghc-servant-dev (>= 0.7),
- libghc-servant-dev (<< 0.8),
+ libghc-servant-dev,
+ libghc-servant-dev (<< 0.9),
+ libghc-servant-dev (>= 0.8),
libghc-servant-prof,
- libghc-split-dev (>= 0.2),
+ libghc-should-not-typecheck-dev (<< 2.2),
+ libghc-should-not-typecheck-dev (>= 2.1),
libghc-split-dev (<< 0.3),
+ libghc-split-dev (>= 0.2),
libghc-split-prof,
- libghc-string-conversions-dev (>= 0.3),
+ libghc-string-conversions-dev,
libghc-string-conversions-dev (<< 0.5),
+ libghc-string-conversions-dev (>= 0.3),
libghc-string-conversions-prof,
- libghc-system-filepath-dev (>= 0.4),
libghc-system-filepath-dev (<< 0.5),
+ libghc-system-filepath-dev (>= 0.4),
libghc-system-filepath-prof,
- libghc-text-dev (>= 1.2),
+ libghc-temporary-dev,
+ libghc-text-dev,
libghc-text-dev (<< 1.3),
+ libghc-text-dev (>= 1.2),
libghc-text-prof,
+ libghc-transformers-compat-dev,
+ libghc-transformers-compat-dev (<< 0.6),
libghc-transformers-compat-dev (>= 0.4),
libghc-transformers-compat-prof,
- libghc-wai-dev (>= 3.0),
- libghc-wai-dev (<< 3.3),
- libghc-wai-prof,
- libghc-wai-app-static-dev (>= 3.1),
libghc-wai-app-static-dev (<< 3.2),
+ libghc-wai-app-static-dev (>= 3.1),
libghc-wai-app-static-prof,
- libghc-warp-dev (>= 3.0),
+ libghc-wai-dev,
+ libghc-wai-dev (<< 3.3),
+ libghc-wai-dev (>= 3.0),
+ libghc-wai-extra-dev,
+ libghc-wai-prof,
+ libghc-warp-dev,
libghc-warp-dev (<< 3.3),
+ libghc-warp-dev (>= 3.0),
libghc-warp-prof,
- libghc-word8-dev (>= 0.1),
libghc-word8-dev (<< 0.2),
+ libghc-word8-dev (>= 0.1),
libghc-word8-prof,
- libghc-aeson-dev,
- libghc-servant-dev,
- libghc-text-dev,
- libghc-wai-dev,
- libghc-warp-dev,
- libghc-quickcheck2-dev,
- libghc-base-compat-dev,
- libghc-base64-bytestring-dev,
- libghc-bytestring-conversion-dev,
- libghc-doctest-dev,
- libghc-exceptions-dev,
- libghc-filemanip-dev,
- libghc-hspec-dev (>= 2),
- libghc-hspec-dev (<< 3),
- libghc-hspec-wai-dev,
- libghc-http-types-dev,
- libghc-mtl-dev,
- libghc-parsec3-dev,
- libghc-safe-dev,
- libghc-should-not-typecheck-dev (>= 2.1),
- libghc-should-not-typecheck-dev (<< 2.2),
- libghc-string-conversions-dev,
- libghc-temporary-dev,
- libghc-transformers-compat-dev,
- libghc-wai-extra-dev,
-Build-Depends-Indep: ghc-doc,
+Build-Depends-Indep:
+ ghc-doc,
libghc-aeson-doc,
libghc-attoparsec-doc,
libghc-base-compat-doc,
@@ -108,8 +113,8 @@ Build-Depends-Indep: ghc-doc,
libghc-system-filepath-doc,
libghc-text-doc,
libghc-transformers-compat-doc,
- libghc-wai-doc,
libghc-wai-app-static-doc,
+ libghc-wai-doc,
libghc-warp-doc,
libghc-word8-doc,
Standards-Version: 3.9.8
@@ -121,13 +126,18 @@ X-Description: combinators for defining webservices APIs and serving them
Package: libghc-servant-server-dev
Architecture: any
-Depends: ${haskell:Depends},
+Depends:
+ ${haskell:Depends},
${misc:Depends},
${shlibs:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Conflicts: ${haskell:Conflicts},
-Provides: ${haskell:Provides},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Conflicts:
+ ${haskell:Conflicts},
+Provides:
+ ${haskell:Provides},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
@@ -135,12 +145,17 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
Package: libghc-servant-server-prof
Architecture: any
-Depends: ${haskell:Depends},
+Depends:
+ ${haskell:Depends},
${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Conflicts: ${haskell:Conflicts},
-Provides: ${haskell:Provides},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Conflicts:
+ ${haskell:Conflicts},
+Provides:
+ ${haskell:Provides},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
@@ -149,11 +164,15 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
Package: libghc-servant-server-doc
Architecture: all
Section: doc
-Depends: ${haskell:Depends},
+Depends:
+ ${haskell:Depends},
${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Conflicts: ${haskell:Conflicts},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Conflicts:
+ ${haskell:Conflicts},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
diff --git a/p/haskell-servant-server/debian/patches/assume-newer-wai-app-static b/p/haskell-servant-server/debian/patches/assume-newer-wai-app-static
deleted file mode 100644
index 35ad5bb..0000000
--- a/p/haskell-servant-server/debian/patches/assume-newer-wai-app-static
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/servant-server.cabal
-+++ b/servant-server.cabal
-@@ -67,7 +67,7 @@
- , transformers >= 0.3 && < 0.6
- , transformers-compat>= 0.4
- , wai >= 3.0 && < 3.3
-- , wai-app-static >= 3.0 && < 3.2
-+ , wai-app-static >= 3.1 && < 3.2
- , warp >= 3.0 && < 3.3
- , word8 == 0.1.*
-
---- a/src/Servant/Utils/StaticFiles.hs
-+++ b/src/Servant/Utils/StaticFiles.hs
-@@ -12,9 +12,6 @@
- import Servant.API.Raw (Raw)
- import Servant.Server (Server)
- import System.FilePath (addTrailingPathSeparator)
--#if !MIN_VERSION_wai_app_static(3,1,0)
--import Filesystem.Path.CurrentOS (decodeString)
--#endif
-
- -- | Serve anything under the specified directory as a 'Raw' endpoint.
- --
-@@ -38,8 +35,4 @@
- -- in order.
- serveDirectory :: FilePath -> Server Raw
- serveDirectory =
--#if MIN_VERSION_wai_app_static(3,1,0)
- staticApp . defaultFileServerSettings . addTrailingPathSeparator
--#else
-- staticApp . defaultFileServerSettings . decodeString . addTrailingPathSeparator
--#endif
diff --git a/p/haskell-servant-server/debian/patches/series b/p/haskell-servant-server/debian/patches/series
deleted file mode 100644
index 916eb95..0000000
--- a/p/haskell-servant-server/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-assume-newer-wai-app-static
--
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