haskell-language-javascript: staging conduit 1.1 transition

5 files changed, 12 insertions, 55 deletions

diff --git a/p/haskell-language-javascript/debian/changelog b/p/haskell-language-javascript/debian/changelog
index 8debfd0d1..487fe1b99 100644
--- a/p/haskell-language-javascript/debian/changelog
+++ b/p/haskell-language-javascript/debian/changelog
@@ -1,8 +1,12 @@
-haskell-language-javascript (0.5.6-4) UNRELEASED; urgency=low
+haskell-language-javascript (0.5.13-1) unstable; urgency=medium
 
+  [ Joachim Breitner ]
   * Adjust watch file to new hackage layout
 
- -- Joachim Breitner <nomeata@debian.org>  Sat, 05 Oct 2013 18:20:54 +0200
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Sat, 07 Jun 2014 12:16:23 -0400
 
 haskell-language-javascript (0.5.6-3) unstable; urgency=low
 
diff --git a/p/haskell-language-javascript/debian/control b/p/haskell-language-javascript/debian/control
index b1a9dfeed..b5d2dc2c9 100644
--- a/p/haskell-language-javascript/debian/control
+++ b/p/haskell-language-javascript/debian/control
@@ -2,7 +2,6 @@ Source: haskell-language-javascript
 Section: haskell
 Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
-DM-Upload-Allowed: yes
 Uploaders: Clint Adams <clint@debian.org>,
   Erik de Castro Lopo <erikd@mega-nerd.com>
 Build-Depends: debhelper (>= 9)
@@ -12,16 +11,13 @@ Build-Depends: debhelper (>= 9)
   , ghc-prof
   , happy
   , alex (>> 3)
-  , libghc-blaze-builder-dev (>> 0.2)
+  , libghc-blaze-builder-dev (>= 0.2)
   , libghc-blaze-builder-dev (<< 1)
   , libghc-blaze-builder-prof
-  , libghc-mtl-dev (>> 1.1)
+  , libghc-mtl-dev (>= 1.1)
   , libghc-mtl-dev (<< 2.9)
   , libghc-mtl-prof
-  , libghc-utf8-light-dev (>> 0.4)
-  , libghc-utf8-light-dev (<< 1.0)
-  , libghc-utf8-light-prof
-  , libghc-utf8-string-dev (>> 0.3.7)
+  , libghc-utf8-string-dev (>= 0.3.7)
   , libghc-utf8-string-dev (<< 1)
   , libghc-utf8-string-prof
   , libghc-quickcheck2-dev (>= 2)
@@ -29,12 +25,13 @@ Build-Depends: debhelper (>= 9)
   , libghc-hunit-dev
   , libghc-test-framework-dev
   , libghc-test-framework-hunit-dev
+  , libghc-utf8-light-dev (>= 0.4)
+  , libghc-utf8-light-dev (<< 1.0)
 Build-Depends-Indep: ghc-doc
   , libghc-blaze-builder-doc
   , libghc-mtl-doc
-  , libghc-utf8-light-doc
   , libghc-utf8-string-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/language-javascript
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-language-javascript
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-language-javascript
diff --git a/p/haskell-language-javascript/debian/patches/add-BangPatterns.diff b/p/haskell-language-javascript/debian/patches/add-BangPatterns.diff
deleted file mode 100644
index 06129a24e..000000000
--- a/p/haskell-language-javascript/debian/patches/add-BangPatterns.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-# Author : Erik de Castro Lopo <erikd@mega-nerd.com>
-# Description : Fix compiler error on big endian systems
- Upstream ships a haskell source file that was generated by the alex lexer
- generator and that file requires the BangPatterns pragma on big endian
- systems.
-# Date : Sun, 22 Apr 2012 13:24:38 +1000
-
-Index: haskell-language-javascript-0.4.10/src/Language/JavaScript/Parser/Lexer.hs
-===================================================================
---- haskell-language-javascript-0.4.10.orig/src/Language/JavaScript/Parser/Lexer.hs	2012-03-09 06:56:23.000000000 +1100
-+++ haskell-language-javascript-0.4.10/src/Language/JavaScript/Parser/Lexer.hs	2012-04-22 13:03:07.000000000 +1000
-@@ -1,4 +1,4 @@
--{-# LANGUAGE CPP,MagicHash #-}
-+{-# LANGUAGE CPP,MagicHash,BangPatterns #-}
- {-# LINE 1 "src-dev/Language/JavaScript/Parser/Lexer.x" #-}
diff --git a/p/haskell-language-javascript/debian/patches/fix-testsuite b/p/haskell-language-javascript/debian/patches/fix-testsuite
deleted file mode 100644
index 0850140cb..000000000
--- a/p/haskell-language-javascript/debian/patches/fix-testsuite
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix testsuite
-
-Author: Joachim Breitner <nomeata@debian.org>
-Bug: https://github.com/alanz/language-javascript/issues/20
-Bug: https://github.com/alanz/language-javascript/issues/21
-Forwarded: https://github.com/alanz/language-javascript/pull/20
-
---- haskell-language-javascript-0.5.6.orig/language-javascript.cabal
-+++ haskell-language-javascript-0.5.6/language-javascript.cabal
-@@ -72,7 +72,6 @@ Test-Suite test-language-javascript
-                  , blaze-builder    >= 0.2     && < 1
-                  -- need our own library for tests
-                  , language-javascript >= 0.5.5
--  hs-source-dirs: . src ./dist/build
-
-
- source-repository head
---- haskell-language-javascript-0.5.6.orig/runtests.hs
-+++ haskell-language-javascript-0.5.6/runtests.hs
-@@ -294,7 +294,7 @@ testSuite = testGroup "Parser"
-
-    , testCase "unicode4" (testProg "x=\"àáâãäå\";y='\3012a\0068'" "Right (JSSourceElementsTop [JSExpression [JSIdentifier \"x\",JSOperator JSLiteral \"=\",JSStringLiteral '\"' \"\\224\\225\\226\\227\\228\\229\"],JSLiteral \";\",JSExpression [JSIdentifier \"y\",JSOperator JSLiteral \"=\",JSStringLiteral '\\'' \"\\3012aD\"],JSLiteral \"\"])")
-
--   , testCase "unicode5f" (testFile "./test/Unicode.js" "JSSourceElementsTop [JSExpression [JSIdentifier \"\\224\\225\\226\\227\\228\\229\",JSOperator JSLiteral \"=\",JSDecimal \"1\"],JSLiteral \";\",JSLiteral \"\"]")
-+--   , testCase "unicode5f" (testFile "./test/Unicode.js" "JSSourceElementsTop [JSExpression [JSIdentifier \"\\224\\225\\226\\227\\228\\229\",JSOperator JSLiteral \"=\",JSDecimal \"1\"],JSLiteral \";\",JSLiteral \"\"]")
-
-    , testCase "bug2.a" (testProg "function() {\nz = function /*z*/(o) {\nreturn r;\n};}" "Right (JSSourceElementsTop [JSExpression [JSFunctionExpression [] [] (JSBlock ([JSExpression [JSIdentifier \"z\",JSOperator JSLiteral \"=\",JSFunctionExpression [] [JSIdentifier \"o\"] (JSBlock ([JSReturn [JSExpression [JSIdentifier \"r\"]] JSLiteral \";\"]))],JSLiteral \";\"]))],JSLiteral \"\"])")
diff --git a/p/haskell-language-javascript/debian/patches/series b/p/haskell-language-javascript/debian/patches/series
deleted file mode 100644
index fffd4ba20..000000000
--- a/p/haskell-language-javascript/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-add-BangPatterns.diff
-fix-testsuite