diff -Nru haskell-devscripts-0.8.9ubuntu1/debian/changelog haskell-devscripts-0.8.12ubuntu1/debian/changelog --- haskell-devscripts-0.8.9ubuntu1/debian/changelog 2011-11-17 06:59:24.000000000 +0000 +++ haskell-devscripts-0.8.12ubuntu1/debian/changelog 2012-03-10 17:08:45.000000000 +0000 @@ -1,3 +1,34 @@ +haskell-devscripts (0.8.12ubuntu1) precise; urgency=low + + * Merge with Debian; remaining changes: + - dh_haskell_shlibdeps: If the test object doesn't have any unresolved + symbols from libffi or libgmp, remove the dependencies on libffi and + libgmp. + + -- Iain Lane Sat, 10 Mar 2012 17:08:13 +0000 + +haskell-devscripts (0.8.12) unstable; urgency=low + + * Depend on ghc >= 7.4, adjusting to its haddock --interface-version + behaviour. + + -- Joachim Breitner Sat, 04 Feb 2012 10:50:33 +0100 + +haskell-devscripts (0.8.11) unstable; urgency=low + + * Conflict with ghc >= 7.4; as haddock --interface-name behaves differently + then. A new haskell-devscripts upload will happen when ghc-7.4 enters + unstable. + + -- Joachim Breitner Thu, 05 Jan 2012 13:28:23 +0100 + +haskell-devscripts (0.8.10) unstable; urgency=low + + * Run Cabal-defined testsuites, if DEB_ENABLE_TESTS = yes is set in + debian/rules. + + -- Joachim Breitner Wed, 04 Jan 2012 20:13:14 +0100 + haskell-devscripts (0.8.9ubuntu1) precise; urgency=low * Merge with Debian; remaining changes: diff -Nru haskell-devscripts-0.8.9ubuntu1/debian/control haskell-devscripts-0.8.12ubuntu1/debian/control --- haskell-devscripts-0.8.9ubuntu1/debian/control 2011-07-30 10:21:20.000000000 +0000 +++ haskell-devscripts-0.8.12ubuntu1/debian/control 2012-03-10 17:07:37.000000000 +0000 @@ -14,12 +14,12 @@ Depends: dctrl-tools , debhelper , dh-buildinfo - , ghc (>= 7.0.4-3) + , ghc (>= 7.4) , cdbs , ${misc:Depends} , html-xml-utils , hscolour (>= 1.8) - , ghc-haddock (>= 7.0.2-5) + , ghc-haddock (>= 7.4) Description: Tools to help Debian developers build Haskell packages This package provides a collection of scripts to help build Haskell packages for Debian. Unlike haskell-utils, this package is not diff -Nru haskell-devscripts-0.8.9ubuntu1/dh_haskell_depends haskell-devscripts-0.8.12ubuntu1/dh_haskell_depends --- haskell-devscripts-0.8.9ubuntu1/dh_haskell_depends 2011-07-30 10:21:03.000000000 +0000 +++ haskell-devscripts-0.8.12ubuntu1/dh_haskell_depends 2012-03-10 17:07:37.000000000 +0000 @@ -124,7 +124,7 @@ -e ^haskell:Recommends \ -e ^haskell:Suggests \ $sfile > $sfile.tmp || true - depends=`haddock --interface-version` + depends=haddock-interface-`haddock --interface-version` echo "haskell:Depends=$depends" >> $sfile.tmp recommends=` \ find debian/$pkg -name \*.html -exec hxwls -r \{\} \; \ diff -Nru haskell-devscripts-0.8.9ubuntu1/hlibrary.mk haskell-devscripts-0.8.12ubuntu1/hlibrary.mk --- haskell-devscripts-0.8.9ubuntu1/hlibrary.mk 2011-09-04 17:24:28.000000000 +0000 +++ haskell-devscripts-0.8.12ubuntu1/hlibrary.mk 2012-03-10 17:07:37.000000000 +0000 @@ -30,6 +30,8 @@ CABAL_PACKAGE=$(DEB_CABAL_PACKAGE) CABAL_VERSION=$(shell cat *.cabal | egrep -i '^\s*version:' | head -n1 | sed -r 's,^\s*version:\s*,,i'| sed -r 's,\s*$$,,i') +DEB_ENABLE_TESTS ?= no + ENABLE_PROFILING = $(shell egrep -qe '^Package: libghc-.*-prof$$' debian/control && echo --enable-library-profiling; exit 0) NO_GHCI_FLAG = $(shell test -e /usr/bin/ghci || echo --ghc-option=-DDEBIAN_NO_GHCI; exit 0) @@ -54,8 +56,6 @@ DEB_HADDOCK_OPTS += --hyperlink-source endif -BUILD_GHC := $(DEB_SETUP_BIN_NAME) build -BUILD_GHC6 := $(DEB_SETUP_BIN_NAME) build MAKEFILE := debian/hlibrary.Makefile #ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -68,6 +68,12 @@ OPTIMIZATION = --disable-optimization endif +ifeq ($(DEB_ENABLE_TESTS),yes) +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + TESTS = --enable-tests +endif +endif + DEB_BUILD_DEPENDENCIES = build-arch clean:: @@ -89,13 +95,29 @@ --builddir=dist-ghc \ --haddockdir=$(DEB_HADDOCK_DIR) \ --htmldir=$(DEB_HADDOCK_HTML_DIR) $(ENABLE_PROFILING) $(NO_GHCI_FLAG) \ - $(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(DEB_SETUP_GHC_CONFIGURE_ARGS) $(OPTIMIZATION) + $(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(DEB_SETUP_GHC_CONFIGURE_ARGS) $(OPTIMIZATION) $(TESTS) build-ghc-stamp: dist-ghc - $(BUILD_GHC) --builddir=dist-ghc - touch build-ghc-stamp + $(DEB_SETUP_BIN_NAME) build --builddir=dist-ghc + touch $@ + +ifeq ($(DEB_ENABLE_TESTS),yes) +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +check-ghc-stamp: build-ghc-stamp + $(DEB_SETUP_BIN_NAME) test --builddir=dist-ghc + touch $@ +else +check-ghc-stamp: build-ghc-stamp + @echo DEB_BUILD_OPTIONS contains nocheck, not running checks + touch $@ +endif +else +check-ghc-stamp: build-ghc-stamp + @echo DEB_ENABLE_TESTS not set to yes, not running any tests. + touch $@ +endif -build/libghc-$(CABAL_PACKAGE)-prof build/libghc-$(CABAL_PACKAGE)-dev:: build-ghc-stamp +build/libghc-$(CABAL_PACKAGE)-prof build/libghc-$(CABAL_PACKAGE)-dev:: build-ghc-stamp check-ghc-stamp build-haddock-stamp: [ ! -x /usr/bin/haddock ] || $(DEB_SETUP_BIN_NAME) haddock --builddir=dist-ghc $(DEB_HADDOCK_OPTS)