[Pkg-haskell-commits] darcs: haskell-leksah-server: * Backport upstream patch to fix build with GHC 7.6 and bump BDs accordingly

Iain Lane laney at debian.org
Sat Apr 13 22:18:45 UTC 2013


Sat Apr 13 21:31:07 UTC 2013  Iain Lane <laney at debian.org>
  * * Backport upstream patch to fix build with GHC 7.6 and bump BDs accordingly
  Ignore-this: e52254d58726758088b114bd31623109
  * Remove bump-transformers-dependency patch which is no longer necessary
    given the above. 

    M ./changelog +6
    M ./control -6 +2
    R ./patches/bump-transformers-dependency
    M ./patches/series -1 +1

Sat Apr 13 21:31:07 UTC 2013  Iain Lane <laney at debian.org>
  * * Backport upstream patch to fix build with GHC 7.6 and bump BDs accordingly
  Ignore-this: e52254d58726758088b114bd31623109
  * Remove bump-transformers-dependency patch which is no longer necessary
    given the above. 
diff -rN -u old-haskell-leksah-server//changelog new-haskell-leksah-server//changelog
--- old-haskell-leksah-server//changelog	2013-04-13 22:18:45.499021957 +0000
+++ new-haskell-leksah-server//changelog	2013-04-13 22:18:45.519022926 +0000
@@ -1,10 +1,16 @@
 haskell-leksah-server (0.12.1.2-1) UNRELEASED; urgency=low
 
+  [ Joachim Breitner ]
   * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
     against experimental
   * Bump standards version, no change
   * New upstream release
 
+  [ Iain Lane ]
+  * Backport upstream patch to fix build with GHC 7.6 and bump BDs accordingly
+  * Remove bump-transformers-dependency patch which is no longer necessary
+    given the above. 
+
  -- Joachim Breitner <nomeata at debian.org>  Sun, 02 Dec 2012 22:11:29 +0100
 
 haskell-leksah-server (0.12.0.4-3) unstable; urgency=low
diff -rN -u old-haskell-leksah-server//control new-haskell-leksah-server//control
--- old-haskell-leksah-server//control	2013-04-13 22:18:45.495021836 +0000
+++ new-haskell-leksah-server//control	2013-04-13 22:18:45.515022105 +0000
@@ -13,12 +13,8 @@
   , libghc-ltk-dev (>= 0.12.1.0)
   , libghc-ltk-dev (<< 0.13)
   , libghc-parsec3-dev (<< 3.2)
-  , libghc-deepseq-dev (>= 1.1)
-  , libghc-deepseq-dev (<< 1.4)
-  , libghc-deepseq-prof
   , libghc-hslogger-dev (>= 1.0.7)
-  , libghc-hslogger-dev (<< 1.2)
-  , libghc-hslogger-dev (<< 1.2)
+  , libghc-hslogger-dev (<< 1.3)
   , libghc-network-dev (>= 2.2)
   , libghc-network-dev (<< 3)
   , libghc-enumerator-dev (>= 0.4.14)
@@ -32,7 +28,7 @@
   , libghc-strict-dev (>= 0.3.2)
   , libghc-strict-dev (<< 0.4)
   , libghc-haddock-dev (>= 2.7.2)
-  , libghc-haddock-dev (<< 2.11)
+  , libghc-haddock-dev (<< 2.14)
   , dpkg (>= 1.14.27)
 Build-Depends-Indep: ghc-doc
   , libghc-binary-shared-doc
diff -rN -u old-haskell-leksah-server//patches/bump-transformers-dependency new-haskell-leksah-server//patches/bump-transformers-dependency
--- old-haskell-leksah-server//patches/bump-transformers-dependency	2013-04-13 22:18:45.487021848 +0000
+++ new-haskell-leksah-server//patches/bump-transformers-dependency	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-Description: Bump transformers dependency
-Author: Joachim Breitner <nomeata at debian.org>
-
-Index: haskell-leksah-server-0.12.0.4/leksah-server.cabal
-===================================================================
---- haskell-leksah-server-0.12.0.4.orig/leksah-server.cabal	2012-05-19 19:25:52.000000000 +0200
-+++ haskell-leksah-server-0.12.0.4/leksah-server.cabal	2012-05-26 19:35:27.000000000 +0200
-@@ -40,7 +40,7 @@
-                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
-                hslogger >= 1.0.7 && <1.2, network >=2.2 && <3.0, enumerator >=0.4.14 && < 0.5,
-                attoparsec-enumerator >=0.3 && <0.4, attoparsec >=0.10.0.3 && <0.11,
--               transformers >=0.2.2.0 && <0.3
-+               transformers >=0.2.2.0 && <0.4
-     if (impl(ghc >= 7.4))
-        build-depends: haddock >= 2.7.2 && <2.11
-     else
-@@ -100,7 +100,7 @@
-                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
-                hslogger >= 1.0.7 && <1.2, network >=2.2 && <3.0, enumerator >= 0.4.14 && <0.5,
-                attoparsec-enumerator >=0.3 && <0.4, attoparsec >=0.10.0.3 && <0.11,
--               transformers >=0.2.2.0 && <0.3
-+               transformers >=0.2.2.0 && <0.4
-     if (impl(ghc >= 7.4))
-        build-depends: haddock >= 2.7.2 && <2.11
-     else
-@@ -166,7 +166,7 @@
-     build-depends:  base >= 4.0.0.0 && <4.6, hslogger >= 1.0.7 && <1.2, deepseq >=1.1 && <1.4,
-                bytestring >=0.9.0.1 && <0.10, enumerator >= 0.4.14 && <0.5,
-                attoparsec-enumerator >=0.3 && <0.4, attoparsec >=0.10.0.3 && <0.11,
--               transformers >=0.2.2.0 && <0.3
-+               transformers >=0.2.2.0 && <0.4
- 
-     if (impl(ghc >= 7.2))
-        build-depends: process >= 1.1 && <1.2
-@@ -188,7 +188,7 @@
-     main-is:    TestTool.hs
-     build-depends: base >= 4.0.0.0 && <4.6,  hslogger >= 1.0.7 && <1.3,
-                leksah-server,
--               HUnit >=1.2 && <1.3, transformers >=0.2.2.0 && <0.3, enumerator >=0.4.14 && <0.5
-+               HUnit >=1.2 && <1.3, transformers >=0.2.2.0 && <0.4, enumerator >=0.4.14 && <0.5
- 
-     if (impl(ghc >= 7.2))
-        build-depends: process >= 1.1 && <1.2
diff -rN -u old-haskell-leksah-server//patches/series new-haskell-leksah-server//patches/series
--- old-haskell-leksah-server//patches/series	2013-04-13 22:18:45.487021848 +0000
+++ new-haskell-leksah-server//patches/series	2013-04-13 22:18:45.515022105 +0000
@@ -1 +1 @@
-bump-transformers-dependency
+ghc-7.6-compatibility.patch





More information about the Pkg-haskell-commits mailing list