mighttpd2: New upstream version 3.0.3.

5 files changed, 20 insertions, 82 deletions

diff --git a/p/mighttpd2/debian/changelog b/p/mighttpd2/debian/changelog
index 0f53ccfda..1441f7788 100644
--- a/p/mighttpd2/debian/changelog
+++ b/p/mighttpd2/debian/changelog
@@ -1,8 +1,12 @@
-mighttpd2 (3.0.3-1) UNRELEASED; urgency=medium
+mighttpd2 (3.0.3-1) unstable; urgency=medium
 
+  [ Joachim Breitner ]
   * New upstream release
 
- -- Joachim Breitner <nomeata@debian.org>  Fri, 07 Mar 2014 13:26:56 +0100
+  [ Clint Adams ]
+  * Install helper binaries to /usr/bin.
+
+ -- Clint Adams <clint@debian.org>  Fri, 07 Mar 2014 13:24:39 -0500
 
 mighttpd2 (2.8.7-2) unstable; urgency=low
 
diff --git a/p/mighttpd2/debian/compat b/p/mighttpd2/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/p/mighttpd2/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/p/mighttpd2/debian/control b/p/mighttpd2/debian/control
index 3956ce2eb..1845395de 100644
--- a/p/mighttpd2/debian/control
+++ b/p/mighttpd2/debian/control
@@ -4,11 +4,14 @@ Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Uploaders: Clint Adams <clint@debian.org>
 Build-Depends: ghc
+  , cdbs
+  , debhelper (>= 9)
   , ghc-prof
   , libghc-blaze-builder-dev
   , libghc-byteorder-dev
   , libghc-case-insensitive-dev
   , libghc-conduit-dev
+  , libghc-http-client-dev
   , libghc-http-date-dev
   , libghc-http-types-dev
   , libghc-io-choice-dev
@@ -20,12 +23,12 @@ Build-Depends: ghc
   , libghc-unordered-containers-dev
   , libghc-wai-dev (>= 2.0)
   , libghc-wai-app-file-cgi-dev (>= 2.0)
-  , libghc-wai-logger-dev (>= 2.0)
+  , libghc-wai-logger-dev (>= 2.1)
   , libghc-warp-dev (>= 2.0)
   , libghc-tls-dev
   , libghc-warp-tls-dev (>= 1.4.1)
-  , libghc-hspec-dev (>> 1.3)
-Standards-Version: 3.9.4
+  , libghc-hspec-dev (>= 1.3)
+Standards-Version: 3.9.5
 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/mighttpd2.haskell-binaries b/p/mighttpd2/debian/mighttpd2.haskell-binaries
new file mode 100644
index 000000000..92bf86e0b
--- /dev/null
+++ b/p/mighttpd2/debian/mighttpd2.haskell-binaries
@@ -0,0 +1,3 @@
+mightyctl
+mighty-mkindex
+mighty
diff --git a/p/mighttpd2/debian/rules b/p/mighttpd2/debian/rules
index 6141df7dd..a63b8a9c1 100755
--- a/p/mighttpd2/debian/rules
+++ b/p/mighttpd2/debian/rules
@@ -1,81 +1,8 @@
 #!/usr/bin/make -f
 
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
-INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+DEB_GHC_CONFIGURE_ARGS = -ftls
+DEB_ENABLE_TESTS = yes
 
-package=mighttpd2
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
 
-clean: checkroot
-#	debian/$(package).setup clean
-	rm -f debian/$(package).setup *.o *.hi
-	rm -f build-arch stamp-configure debian/files debian/substvars
-	rm -rf dist
-	rm -rf debian/$(package)
-
-debian/$(package).setup:
-	ghc Setup.hs -o $@
-
-build: build-arch build-indep
-build-indep:
-
-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 \
-	                                  --enable-tests \
-					  -ftls
-
-	touch stamp-configure
-
-binary: binary-arch
-
-binary-indep:	checkroot build
-
-binary-arch:	checkroot build
-	$(checkdir)
-
-	debian/$(package).setup copy --destdir=$(CURDIR)/debian/$(package)
-	rm -rf debian/$(package)/usr/share/doc/$(package)-*
-	cd debian/$(package) && $(INSTALL_DIR) \
-		usr/bin \
-		usr/lib/$(package) \
-		usr/share/doc/$(package) \
-		DEBIAN
-	mv debian/$(package)/usr/share/$(package)-* debian/$(package)/usr/share/$(package)
-	mv debian/$(package)/usr/bin/mkindex debian/$(package)/usr/lib/$(package)/
-
-	$(INSTALL_FILE) debian/copyright debian/$(package)/usr/share/doc/$(package)/copyright
-
-	$(INSTALL_FILE) debian/changelog debian/$(package)/usr/share/doc/$(package)/changelog.Debian
-	gzip -9f debian/$(package)/usr/share/doc/$(package)/changelog.Debian
-
-	dpkg-shlibdeps -Tdebian/substvars -dDepends debian/$(package)/usr/bin/*
-	dpkg-gencontrol -ldebian/changelog -isp -p$(package) -Tdebian/substvars -Pdebian/$(package)
-
-	cd debian/$(package) && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
-
-	chown -R root:root debian/$(package)
-	chmod -R go=rX debian/$(package)
-
-	dpkg --build debian/$(package) ..
-
-define checkdir
-	test -f debian/rules
-endef
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: build build-indep binary binary-arch binary-indep clean checkroot