[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 01ffea742d7aef929e2ec2968f02442ca4806b72
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Jan 23 11:17:21 2009 -0600

    Removed more MissingH cruft

diff --git a/Makefile b/Makefile
index e5aee2b..03fed57 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 PROJECT := testpack
-GHCPARMS := -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -cpp
 
 .PHONY: all hugsbuild
 all: setup			# GHC build
@@ -30,23 +29,6 @@ hugsbuild: setup
 setup: Setup.hs $(PROJECT).cabal
 	ghc -package Cabal Setup.hs -o setup
 
-doctmp/%.hs: %.lhs doctmp
-	mkdir -p `dirname $@`
-	$(UNLIT) $< $@
-
-doctmp:
-	mkdir doctmp
-
-.PHONY: doc
-doc: $(LHSCONVSOURCES) setup
-	-rm -rf html
-	./setup configure
-	./setup haddock
-#	haddock $(HADDOCKARGS) --package=$(PROJECT) \
-#	   --dump-interface=html/$(PROJECT).haddock \
-#	   -t '$(PROJECT) API Manual' -h -o html $(HUGSCONVSOURCES) $(LHSCONVSOURCES)
-	mv dist/doc/html .
-
 .PHONY: hugsbuild
 
 
@@ -57,21 +39,6 @@ clean:
 		local-pkg doctmp
 	-rm -rf testtmp/*
 
-.PHONY: local-pkg
-local-pkg: all
-	echo "[" > local-pkg
-	cat .installed-pkg-config >> local-pkg
-	echo "]" >> local-pkg
-
-testsrc/runtests: all $(wildcard testsrc/*.hs) $(wildcard testsrc/*/*.hs) $(wildcard testsrc/*/*/*.hs)
-	cd testsrc && ghc --make -package hslogger -package filepath -package mtl -package HUnit $(GHCPARMS) -o runtests  -i../dist/build:../src runtests.hs
-
-test-ghc6: testsrc/runtests
-	testsrc/runtests
-
-test-hugs: 
-	runhugs -98 +o "-Fcpphs --noline" -P$(PWD)/src:$(PWD)/testsrc: testsrc/runtests.hs
-
 interact-hugs:
 	hugs -98 +o -P$(PWD)/dist/build:
 
diff --git a/debian/rules b/debian/rules
index a20e251..64354e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,6 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-	make setup
-	./setup configure --prefix=$(LIBPATH) --ghc
 
 	touch configure-stamp
 
@@ -68,7 +66,6 @@ install: build
 	# Add here commands to install the package into debian/tmp
 	dh_haskell -a
 	dh_haskell_depends -a
-	make test-ghc6
 
 builddocs: builddocs-stamp
 builddocs-stamp:

-- 
haskell-testpack