mighttpd2: New upstream version 2.5.4.

5 files changed, 39 insertions, 3 deletions

diff --git a/p/mighttpd2/debian/changelog b/p/mighttpd2/debian/changelog
index 001979d88..ee44ee1ff 100644
--- a/p/mighttpd2/debian/changelog
+++ b/p/mighttpd2/debian/changelog
@@ -1,3 +1,12 @@
+mighttpd2 (2.5.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * Bump to Standards-Version 3.9.3.
+  * Enable test suite.
+  * Patch to work with newer hashmap.
+
+ -- Clint Adams <clint@debian.org>  Thu, 08 Mar 2012 18:56:55 -0500
+
 mighttpd2 (2.5.0-1) unstable; urgency=low
 
   * Initial release.
diff --git a/p/mighttpd2/debian/control b/p/mighttpd2/debian/control
index f03bd7064..ed25954f0 100644
--- a/p/mighttpd2/debian/control
+++ b/p/mighttpd2/debian/control
@@ -6,7 +6,8 @@ Uploaders: Clint Adams <clint@debian.org>
 Build-Depends: ghc
   , ghc-prof
   , libghc-deepseq-dev
-  , libghc-hashmap-dev
+  , libghc-hashmap-dev (>> 1.2)
+  , libghc-hashmap-dev (<< 1.4)
   , libghc-http-conduit-dev
   , libghc-http-date-dev
   , libghc-http-types-dev
@@ -18,7 +19,10 @@ Build-Depends: ghc
   , libghc-wai-app-file-cgi-dev
   , libghc-wai-logger-prefork-dev
   , libghc-warp-dev
-Standards-Version: 3.9.2
+ , libghc-hunit-dev
+ , libghc-test-framework-hunit-dev
+ , libghc-test-framework-th-prime-dev
+Standards-Version: 3.9.3
 Homepage: http://hackage.haskell.org/package/mighttpd2
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/mighttpd2
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/mighttpd2
diff --git a/p/mighttpd2/debian/patches/newer-hashmap.diff b/p/mighttpd2/debian/patches/newer-hashmap.diff
new file mode 100644
index 000000000..27bb8a09f
--- /dev/null
+++ b/p/mighttpd2/debian/patches/newer-hashmap.diff
@@ -0,0 +1,20 @@
+--- a/mighttpd2.cabal
++++ b/mighttpd2.cabal
+@@ -21,7 +21,7 @@
+                       , deepseq
+                       , directory
+                       , filepath
+-                      , hashmap >= 1.2 && < 1.3
++                      , hashmap >= 1.2 && < 1.4
+                       , http-conduit
+                       , http-date
+                       , http-types
+@@ -65,7 +65,7 @@
+                       , deepseq
+                       , directory
+                       , filepath
+-                      , hashmap >= 1.2 && < 1.3
++                      , hashmap >= 1.2 && < 1.4
+                       , http-conduit
+                       , http-date
+                       , http-types
diff --git a/p/mighttpd2/debian/patches/series b/p/mighttpd2/debian/patches/series
new file mode 100644
index 000000000..5a02072c1
--- /dev/null
+++ b/p/mighttpd2/debian/patches/series
@@ -0,0 +1 @@
+newer-hashmap.diff
diff --git a/p/mighttpd2/debian/rules b/p/mighttpd2/debian/rules
index c8b2b8330..105ec028a 100755
--- a/p/mighttpd2/debian/rules
+++ b/p/mighttpd2/debian/rules
@@ -25,13 +25,15 @@ build-arch: stamp-configure
 	$(checkdir)
 
 	debian/$(package).setup build
+	debian/$(package).setup test
 
 	touch build-arch
 
 stamp-configure: debian/$(package).setup
 	$(checkdir)
 
-	debian/$(package).setup configure --prefix=/usr
+	debian/$(package).setup configure --prefix=/usr \
+	                                  --enable-tests
 
 	touch stamp-configure