[DHG_packages] 04/05: snap: Upgrading from 0.14.0.7 to 1.0.0.1
Clint Adams
clint at moszumanska.debian.org
Mon Oct 17 20:11:34 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 1a832f52414fb87c0aee8fd8677e8315c7d5d8fe
Author: Clint Adams <clint at debian.org>
Date: Fri Oct 7 23:24:46 2016 -0400
snap: Upgrading from 0.14.0.7 to 1.0.0.1
---
p/haskell-snap/debian/changelog | 6 +
p/haskell-snap/debian/control | 146 +++++++++++------------
p/haskell-snap/debian/patches/rename-snap-binary | 60 +---------
3 files changed, 81 insertions(+), 131 deletions(-)
diff --git a/p/haskell-snap/debian/changelog b/p/haskell-snap/debian/changelog
index 2772184..65d72ab 100644
--- a/p/haskell-snap/debian/changelog
+++ b/p/haskell-snap/debian/changelog
@@ -1,3 +1,9 @@
+haskell-snap (1.0.0.1-1) experimental; urgency=medium
+
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Fri, 07 Oct 2016 23:24:46 -0400
+
haskell-snap (0.14.0.7-2) unstable; urgency=medium
* Tweak Vcs-Browser header.
diff --git a/p/haskell-snap/debian/control b/p/haskell-snap/debian/control
index 1e8ed9e..a8c7661 100644
--- a/p/haskell-snap/debian/control
+++ b/p/haskell-snap/debian/control
@@ -1,120 +1,109 @@
Source: haskell-snap
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.10),
+Build-Depends:
cdbs,
- ghc,
+ debhelper (>= 9),
+ ghc (>= 8),
+ ghc-ghci,
ghc-prof,
- libghc-monadcatchio-transformers-dev (>= 0.2),
- libghc-monadcatchio-transformers-dev (<< 0.4),
- libghc-monadcatchio-transformers-prof,
- libghc-aeson-dev (>= 0.7.0.4),
- libghc-aeson-dev (<< 0.12),
+ haskell-devscripts (>= 0.10),
+ libghc-aeson-dev (<< 1.1),
+ libghc-aeson-dev (>= 0.6),
libghc-aeson-prof,
- libghc-attoparsec-dev (>= 0.10),
libghc-attoparsec-dev (<< 0.14),
+ libghc-attoparsec-dev (>= 0.10),
libghc-attoparsec-prof,
- libghc-cereal-dev (>= 0.3),
libghc-cereal-dev (<< 0.6),
+ libghc-cereal-dev (>= 0.3),
libghc-cereal-prof,
- libghc-clientsession-dev (>= 0.8),
libghc-clientsession-dev (<< 0.10),
+ libghc-clientsession-dev (>= 0.8),
libghc-clientsession-prof,
- libghc-comonad-dev (>= 1.1),
- libghc-comonad-dev (<< 4.3),
- libghc-comonad-prof,
- libghc-configurator-dev (>= 0.1),
libghc-configurator-dev (<< 0.4),
+ libghc-configurator-dev (>= 0.1),
libghc-configurator-prof,
- libghc-directory-tree-dev (>= 0.11),
libghc-directory-tree-dev (<< 0.13),
+ libghc-directory-tree-dev (>= 0.10),
libghc-directory-tree-prof,
+ libghc-dlist-dev (<< 0.9),
libghc-dlist-dev (>= 0.5),
- libghc-dlist-dev (<< 0.8),
libghc-dlist-prof,
- libghc-either-dev (>= 4.3),
- libghc-either-dev (<< 4.5),
- libghc-either-prof,
- libghc-hashable-dev,
+ libghc-hashable-dev (<< 1.3),
+ libghc-hashable-dev (>= 1.2.0.6),
libghc-hashable-prof,
- libghc-heist-dev (>= 0.14),
- libghc-heist-dev (<< 0.15),
+ libghc-heist-dev (<< 1.1),
+ libghc-heist-dev (>= 1.0),
libghc-heist-prof,
+ libghc-lens-dev (<< 4.15),
libghc-lens-dev (>= 3.7.6),
- libghc-lens-dev (<< 4.14),
libghc-lens-prof,
- libghc-logict-dev (>= 0.4.2),
- libghc-logict-dev (<< 0.7),
- libghc-logict-prof,
- libghc-mtl-dev (>> 2.0),
+ libghc-lifted-base-dev (<< 0.3),
+ libghc-lifted-base-dev (>= 0.2),
+ libghc-lifted-base-prof,
+ libghc-map-syntax-dev (<< 0.3),
+ libghc-map-syntax-dev (>= 0.2),
+ libghc-map-syntax-prof,
+ libghc-monad-control-dev (<< 1.1),
+ libghc-monad-control-dev (>= 0.3),
+ libghc-monad-control-prof,
libghc-mtl-dev (<< 2.3),
+ libghc-mtl-dev (>= 2.0),
libghc-mtl-prof,
- libghc-mwc-random-dev (>= 0.8),
libghc-mwc-random-dev (<< 0.14),
+ libghc-mwc-random-dev (>= 0.8),
libghc-mwc-random-prof,
- libghc-pwstore-fast-dev (>= 2.2),
libghc-pwstore-fast-dev (<< 2.5),
+ libghc-pwstore-fast-dev (>= 2.2),
libghc-pwstore-fast-prof,
- libghc-regex-posix-dev (>= 0.95),
- libghc-regex-posix-dev (<< 1),
- libghc-regex-posix-prof,
- libghc-snap-core-dev (>= 0.9),
- libghc-snap-core-dev (<< 0.11),
+ libghc-snap-core-dev (<< 1.1),
+ libghc-snap-core-dev (>= 1.0),
libghc-snap-core-prof,
- libghc-snap-server-dev (>= 0.9),
- libghc-snap-server-dev (<< 0.11),
+ libghc-snap-server-dev (<< 1.1),
+ libghc-snap-server-dev (>= 1.0),
libghc-snap-server-prof,
- libghc-stm-dev (>= 2.2),
libghc-stm-dev (<< 2.5),
+ libghc-stm-dev (>= 2.2),
libghc-stm-prof,
- ghc-ghci,
- libghc-text-dev (>= 0.11),
libghc-text-dev (<< 1.3),
+ libghc-text-dev (>= 0.11),
libghc-text-prof,
- libghc-unordered-containers-dev (>= 0.1.4),
+ libghc-transformers-base-dev (<< 0.5),
+ libghc-transformers-base-dev (>= 0.4),
+ libghc-transformers-base-prof,
libghc-unordered-containers-dev (<< 0.3),
+ libghc-unordered-containers-dev (>= 0.1.4),
libghc-unordered-containers-prof,
- libghc-vector-dev (>= 0.7.1),
- libghc-vector-dev (<< 0.12),
- libghc-vector-prof,
- libghc-vector-algorithms-dev (>= 0.4),
- libghc-vector-algorithms-dev (<< 0.8),
- libghc-vector-algorithms-prof,
- libghc-xmlhtml-dev (>= 0.1),
libghc-xmlhtml-dev (<< 0.3),
+ libghc-xmlhtml-dev (>= 0.1),
libghc-xmlhtml-prof,
- libghc-directory-tree-dev (>= 0.10),
- libghc-old-time-dev (>= 1.0),
- libghc-old-time-dev (<< 1.2),
-Build-Depends-Indep: ghc-doc,
- libghc-monadcatchio-transformers-doc,
+Build-Depends-Indep:
+ ghc-doc,
libghc-aeson-doc,
libghc-attoparsec-doc,
libghc-cereal-doc,
libghc-clientsession-doc,
- libghc-comonad-doc,
libghc-configurator-doc,
libghc-directory-tree-doc,
libghc-dlist-doc,
- libghc-either-doc,
libghc-hashable-doc,
libghc-heist-doc,
libghc-lens-doc,
- libghc-logict-doc,
+ libghc-lifted-base-doc,
+ libghc-map-syntax-doc,
+ libghc-monad-control-doc,
libghc-mtl-doc,
libghc-mwc-random-doc,
libghc-pwstore-fast-doc,
- libghc-regex-posix-doc,
libghc-snap-core-doc,
libghc-snap-server-doc,
libghc-stm-doc,
libghc-text-doc,
+ libghc-transformers-base-doc,
libghc-unordered-containers-doc,
- libghc-vector-doc,
- libghc-vector-algorithms-doc,
libghc-xmlhtml-doc,
Standards-Version: 3.9.8
Homepage: http://snapframework.com/
@@ -133,14 +122,18 @@ X-Description: Snap Web Framework
Package: libghc-snap-dev
Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
+Depends:
+ ${haskell:Depends},
${misc:Depends},
-Recommends: ${haskell:Recommends},
- libghc-snap-loader-static-dev,
+ ${shlibs:Depends},
+Recommends:
libghc-snap-loader-dynamic-dev,
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+ libghc-snap-loader-static-dev,
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
@@ -148,11 +141,15 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
Package: libghc-snap-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:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
@@ -161,10 +158,13 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
Package: libghc-snap-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends},
+Depends:
${haskell:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
+ ${misc:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
diff --git a/p/haskell-snap/debian/patches/rename-snap-binary b/p/haskell-snap/debian/patches/rename-snap-binary
index 639f020..7abe726 100644
--- a/p/haskell-snap/debian/patches/rename-snap-binary
+++ b/p/haskell-snap/debian/patches/rename-snap-binary
@@ -6,8 +6,8 @@ Forwarded: not-needed
--- a/snap.cabal
+++ b/snap.cabal
-@@ -16,7 +16,7 @@ description:
- @$ cabal install snap
+@@ -14,7 +14,7 @@ description:
+ @$ cabal install snap snap-templates
$ mkdir myproject
$ cd myproject
- $ snap init@
@@ -15,59 +15,3 @@ Forwarded: not-needed
.
If you have trouble or any questions, see our FAQ page
(<http://snapframework.com/faq>) or the documentation
-@@ -216,7 +216,7 @@ Library
- ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
- -fno-warn-orphans
-
--Executable snap
-+Executable snap-framework
- hs-source-dirs: src
- main-is: Snap/Starter.hs
-
---- a/src/Snap/Starter.hs
-+++ b/src/Snap/Starter.hs
-@@ -30,7 +30,7 @@ usage = unlines
- , ""
- , "Usage:"
- , ""
-- , " snap <action>"
-+ , " snap-framework <action>"
- , ""
- , " <action> can be one of:"
- , " init - create a new project directory structure in the " ++
-@@ -48,7 +48,7 @@ initUsage = unlines
- , ""
- , "Usage:"
- , ""
-- , " snap init [type]"
-+ , " snap-framework init [type]"
- , ""
- , " [type] can be one of:"
- , " default - A default project using snaplets and heist"
---- a/test/suite/Snap/TestCommon.hs
-+++ b/test/suite/Snap/TestCommon.hs
-@@ -35,7 +35,7 @@ import SafeCWD
-
- ------------------------------------------------------------------------------
- testGeneratedProject :: String -- ^ project name and directory
-- -> String -- ^ arguments to @snap init@
-+ -> String -- ^ arguments to @snap-framework init@
- -> String -- ^ arguments to @cabal install@
- -> Int -- ^ port to run http server on
- -> IO () -- ^ action to run when the server goes up
-@@ -94,11 +94,11 @@ testGeneratedProject projName snapInitAr
- findSnap = do
- home <- fromEnv "HOME" "."
- p1 <- gimmeIfExists $ snapRoot </> "dist" </> "build"
-- </> "snap" </> "snap"
-- p2 <- gimmeIfExists $ home </> ".cabal" </> "bin" </> "snap"
-- p3 <- findExecutable "snap"
-+ </> "snap-framework" </> "snap-framework"
-+ p2 <- gimmeIfExists $ home </> ".cabal" </> "bin" </> "snap-framework"
-+ p3 <- findExecutable "snap-framework"
-
-- return $ fromMaybe (error "couldn't find snap executable")
-+ return $ fromMaybe (error "couldn't find snap-framework executable")
- (getFirst $ mconcat $ map First [p1,p2,p3])
-
- --------------------------------------------------------------------------
--
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