--- hat-2.05+rerolled.orig/src/hattools/Makefile +++ hat-2.05+rerolled/src/hattools/Makefile @@ -5,7 +5,7 @@ HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package readline \ -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all else -HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package lang -package util \ +HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package util \ -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all endif else --- hat-2.05+rerolled.orig/debian/rules +++ hat-2.05+rerolled/debian/rules @@ -0,0 +1,134 @@ +#!/usr/bin/make -f +# debian/rules for hat +# Based on a debhelper example + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Unset LDFLAGS set by dpkg-buildpackage +unexport LDFLAGS + +# Include dpatch +include /usr/share/dpatch/dpatch.make + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +# Handle noopt in DEB_BUILD_OPTIONS +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + BUILDOPTS := -O0 +else + ifneq (,$(findstring $(DEB_HOST_ARCH),"arm m68k mipsel powerpc s390")) + BUILDOPTS := -O0 + else + BUILDOPTS := -O2 + endif +endif + +# Call gcc with -O0 when compiling PreludeBasic as cc1 will +# consume an awfull lot of memory otherwise. +BUILDENV := PreludeBasic_hcflags="-optc-O0" + +# Disable deprection warnings +BUILDOPTS += -fno-warn-deprecations + +# Only link libraries we actually use +BUILDOPTS += -optl -Wl,--as-needed + +VERSION := $(strip $(shell grep "^HATVERSION" Makefile.inc | cut -f 2 -d = )) +MACHINE = $(shell script/harch) + +GHC6_LIBDIR := $(shell ghc6 --print-libdir) + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + sed -e "s%@VERSION@%$(VERSION)%g" \ + debian/libghc6-hat-dev.postinst.in > \ + debian/libghc6-hat-dev.postinst + ./configure --prefix=/usr --mandir=/usr/share/man/man1 \ + --buildwith=ghc6 --buildopts="$(BUILDOPTS)" + touch configure-stamp + + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(BUILDENV) $(MAKE) + touch build-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f configure-stamp build-stamp + [ ! -f lib/$(MACHINE)/config ] || $(MAKE) clean + rm -f script/black-hat script/hat-anim script/hat-check \ + script/hat-cover script/hat-delta script/hat-detect \ + script/hat-explore script/hat-graph script/hat-nonterm \ + script/hat-observe script/hat-stack script/hat-trail \ + script/hat-trans script/hat-view script/pretty-hat + find src -name "*.hi" -exec rm {} \; + rm -f src/hattools/checkglib.h src/hatlib/Hat.pkgconf src/hattools/for_foreign_imports.h + rm -rf include/hat lib targets + rm -f debian/libghc6-hat-dev.postinst + dh_clean + +install: DH_OPTIONS= +install: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + DESTDIR="$(CURDIR)/debian/hat" ./configure --install +lib +bin +man +incx -inc + DESTDIR="$(CURDIR)/debian/libghc6-hat-dev" ./configure --install -lib -bin -man -incx +inc + for i in debian/hat/usr/bin/hat-*; \ + do mv "$$i" "$$i.old"; \ + sed "s/^MACHINE=.*/MACHINE=$$(script/harch)/" < "$$i.old" \ + > "$$i"; \ + chmod --reference="$$i.old" "$$i"; \ + rm "$$i.old"; \ + done + rm -f debian/hat/usr/bin/harch +# Delete empty directories installed by hat + find debian/hat -depth -type d -empty -delete + dh_install + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installmenu + dh_strip + dh_link + dh_compress + dh_fixperms + dh_installdeb + sh -e debian/mk-haskell-depends + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build-stamp +# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: install + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean clean-patched binary-indep binary-arch binary-common binary install configure --- hat-2.05+rerolled.orig/debian/libghc6-hat-dev.postinst.in +++ hat-2.05+rerolled/debian/libghc6-hat-dev.postinst.in @@ -0,0 +1,43 @@ +#! /bin/sh +# postinst script for libghc6-hat-dev +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +GHC_LIBDIR=`/usr/bin/ghc6 --print-libdir` +GHC_PKG=$GHC_LIBDIR/bin/ghc-pkg +GHC_PKG_CONFIG=/usr/lib/haskell-packages/ghc6/lib/hat-@VERSION@/installed-pkg-config + +case "$1" in + configure|abort-upgrade|abort-remove|abort-deconfigure) + if $GHC_PKG list > /dev/null 2>&1 ; then + $GHC_PKG update $GHC_PKG_CONFIG + else + $GHC_PKG --remove-package=hat 2> /dev/null || true + $GHC_PKG --add-package < $GHC_PKG_CONFIG + fi + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- hat-2.05+rerolled.orig/debian/libghc6-hat-dev.prerm +++ hat-2.05+rerolled/debian/libghc6-hat-dev.prerm @@ -0,0 +1,38 @@ +#!/bin/sh +# prerm script for libghc6-hat-dev +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +GHC_LIBDIR=`/usr/bin/ghc6 --print-libdir` +GHC_PKG=$GHC_LIBDIR/bin/ghc-pkg + +case "$1" in + remove|upgrade|deconfigure|failed-upgrade) + if $GHC_PKG list > /dev/null 2>&1 ; then + $GHC_PKG unregister hat || true + else + $GHC_PKG --remove-package=hat || true + fi + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- hat-2.05+rerolled.orig/debian/watch +++ hat-2.05+rerolled/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.cs.york.ac.uk/pub/haskell/hat/hat-([\d\.]*)\.tar\.gz --- hat-2.05+rerolled.orig/debian/compat +++ hat-2.05+rerolled/debian/compat @@ -0,0 +1 @@ +5 --- hat-2.05+rerolled.orig/debian/mk-haskell-depends +++ hat-2.05+rerolled/debian/mk-haskell-depends @@ -0,0 +1,250 @@ +#! /bin/sh +# +# Determine package dependencies from installed-pkg-config file +# +# Copyright (C) 2006 Arjan Oosting +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of either: +# +# 1) The terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# 2) BSD 3-clause license. +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# * The names of contributors may not be used to endorse or promote +# products derived from this software without specific prior +# written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +set -e + +sort_uniq(){ + { + for i in "$@" ; do + echo $i + done + } | sort -u | tr "\n" " " +} + +dependency(){ + local package + local version + local next_upstream_version + package=$1 + version=`dpkg-query --showformat='${Version}' -W $package` + next_upstream_version=`echo $version | sed -e 's/-[^-]*$/+/'` + echo "$package (>= $version), $package (<< $next_upstream_version)" +} + +dependencies(){ + local package + local packages + local deps + packages=$@ + for package in `sort_uniq $packages` ; do + deps="$deps, `dependency $package`" + done + + echo $deps | sed -e 's/^,[ ]*//' +} + +providing_package_for_ghc6(){ + local package + local dep + local dir + local dirs + local lib + dep=$1 + dirs=`ghc-pkg6 field $dep library-dirs | cut -d':' -f 2` + lib=`ghc-pkg6 field $dep hs-libraries | sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' ` + for dir in $dirs ; do + if [ -e "$dir/lib$lib.a" ] ; then + package=`dpkg-query -S $dir/lib$lib.a | cut -d':' -f 1` || exit $? + continue + fi + done + echo $package +} + +providing_package_for_ghc6_prof(){ + local package + local dep + local dir + local dirs + local lib + dep=$1 + dirs=`ghc-pkg6 field $dep library-dirs | cut -d':' -f 2` + lib=`ghc-pkg6 field $dep hs-libraries | sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' ` + for dir in $dirs ; do + if [ -e "$dir/lib$lib_p.a" ] ; then + package=`dpkg-query -S $dir/lib$lib.a | cut -d':' -f 1` || exit $? + continue + fi + done + echo $package +} + +cabal_depends(){ + local config + local dep + local depends + local final_depends + until [ -z "$1" ] + do + config=$1 + depends="$depends `grep-dctrl -n -i -s Depends "" $config | tr "," " "`" + shift + done + for dep in `sort_uniq $depends` ; do + # The package is not mentioned in the ignored package list with the same version + # or mentioned without any version in the ignored package list? + if echo " $ignores " | grep -qv " $dep " && + echo " $ignores " | grep -qv " `echo $dep | sed s%-[0-9][.0-9a-zA-Z]*$%%` " ; + then + final_depends="$final_depends $dep" + fi + done + echo $final_depends +} + +depends_for_ghc6(){ + local dep + local packages + for dep in `cabal_depends $@` ; do + packages="$packages `providing_package_for_ghc6 $dep`" + done + + dependencies $packages +} + +depends_for_ghc6_prof(){ + local dep + local packages + for dep in `cabal_depends $@` ; do + packages="$packages `providing_package_for_ghc6_prof $dep`" + done + + dependencies $packages +} + +find_config_for_ghc6(){ + local f + local pkg + pkg=$1 + case "$pkg" in + libghc6-*-prof) + pkg=`echo $pkg | sed -e 's/-prof$/-dev$/'` + ;; + *) + ;; + esac + for f in debian/$pkg/usr/lib/haskell-packages/ghc6/lib/*/installed-pkg-config ; do + if [ -f "$f" ] ; then + echo $f + break + fi + done +} + + +if ! [ `which grep-dctrl` > /dev/null ] ; then + echo "grep-dctrl is missing" >&2 + exit 1 +fi + +args= +ignores= +files= +until [ -z "$1" ] +do + case "$1" in + -X*) + pkg=${1##-X} + ignores="$ignores $pkg" + ;; + + --exclude=*) + pkg=${1##--exclude=} + ignores="$ignores $pkg" + ;; + + -*) + args="$args $1" + ;; + *) + if [ -f $1 ] ; then + files="$files $1" + else + echo "Installed package description file $1 can not be found" >&2 + exit 1 + fi + ;; + esac + shift +done + +for pkg in `dh_listpackages $args`; do + sfile=debian/$pkg.substvars + touch $sfile + + case "$pkg" in + libghc6-*-dev|libghc6-*-prof) + config=`find_config_for_ghc6 $pkg` + if [ -f "$config" ] ; then + files="$files $config" + fi + if [ -z "$files" ] ; then + echo "No installed package description files can not be found" >&2 + exit 1 + fi + grep -v ^haskell:Depends $sfile > $sfile.tmp || true + case "$pkg" in + libghc6-*-dev) + echo "haskell:Depends=`depends_for_ghc6 $files`" >> $sfile.tmp + ;; + libghc6-*-prof) + echo "haskell:Depends=`depends_for_ghc6_prof $files`" >> $sfile.tmp + ;; + esac + mv $sfile.tmp $sfile + ;; + *) + ;; + esac +done --- hat-2.05+rerolled.orig/debian/patches/15_add-missing-packages.dpatch +++ hat-2.05+rerolled/debian/patches/15_add-missing-packages.dpatch @@ -0,0 +1,58 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_fix-buildflags.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adjust build system for split base library + +@DPATCH@ +diff -urNad hat~/Makefile hat/Makefile +--- hat~/Makefile 2008-02-17 01:00:46.000000000 +0100 ++++ hat/Makefile 2008-02-17 01:03:34.000000000 +0100 +@@ -23,7 +23,7 @@ + src/hatlib/Foreign/Marshal/*.hs #src/hat/lib/Foreign/C/*.hs + HATUI = src/hattools/Makefile* src/hattools/*.[ch] src/hattools/*.hs + HATTRANS= src/hattrans/Makefile* \ +- $(shell hmake -package lang -M HatTrans.hs \ ++ $(shell hmake -package packedstring -M HatTrans.hs \ + -Isrc/hattrans -Isrc/compiler98 \ + | cut -d':' -f1 | sed -e 's/\.o$$/.hs/' | sed -e '/^. /d' ) + DOC = docs/* +diff -urNad hat~/src/hattools/Makefile hat/src/hattools/Makefile +--- hat~/src/hattools/Makefile 2008-02-17 01:01:14.000000000 +0100 ++++ hat/src/hattools/Makefile 2008-02-17 01:04:10.000000000 +0100 +@@ -1,7 +1,11 @@ + include Makefile.inc + + ifeq "ghc" "$(findstring ghc, ${HC})" +- ifeq "606" "${GHCSYM}" ++ ifeq "608" "${GHCSYM}" ++HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package readline \ ++ -package packedstring -package containers \ ++ -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all ++ else ifeq "606" "${GHCSYM}" + HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package readline \ + -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all + else +@@ -48,7 +52,7 @@ + objdir: $(OBJDIR) + clean: + rm -f $(ALLCOBJS) +- hmake -realclean -hc=$(HC) -d$(OBJDIR) \ ++ hmake -realclean -package containers -hc=$(HC) -d$(OBJDIR) \ + HatObserve HatTrail HatDetect HatStackText HatExplore HatCoverText \ + SrcRefViewer HatAnim BlackHat HatNonTerm PrettyHat + realclean: clean +diff -urNad hat~/src/hattrans/Makefile hat/src/hattrans/Makefile +--- hat~/src/hattrans/Makefile 2008-02-17 01:00:46.000000000 +0100 ++++ hat/src/hattrans/Makefile 2008-02-17 01:03:34.000000000 +0100 +@@ -27,7 +27,9 @@ + endif + ifeq "ghc" "$(findstring ghc, ${HC})" + IMPROVE = #-O +- ifeq "606" "${GHCSYM}" ++ ifeq "608" "${GHCSYM}" ++HMAKEFLAGS := -package base -package packedstring $(IMPROVE) ++ else ifeq "606" "${GHCSYM}" + HMAKEFLAGS := -package base $(IMPROVE) + else + HMAKEFLAGS := $(shell $(LOCAL)fixghc $(GHCSYM) -package lang -package base) $(IMPROVE) --- hat-2.05+rerolled.orig/debian/patches/19_glib2.0.dpatch +++ hat-2.05+rerolled/debian/patches/19_glib2.0.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 19_glib2.0.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Build against glib 2.0 instead of glib 1.2 + +@DPATCH@ +diff -urNad hat~/configure hat/configure +--- hat~/configure 2008-02-16 23:39:48.000000000 +0100 ++++ hat/configure 2008-02-16 23:39:48.000000000 +0100 +@@ -295,7 +295,7 @@ + fi + + echo -n "Testing for the glib library: " +- if glib-config --version >/dev/null 2>&1 ++ if pkg-config glib-2.0 --version >/dev/null 2>&1 + then + echo ' yes (detected)' + echo '#define HAVE_GLIB 1' >src/hattools/checkglib.h +diff -urNad hat~/src/hattools/Makefile hat/src/hattools/Makefile +--- hat~/src/hattools/Makefile 2008-02-16 23:39:48.000000000 +0100 ++++ hat/src/hattools/Makefile 2008-02-16 23:39:48.000000000 +0100 +@@ -19,8 +19,8 @@ + endif + + ifeq "glib" "$(GLIB)" +-GLIB_CFLAGS = $(shell glib-config --cflags) +-GLIB_LINK = $(shell glib-config --libs) ++GLIB_CFLAGS = $(shell pkg-config glib-2.0 --cflags) ++GLIB_LINK = $(shell pkg-config glib-2.0 --libs) + else + GLIB_CFLAGS = + GLIB_LINK = --- hat-2.05+rerolled.orig/debian/patches/00list +++ hat-2.05+rerolled/debian/patches/00list @@ -0,0 +1,15 @@ +11_fail-on-error +12_include-stdlib +13_byteorder +14_fix-manpage +15_add-missing-packages +16_fix-buildflags +17_fix-ghcsym-detection +18_no-strip +19_glib2.0 +20_install-all-interface-files +21_no-register +22_configure-incx-flag +23_debian-haskell-packages-path +24_TraceTrans +25_no-gcc-optimisation --- hat-2.05+rerolled.orig/debian/patches/13_byteorder.dpatch +++ hat-2.05+rerolled/debian/patches/13_byteorder.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_byteorder.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: correct location of byteorder.h + +@DPATCH@ +diff -urNad hat~/src/hattools/artutils.h hat/src/hattools/artutils.h +--- hat~/src/hattools/artutils.h 2006-07-21 18:18:41.000000000 +0200 ++++ hat/src/hattools/artutils.h 2006-10-12 23:57:46.000000000 +0200 +@@ -3,7 +3,7 @@ + + #include "art.h" + #if defined(sparc) +-#include ++#include + #endif + + extern FileOffset errorRoot, errorMsg, remoteStartNode; --- hat-2.05+rerolled.orig/debian/patches/18_no-strip.dpatch +++ hat-2.05+rerolled/debian/patches/18_no-strip.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 18_no-strip.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not strip hat-trans and let dh_strip, which does respect +## DP: the nostrip build option, handle it. + +@DPATCH@ +diff -urNad hat~/src/hattrans/Makefile hat/src/hattrans/Makefile +--- hat~/src/hattrans/Makefile 2007-05-11 07:31:55.000000000 +0200 ++++ hat/src/hattrans/Makefile 2007-08-12 15:02:47.000000000 +0200 +@@ -48,7 +48,7 @@ + $(TARGET): ${OBJDIR} $(OBJDIR)/$(HC) $(SRCS) $(COMPSRCS) + hmake -hc=$(HC) $(HMAKEFLAGS) -d $(OBJDIR) -I. -I../compiler98 HatTrans + mv $(OBJDIR)/HatTrans$(EXE) $(TARGET) +- $(STRIP) $(TARGET) ++# $(STRIP) $(TARGET) + ${OBJDIR}: + mkdir -p ${OBJDIR} + $(OBJDIR)/$(HC): --- hat-2.05+rerolled.orig/debian/patches/20_install-all-interface-files.dpatch +++ hat-2.05+rerolled/debian/patches/20_install-all-interface-files.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_install-all-interface-files.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes the hat/script/pkgdirlist script to return all +## DP: directories containing .hx files, so all .hx will be installed. + +@DPATCH@ +diff -urNad hat~/script/pkgdirlist hat/script/pkgdirlist +--- hat~/script/pkgdirlist 2008-02-17 03:26:43.000000000 +0100 ++++ hat/script/pkgdirlist 2008-02-17 03:28:44.000000000 +0100 +@@ -5,6 +5,7 @@ + ;; + base) echo Data Debug Control Control/Monad System System/IO System/Console + echo Text Text/PrettyPrint Text/Html Text/Show Text/ParserCombinators ++ echo Text/ParserCombinators/Parsec + echo Text/Regex Foreign Foreign/Marshal Foreign/C NHC System/Directory + ;; + Cabal) --- hat-2.05+rerolled.orig/debian/patches/17_fix-ghcsym-detection.dpatch +++ hat-2.05+rerolled/debian/patches/17_fix-ghcsym-detection.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 17_fix-ghcsym-detection.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix detection of GHC version number. + +@DPATCH@ +diff -urNad hat~/script/confhat hat/script/confhat +--- hat~/script/confhat 2007-05-28 19:17:07.000000000 +0200 ++++ hat/script/confhat 2007-05-28 19:23:07.000000000 +0200 +@@ -24,7 +24,7 @@ + # discover ghc version (technique courtesy of Simon Marlow) + echo __GLASGOW_HASKELL__ >ghcsym.hs; + $COMP -E -cpp -optP-P ghcsym.hs -o ghcsym.out; +- GHCSYM=`grep -v '^#' ghcsym.out | grep -v '^$'` ++ GHCSYM=`grep -v '^#' ghcsym.out | grep -v '^$' | grep -v '^{-'` + rm -f ghcsym.hs ghcsym.out; + + # # discover ghc location +diff -urNad hat~/script/confhc-hat hat/script/confhc-hat +--- hat~/script/confhc-hat 2007-05-28 19:17:07.000000000 +0200 ++++ hat/script/confhc-hat 2007-05-28 19:23:07.000000000 +0200 +@@ -56,7 +56,7 @@ + ghcsym () { + echo __GLASGOW_HASKELL__ >ghcsym.hs; + $1 -E -cpp -optP-P ghcsym.hs -o ghcsym.out; +- grep -v '^#' ghcsym.out | grep -v '^$' > $2 ++ grep -v '^#' ghcsym.out | grep -v '^$' | grep -v '^{-' > $2 + rm -f ghcsym.hs ghcsym.out; + } + --- hat-2.05+rerolled.orig/debian/patches/21_no-register.dpatch +++ hat-2.05+rerolled/debian/patches/21_no-register.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 21_no-register.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't deregister and register the package + +@DPATCH@ +diff -urNad hat~/script/confhat hat/script/confhat +--- hat~/script/confhat 2006-10-24 21:30:59.000000000 +0200 ++++ hat/script/confhat 2006-10-24 21:31:00.000000000 +0200 +@@ -45,8 +45,8 @@ + ranlib $libdir/libHShat.a && \ + if [ -d $incdir ] + then +- rm -rf $incdir/Hat && \ +- { ghc-pkg$VER --remove-package=hat || $TRUE; } ++ rm -rf $incdir/Hat #&& \ ++ #{ ghc-pkg$VER --remove-package=hat || $TRUE; } + else + mkdir $incdir + fi && \ +@@ -61,9 +61,9 @@ + { cat lib/$MACHINE/hatlib/$COMP/hat-package.conf ; + echo "import-dirs: $incdir"; + echo "library-dirs: $libdir"; +- } | ghc-pkg$VER --user register - ++ } > /dev/null #| ghc-pkg$VER --user register - + else +- cat lib/$MACHINE/hatlib/$COMP/hat-package.conf | ghc-pkg$VER --add-package ++ cat lib/$MACHINE/hatlib/$COMP/hat-package.conf > /dev/null #| ghc-pkg$VER --add-package + fi + fi + if [ -d lib/$MACHINE/hatlib/nhc98 ] --- hat-2.05+rerolled.orig/debian/patches/23_debian-haskell-packages-path.dpatch +++ hat-2.05+rerolled/debian/patches/23_debian-haskell-packages-path.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23_debian-haskell-packages-path.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adjust paths to Debian 'standard' + +@DPATCH@ +diff -urNad hat~/script/confhat hat/script/confhat +--- hat~/script/confhat 2006-07-21 22:08:27.000000000 +0200 ++++ hat/script/confhat 2006-07-21 22:08:47.000000000 +0200 +@@ -27,14 +27,15 @@ + $COMP -E -cpp -optP-P ghcsym.hs -o ghcsym.out; + GHCSYM=`grep -v '^#' ghcsym.out | grep -v '^$'` + rm -f ghcsym.hs ghcsym.out; +- ++ GHCVERSION=`$COMP --numeric-version` ++ GHCMAJOR=`echo $GHCVERSION | cut -f1 -d.` + # # discover ghc location + # libdir=`$COMP -v 2>&1 | head -n 2 | tail -1 | cut -c28- | head -n 1` + # libdir=`dirname $libdir` + # libdir=$DESTDIR$libdir + # incdir=$libdir/imports/hat +- libdir=$DESTDIR$PREFIX/lib/hat-$HATVERSION/$MACHINE/ghc-$GHCSYM +- incdir=$DESTDIR$PREFIX/imports/hat-$HATVERSION/ghc-$GHCSYM ++ libdir=$DESTDIR$PREFIX/lib/haskell-packages/ghc$GHCMAJOR/lib/hat-$HATVERSION/ghc-$GHCVERSION ++ incdir=$DESTDIR$PREFIX/lib/haskell-packages/ghc$GHCMAJOR/lib/hat-$HATVERSION/ghc-$GHCVERSION + echo >&2 "Installing hat package for ghc under $libdir" + mkdir -p $libdir + mkdir -p $incdir +@@ -59,11 +60,11 @@ + if [ $GHCSYM -ge 604 ] + then + { cat lib/$MACHINE/hatlib/$COMP/hat-package.conf ; +- echo "import-dirs: $incdir"; +- echo "library-dirs: $libdir"; +- } > /dev/null #| ghc-pkg$VER --user register - ++ echo "import-dirs: ${incdir#$DESTDIR}"; ++ echo "library-dirs: ${libdir#$DESTDIR}"; ++ } > ${incdir%ghc-$GHCVERSION}/installed-pkg-config + else +- cat lib/$MACHINE/hatlib/$COMP/hat-package.conf > /dev/null #| ghc-pkg$VER --add-package ++ cat lib/$MACHINE/hatlib/$COMP/hat-package.conf > ${incdir%ghc-$GHCVERSION}/installed-pkg-config + fi + fi + if [ -d lib/$MACHINE/hatlib/nhc98 ] --- hat-2.05+rerolled.orig/debian/patches/16_fix-buildflags.dpatch +++ hat-2.05+rerolled/debian/patches/16_fix-buildflags.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 16_fix-buildflags.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix the way the BUILDFLAGS are inserted when building the +## DP: hattools and drop the profiling flags. + +@DPATCH@ +diff -urNad hat~/src/hattools/Makefile hat/src/hattools/Makefile +--- hat~/src/hattools/Makefile 2008-02-17 01:04:33.000000000 +0100 ++++ hat/src/hattools/Makefile 2008-02-17 01:04:33.000000000 +0100 +@@ -4,16 +4,16 @@ + ifeq "608" "${GHCSYM}" + HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package readline \ + -package packedstring -package containers \ +- -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all ++ -DUSE_READLINE=1 $(shell echo ${BUILDOPTS}) + else ifeq "606" "${GHCSYM}" + HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package readline \ +- -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all ++ -DUSE_READLINE=1 $(shell echo ${BUILDOPTS}) + else + HMAKEFLAGS = -I. -I$(INCDIR) -fglasgow-exts -package base -package util \ +- -DUSE_READLINE=1 $(BUILDOPTS) -prof -auto-all ++ -DUSE_READLINE=1 $(shell echo ${BUILDOPTS}) + endif + else +-HMAKEFLAGS = -I. -I$(INCDIR) -package base +CTS -H8M -CTS -K10M $(BUILDOPTS) ++HMAKEFLAGS = -I. -I$(INCDIR) -package base +CTS -H8M -CTS -K10M $(shell echo ${BUILDOPTS}) + endif + + ifeq "glib" "$(GLIB)" --- hat-2.05+rerolled.orig/debian/patches/24_TraceTrans.dpatch +++ hat-2.05+rerolled/debian/patches/24_TraceTrans.dpatch @@ -0,0 +1,115 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 24_TraceTrans.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad hat~/src/hattrans/TraceTrans.hs hat/src/hattrans/TraceTrans.hs +--- hat~/src/hattrans/TraceTrans.hs 2006-07-21 18:23:18.000000000 +0200 ++++ hat/src/hattrans/TraceTrans.hs 2006-07-21 18:28:04.000000000 +0200 +@@ -171,6 +171,7 @@ + tImpDecls :: Bool -> TraceId -> [ImpDecl TraceId] -> [ImpDecl TokenId] + tImpDecls traced modId decls = + ImportQ (noPos,tPrelude) (Hiding []) ++ :Import (noPos,tPrelude) (Hiding hs) + -- ^ import original Prelude qualified + -- actually should hide Prelude as far as possible using + -- ImportQ (noPos,tPrelude) (NoHiding []) +@@ -183,6 +184,65 @@ + -- ^ hack for nhc98 <= 1.16 + :map (tImpDecl traced) decls + ++ where ++ hs = [EntityVar noPos (visImport "map"), EntityVar noPos (visImport "++"), EntityVar noPos (visImport "filter"), EntityVar noPos (visImport "concat"), ++ EntityVar noPos (visImport "head"), EntityVar noPos (visImport "last"), EntityVar noPos (visImport "tail"), EntityVar noPos (visImport "init"), EntityVar noPos (visImport "null"), EntityVar noPos (visImport "length"), EntityVar noPos (visImport "!!"), ++ EntityVar noPos (visImport "foldl"), EntityVar noPos (visImport "foldl1"), EntityVar noPos (visImport "scanl"), EntityVar noPos (visImport "scanl1"), EntityVar noPos (visImport "foldr"), EntityVar noPos (visImport "foldr1"), EntityVar noPos (visImport "scanr"), EntityVar noPos (visImport "scanr1"), ++ EntityVar noPos (visImport "iterate"), EntityVar noPos (visImport "repeat"), EntityVar noPos (visImport "replicate"), EntityVar noPos (visImport "cycle"), ++ EntityVar noPos (visImport "take"), EntityVar noPos (visImport "drop"), EntityVar noPos (visImport "splitAt"), EntityVar noPos (visImport "takeWhile"), EntityVar noPos (visImport "dropWhile"), EntityVar noPos (visImport "span"), EntityVar noPos (visImport "break"), ++ EntityVar noPos (visImport "lines"), EntityVar noPos (visImport "words"), EntityVar noPos (visImport "unlines"), EntityVar noPos (visImport "unwords"), EntityVar noPos (visImport "reverse"), EntityVar noPos (visImport "and"), EntityVar noPos (visImport "or"), ++ EntityVar noPos (visImport "any"), EntityVar noPos (visImport "all"), EntityVar noPos (visImport "elem"), EntityVar noPos (visImport "notElem"), EntityVar noPos (visImport "lookup"), ++ EntityVar noPos (visImport "sum"), EntityVar noPos (visImport "product"), EntityVar noPos (visImport "maximum"), EntityVar noPos (visImport "minimum"), EntityVar noPos (visImport "concatMap"), ++ EntityVar noPos (visImport "zip"), EntityVar noPos (visImport "zip3"), EntityVar noPos (visImport "zipWith"), EntityVar noPos (visImport "zipWith3"), EntityVar noPos (visImport "unzip"), EntityVar noPos (visImport "unzip3"), ++ EntityVar noPos (visImport "ReadS"), EntityVar noPos (visImport "ShowS"), ++ EntityConClsSome noPos (visImport "Read") [(noPos, visImport "readsPrec"), (noPos, visImport "readList")], ++ EntityConClsSome noPos (visImport "Show") [(noPos, visImport "showsPrec"), (noPos, visImport "show"), (noPos, visImport "showList")], ++ EntityVar noPos (visImport "reads"), EntityVar noPos (visImport "shows"), EntityVar noPos (visImport "read"), EntityVar noPos (visImport "lex"), ++ EntityVar noPos (visImport "showChar"), EntityVar noPos (visImport "showString"), EntityVar noPos (visImport "readParen"), EntityVar noPos (visImport "showParen"), ++ EntityVar noPos (visImport "FilePath"), EntityVar noPos (visImport "IOError"), EntityVar noPos (visImport "ioError"), EntityVar noPos (visImport "userError"), EntityVar noPos (visImport "catch"), ++ EntityVar noPos (visImport "putChar"), EntityVar noPos (visImport "putStr"), EntityVar noPos (visImport "putStrLn"), EntityVar noPos (visImport "print"), ++ EntityVar noPos (visImport "getChar"), EntityVar noPos (visImport "getLine"), EntityVar noPos (visImport "getContents"), EntityVar noPos (visImport "interact"), ++ EntityVar noPos (visImport "readFile"), EntityVar noPos (visImport "writeFile"), EntityVar noPos (visImport "appendFile"), EntityVar noPos (visImport "readIO"), EntityVar noPos (visImport "readLn"), ++ EntityConClsSome noPos (visImport "Bool") [(noPos, visImport "True"), (noPos, visImport "False")], ++ EntityConClsSome noPos (visImport "Maybe") [(noPos, visImport "Just"), (noPos, visImport "Nothing")], ++ EntityConClsSome noPos (visImport "Either") [(noPos, visImport "Left"), (noPos, visImport "Right")], ++ EntityConClsSome noPos (visImport "Ordering") [(noPos, visImport "GT"), (noPos, visImport "LT"), (noPos, visImport "EQ")], ++ EntityVar noPos (visImport "Char"), EntityVar noPos (visImport "String"), EntityVar noPos (visImport "Int"), EntityVar noPos (visImport "Integer"), EntityVar noPos (visImport "Float"), EntityVar noPos (visImport "Double"), EntityVar noPos (visImport "Rational"), EntityVar noPos (visImport "IO"), ++ EntityConClsSome noPos (visImport "Eq") [(noPos, visImport "=="), (noPos, visImport "/=")], ++ EntityConClsSome noPos (visImport "Ord") [(noPos, visImport "compare"), (noPos, visImport "<"), (noPos, visImport "<="), (noPos, visImport ">"), (noPos, visImport ">="), (noPos, visImport "max"), (noPos, visImport "min")], ++ EntityConClsSome noPos (visImport "Enum") [ ++ (noPos, visImport "succ"), (noPos, visImport "pred"), (noPos, visImport "toEnum"), (noPos, visImport "fromEnum"), (noPos, visImport "enumFrom"), (noPos, visImport "enumFromThen"), (noPos, visImport "enumFromTo"), (noPos, visImport "enumFromThenTo")], ++ EntityConClsSome noPos (visImport "Bounded") [(noPos, visImport "minBound"), (noPos, visImport "maxBound")], ++ EntityConClsSome noPos (visImport "Num") [ ++ (noPos, visImport "+"), (noPos, visImport "-"), (noPos, visImport "*"), (noPos, visImport "negate"), (noPos, visImport "abs"), (noPos, visImport "signum"), (noPos, visImport "fromInteger")], ++ EntityConClsSome noPos (visImport "Real") [(noPos, visImport "toRational")], ++ EntityConClsSome noPos (visImport "Integral") [ ++ (noPos, visImport "quot"), (noPos, visImport "rem"), (noPos, visImport "div"), (noPos, visImport "mod"), (noPos, visImport "quotRem"), (noPos, visImport "divMod"), (noPos, visImport "toInteger")], ++ EntityConClsSome noPos (visImport "Fractional") [(noPos, visImport "/"), (noPos, visImport "recip"), (noPos, visImport "fromRational")], ++ EntityConClsSome noPos (visImport "Floating") [ ++ (noPos, visImport "pi"), (noPos, visImport "exp"), (noPos, visImport "log"), (noPos, visImport "sqrt"), (noPos, visImport "**"), (noPos, visImport "logBase"), (noPos, visImport "sin"), (noPos, visImport "cos"), (noPos, visImport "tan"), (noPos, visImport "asin"), (noPos, visImport "acos"), (noPos, visImport "atan"), (noPos, visImport "sinh"), (noPos, visImport "cosh"), (noPos, visImport "tanh"), (noPos, visImport "asinh"), (noPos, visImport "acosh"), (noPos, visImport "atanh") ++ ], ++ EntityConClsSome noPos (visImport "RealFrac") [ ++ (noPos, visImport "properFraction"), (noPos, visImport "truncate"), (noPos, visImport "round"), (noPos, visImport "ceiling"), (noPos, visImport "floor") ++ ], ++ EntityConClsSome noPos (visImport "RealFloat") [ ++ (noPos, visImport "floatRadix"), (noPos, visImport "floatDigits"), (noPos, visImport "floatRange"), (noPos, visImport "decodeFloat"), (noPos, visImport "encodeFloat"), (noPos, visImport "exponent"), (noPos, visImport "significand"), (noPos, visImport "scaleFloat"), (noPos, visImport "isNaN"), (noPos, visImport "isInfinite"), (noPos, visImport "isDenormalized"), (noPos, visImport "isIEEE"), (noPos, visImport "isNegativeZero"), (noPos, visImport "atan2") ++ ], ++ EntityConClsSome noPos (visImport "Monad") [ ++ (noPos, visImport ">>="), (noPos, visImport ">>"), (noPos, visImport "return"), (noPos, visImport "fail") ++ ], ++ EntityConClsSome noPos (visImport "Functor") [ ++ (noPos, visImport "fmap") ++ ], ++ EntityVar noPos (visImport "mapM"), EntityVar noPos (visImport "mapM_"), EntityVar noPos (visImport "sequence"), EntityVar noPos (visImport "sequence_"), EntityVar noPos (visImport "=<<"), ++ EntityVar noPos (visImport "maybe"), EntityVar noPos (visImport "either"), ++ EntityVar noPos (visImport "&&"), EntityVar noPos (visImport "||"), EntityVar noPos (visImport "not"), EntityVar noPos (visImport "otherwise"), ++ EntityVar noPos (visImport "subtract"), EntityVar noPos (visImport "even"), EntityVar noPos (visImport "odd"), EntityVar noPos (visImport "gcd"), EntityVar noPos (visImport "lcm"), EntityVar noPos (visImport "^"), EntityVar noPos (visImport "^^"), ++ EntityVar noPos (visImport "fromIntegral"), EntityVar noPos (visImport "realToFrac"), ++ EntityVar noPos (visImport "fst"), EntityVar noPos (visImport "snd"), EntityVar noPos (visImport "curry"), EntityVar noPos (visImport "uncurry"), EntityVar noPos (visImport "id"), EntityVar noPos (visImport "const"), EntityVar noPos (visImport "."), EntityVar noPos (visImport "flip"), EntityVar noPos (visImport "$"), EntityVar noPos (visImport "until"), ++ EntityVar noPos (visImport "asTypeOf"), EntityVar noPos (visImport "error"), EntityVar noPos (visImport "undefined"), ++ EntityVar noPos (visImport "seq"), EntityVar noPos (visImport "$!")] ++ + tImpDecl :: Bool -> ImpDecl TraceId -> ImpDecl TokenId + tImpDecl traced (Import (pos,id) spec) = + Import (pos,nameTransModule id) (tImpSpec traced spec) +@@ -777,7 +837,7 @@ + wrapValInstDecl traced pos contexts ty constrs = + DeclInstance pos (map (fmap tokenId) contexts) tokenWrapValClass + [(fmap tokenId (simpleToType ty))] +- (DeclsParse [DeclFun pos (dropM tokenWrapValFun) (map wrapValFun constrs)]) ++ (DeclsParse [DeclFun pos (dropM utokenWrapValFun) (map wrapValFun constrs)]) + where + traceTokenWrapValFun = + mkLambdaBound (initAuxInfo traced) (dropM tokenWrapValFun) +@@ -2203,8 +2263,9 @@ + mkTPreludeToken :: String -> TokenId + mkTPreludeToken s = Qualified tPreludeModule (packString . reverse $ s) + +-mkTracingToken :: String -> TokenId ++mkTracingToken, mkUnqualTracingToken :: String -> TokenId + mkTracingToken s = Qualified tracingModuleShort (packString . reverse $ s) ++mkUnqualTracingToken s = Visible (packString . reverse $ s) + + mkTracingTokenArity :: String -> Arity -> TokenId + mkTracingTokenArity s a = mkTracingToken (s ++ show a) +@@ -2343,8 +2404,9 @@ + + tokenWrapValClass :: TokenId + tokenWrapValClass = mkTracingToken "WrapVal" +-tokenWrapValFun :: TokenId ++tokenWrapValFun, utokenWrapValFun :: TokenId + tokenWrapValFun = mkTracingToken "wrapVal" ++utokenWrapValFun = mkUnqualTracingToken "wrapVal" + + tokenUWrapForward :: TokenId + tokenUWrapForward = mkTracingToken "uwrapForward" --- hat-2.05+rerolled.orig/debian/patches/11_fail-on-error.dpatch +++ hat-2.05+rerolled/debian/patches/11_fail-on-error.dpatch @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_fail-on-error.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make sure the scripts fail on error. + +@DPATCH@ +diff -urNad hat-2.04~/configure hat-2.04/configure +--- hat-2.04~/configure 2006-07-21 10:39:04.000000000 +0200 ++++ hat-2.04/configure 2006-07-21 10:39:05.000000000 +0200 +@@ -6,6 +6,7 @@ + # (configure - Oct 1999) + # (hat-configure - June 2002) + # (configure - March 2003) ++set -e + + # When incrementing this version number, don't forget to change the + # corresponding definition in the Makefile! +diff -urNad hat-2.04~/script/confhat hat-2.04/script/confhat +--- hat-2.04~/script/confhat 2006-07-21 10:39:04.000000000 +0200 ++++ hat-2.04/script/confhat 2006-07-21 10:39:05.000000000 +0200 +@@ -1,6 +1,7 @@ + #!/bin/sh + # confhat -- install the Hat system for ghc or nhc98 + # author: Malcolm.Wallace@cs.york.ac.uk, Mar 2002 ++set -e + + MACHINE=${MACHINE-`script/harch`} + PWD=`pwd` +diff -urNad hat-2.04~/script/confhc-hat hat-2.04/script/confhc-hat +--- hat-2.04~/script/confhc-hat 2006-07-21 10:39:04.000000000 +0200 ++++ hat-2.04/script/confhc-hat 2006-07-21 10:39:05.000000000 +0200 +@@ -5,6 +5,7 @@ + # removed support for nhc13, Nov 2001 + # simplified for hmake3, Jan 2002 + # modified for hat, June 2002 ++set -e + + MACHINE=${MACHINE-`script/harch`} + PWD=`pwd` +diff -urNad hat-2.04~/script/fixghc hat-2.04/script/fixghc +--- hat-2.04~/script/fixghc 2003-06-03 15:15:12.000000000 +0200 ++++ hat-2.04/script/fixghc 2006-07-21 10:41:10.000000000 +0200 +@@ -1,6 +1,7 @@ + #!/bin/sh + # fixghc: a small script to patch up the -syslib changes between + # versions 4.04, 4.06, 4.08, and 5.xx of ghc. ++set -e + + case $# in + 0) exit 1;; +diff -urNad hat-2.04~/script/harch hat-2.04/script/harch +--- hat-2.04~/script/harch 2005-03-14 17:30:33.000000000 +0100 ++++ hat-2.04/script/harch 2006-07-21 10:42:20.000000000 +0200 +@@ -3,6 +3,7 @@ + # Nov 1998: first used. + # May 1999: ensure that small differences (e.g. kernel version) + # don't matter. ++set -e + + PROCESSOR= + OS= +diff -urNad hat-2.04~/script/hat-graph.inst hat-2.04/script/hat-graph.inst +--- hat-2.04~/script/hat-graph.inst 2004-09-22 14:33:07.000000000 +0200 ++++ hat-2.04/script/hat-graph.inst 2006-07-21 10:42:01.000000000 +0200 +@@ -2,6 +2,8 @@ + # + # generate postScript diagram of Hat graph from .hat file + # output is either multi-page A4 (with -a4 option) or single-page ++set -e ++ + FILES= + PAGE= + while [ "$1" != "" ] +diff -urNad hat-2.04~/script/hat-template.inst hat-2.04/script/hat-template.inst +--- hat-2.04~/script/hat-template.inst 2002-07-25 10:55:07.000000000 +0200 ++++ hat-2.04/script/hat-template.inst 2006-07-21 10:41:29.000000000 +0200 +@@ -1,5 +1,7 @@ + #!/bin/sh + # simple redirection script to find the correct executable + # for this machine architecture ++set -e ++ + MACHINE=${MACHINE-"`ScriptDir/harch`"} + exec ExecutableDir/$MACHINE/`basename $0` "$@" +diff -urNad hat-2.04~/script/pkgdirlist hat-2.04/script/pkgdirlist +--- hat-2.04~/script/pkgdirlist 2005-03-14 17:30:33.000000000 +0100 ++++ hat-2.04/script/pkgdirlist 2006-07-21 10:42:50.000000000 +0200 +@@ -1,4 +1,6 @@ + #!/bin/sh ++set -e ++ + case $1 in + arrows) + echo Control Control/Arrow Control/Arrow/Transformer Data --- hat-2.05+rerolled.orig/debian/patches/25_no-gcc-optimisation.dpatch +++ hat-2.05+rerolled/debian/patches/25_no-gcc-optimisation.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 28_no-gcc-optimisation.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Call gcc with -O0 when Hat/PreludeBasic.hs gets compiled +## DP: otherwise cc1 will consume an awful lot of memory. This should +## DP: fix the FTBFS on m86k, mipsel, powerpc and s390. + +@DPATCH@ +diff -urNad hat~/src/hatlib/Makefile hat/src/hatlib/Makefile +--- hat~/src/hatlib/Makefile 2008-02-16 23:53:36.000000000 +0100 ++++ hat/src/hatlib/Makefile 2008-02-17 00:01:51.000000000 +0100 +@@ -151,7 +151,7 @@ + + $(TRANSOBJS): $(OBJDIR)/Hat/%.o: %.hs + $(LOCAL)hat-trans -P. -I. -trusted -prelude $(CPPFLAGS) $< +- $(HC) $(HFLAGS) -c -o $@ Hat/$< ++ $(HC) $(HFLAGS) $($(strip $(subst /,_,$(patsubst %.hs, %_hcflags, $<)))) -c -o $@ Hat/$< + mv $(patsubst %.hs, Hat/%.hi, $<) $(patsubst %.hs, ${OBJDIR}/Hat/%.hi, $<) + + $(FIDDLEOBJS): $(OBJDIR)/Hat/%.o: %.hs +@@ -177,7 +177,7 @@ + # Here are the extra dependencies. + $(OBJDIR)/Hat/PreludeBuiltinTypes.o: $(OBJDIR)/Hat/Hat.o + $(OBJDIR)/Hat/PreludeBuiltin.o: $(OBJDIR)/Hat/PreludeBuiltinTypes.o +-$(OBJDIR)/Hat/PreludeBasic.o: $(OBJDIR)/Hat/PreludeBuiltin.o ++$(OBJDIR)/Hat/PreludeBasic.o: PreludeBasic.hs $(OBJDIR)/Hat/PreludeBuiltin.o + $(OBJDIR)/Hat/Prelude.o: $(OBJDIR)/Hat/PreludeBasic.o + $(OBJDIR)/Hat/Char.o: $(OBJDIR)/Hat/PreludeBasic.o + $(OBJDIR)/Hat/IOBuiltin.o: $(OBJDIR)/Hat/Hat.o $(OBJDIR)/Hat/IOBuiltinTypes.o \ --- hat-2.05+rerolled.orig/debian/patches/12_include-stdlib.dpatch +++ hat-2.05+rerolled/debian/patches/12_include-stdlib.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_include-stdlib.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add "#include " to C files using malloc so they know +## DP: what it's meant to return. + +@DPATCH@ +diff -urNad hat~/src/hattools/hat-check.c hat/src/hattools/hat-check.c +--- hat~/src/hattools/hat-check.c 2006-07-21 16:58:07.000000000 +0200 ++++ hat/src/hattools/hat-check.c 2006-07-21 16:59:59.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -urNad hat~/src/hattools/hat-names.c hat/src/hattools/hat-names.c +--- hat~/src/hattools/hat-names.c 2006-07-21 16:58:17.000000000 +0200 ++++ hat/src/hattools/hat-names.c 2006-07-21 16:59:59.000000000 +0200 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + #include + #include --- hat-2.05+rerolled.orig/debian/patches/22_configure-incx-flag.dpatch +++ hat-2.05+rerolled/debian/patches/22_configure-incx-flag.dpatch @@ -0,0 +1,106 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 21_hat.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad hat~/configure hat/configure +--- hat~/configure 2006-10-24 21:32:15.000000000 +0200 ++++ hat/configure 2006-10-24 21:39:38.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/sh + # hat-configure -- prepare to compile/install hat + # author: Malcolm.Wallace@cs.york.ac.uk + # (nhc13config - March 1998) +@@ -73,6 +73,7 @@ + LIB=yes + BIN=yes + INC=yes ++INCX=yes + MAN=yes + DOCS=no + +@@ -95,6 +96,8 @@ + -bin) BIN=no ;; + +inc) INC=yes ;; + -inc) INC=no ;; ++ +incx) INCX=yes ;; ++ -incx) INCX=no ;; + +man) MAN=yes ;; + -man) MAN=no ;; + +docs) DOCS=yes ;; +@@ -135,7 +138,8 @@ + echo + echo " [+/-]bin Do/don't (re-)install scripts [+bin]" + echo " [+/-]lib Do/don't (re-)install executables [+lib]" +- echo " [+/-]inc Do/don't (re-)install interface files [+inc]" ++ echo " [+/-]inc Do/don't (re-)install ghc/nhc98 interface files [+inc]" ++ echo " [+/-]incx Do/don't (re-)install Hat interface files [+incx]" + echo " [+/-]man Do/don't (re-)install man pages [+man]" + echo " [+/-]docs Do/don't (re-)install html docs [-docs]" + exit 0 ;; +@@ -197,15 +201,21 @@ + echo "Final install root: $INSTALLDIR" + if [ "$LIB" = "yes" ] + then +- echo "Hat binaries: $LIBDIR/$MACHINE" ++ echo "Hat binaries: $LIBDIR/$MACHINE" + else + echo "Executables and libs: (none)" + fi + if [ "$INC" = "yes" ] + then +- echo "Hat interfaces: $INCDIR" ++ echo "ghc/nhc98 interface files : $INCDIR" + else +- echo "Interfaces/includes: (none)" ++ echo "ghc/nhc98 interface files : (none)" ++ fi ++ if [ "$INCX" = "yes" ] ++ then ++ echo "Hat interface files (.hx): $INCDIR" ++ else ++ echo "Hat interface files (.hx): (none)" + fi + if [ "$BIN" = "yes" ] + then +@@ -374,7 +384,7 @@ + echo "Install directory root is:" + echo " $DESTDIR$INSTALLDIR" + +- if [ "$INC" = "yes" ] ++ if [ "$INCX" = "yes" ] + then + echo "Hat interface files (.hx) go into:" + echo -n " $DESTDIR$INCDIR" +@@ -411,6 +421,11 @@ + fi + done + done ++ else ++ echo 'Not (re-)installing Hat interface files (.hx)' ++ fi ++ if [ "$INC" = "yes" ] ++ then + case $BUILDWITH in + ghc*) echo "Installing hat as a ghc package:" ;; + nhc*) echo "Installing hat as an nhc98 package:" ;; +@@ -418,7 +433,7 @@ + script/confhat $BUILDWITH $INSTALLDIR + echo + else +- echo 'Not (re-)installing interface and include files' ++ echo 'Not (re-)installing ghc/nhc98 interface files' + fi + + if [ "$BIN" = "yes" ] +@@ -523,6 +538,7 @@ + echo "LIB=$LIB" ; + echo "BIN=$BIN" ; + echo "INC=$INC" ; ++ echo "INCX=$INCX" ; + echo "MAN=$MAN" ; + echo "DOCS=$DOCS" ; + echo "EXE=$EXE" ; --- hat-2.05+rerolled.orig/debian/patches/14_fix-manpage.dpatch +++ hat-2.05+rerolled/debian/patches/14_fix-manpage.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 26_fix-manpage.dpatch by Arjan Oosting +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix 'a newline character is not allowed in an escape name' + +@DPATCH@ +diff -urNad hat~/man/hat-cover.1 hat/man/hat-cover.1 +--- hat~/man/hat-cover.1 2008-02-17 02:01:43.000000000 +0100 ++++ hat/man/hat-cover.1 2008-02-17 02:02:29.000000000 +0100 +@@ -11,10 +11,10 @@ + in the \fBhat\fR \fITRACEFILE\fR. + .PP + The \fITRACEFILE\fR may be specifed with or without a +-.C .hat ++.B .hat + extension; similarly each \fISOURCEFILE\fR may be specified with or + without a +-.C .hs ++.B .hs + extension. + If no \fISOURCEFILE\fR is specified + .B hat-cover +diff -urNad hat~/man/hat-delta.1.in hat/man/hat-delta.1.in +--- hat~/man/hat-delta.1.in 2008-02-17 01:00:46.000000000 +0100 ++++ hat/man/hat-delta.1.in 2008-02-17 02:02:21.000000000 +0100 +@@ -101,7 +101,7 @@ + + .TP + .B :set +-Set an option in the form `:set option value`. Options are:\n\ ++Set an option in the form `:set option value`. Options are: + + + .B depthLimit --- hat-2.05+rerolled.orig/debian/changelog +++ hat-2.05+rerolled/debian/changelog @@ -0,0 +1,420 @@ +hat (2.05+rerolled-7ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #254642): + - debian/rules: + + Unexport default LDFLAGS as ghc6 doesn't understand them. + + -- Nathan Handler Mon, 04 Aug 2008 07:55:19 -0500 + +hat (2.05+rerolled-7) unstable; urgency=low + + * debian/rules: + - Also add s390 to the list architectures where hat should be + build without optimisation + + -- Arjan Oosting Tue, 22 Jul 2008 23:34:43 +0200 + +hat (2.05+rerolled-6) unstable; urgency=low + + * debian/control: + - Bump Standards-Version to 3.8.0. Added debian/README.source to + comply with new policy + * debian/patches: + - Added descriptions to most patches to fix lintian warning + dpatch-missing-description + * debian/rules: + - Add mipsel and powerpc to the list of architectures where + we build hat without any optimisation to keep the buildd + from thrashing. + + -- Arjan Oosting Tue, 22 Jul 2008 21:58:08 +0200 + +hat (2.05+rerolled-5ubuntu1) hardy; urgency=low + + * debian/rules: + + Unexport default LDFLAGS as ghc6 doesn't understand them. + * debian/control: + + Modify Maintainer value to match DebianMaintainerField spec. + + -- Michael Bienia Tue, 19 Feb 2008 11:55:47 +0100 + +hat (2.05+rerolled-5) unstable; urgency=high + + * Set urgency to high as this upload fixes an RC bug. + * Update for GHC 6.8.2 (Closes: #462439): + - debian/control: + + Bump build dependency on hmake to >= 3.13 which will work with + GHC 6.8.2 + + Add libghc6-parsec-dev and libghc6-parsec-prof to the build + dependencies + - debian/patches/15_add-missing-packages.dpatch: Added. The base + package has been split into several packages, so adjust the build + system for that. + * debian/control: + - Replace the build dependency on libglib1.2-dev with libglib2.0-dev. + - Replace Xs-Vcs-* fields with the now official Vcs-* fields. + - Add a Homepage field. + - Adjust the section of libghc6-hat-dev to libdevel to make lintian + happy (dev-package-should-be-section-libdevel) + - Bump Standards-Version to 3.6.3. No changes needed. + * debian/copyright: + - Fix lintian warning copyright-without-copyright-notice by + replacing copyright with Copyright and (c) with ©. + * debian/rules: + - Remove generated file src/hattools/checkglib.h on clean. + - Add '-optl -Wl,--as-needed' to the BUILDOPTS to unnecessary linkages + introduced by the build system. + * debian/patches/14_fix-manpage.dpatch: + - Updated to fix man/hat-cover.1 as well. + * debian/patches/19_glib2.0.dpatch: + - Added. Build against glib-2.0 instead of glib-1.2. + * debian/patches/20_install-all-interface-files: + - Added. Fixes the hat/script/pkgdirlist script to return all + directories containing .hx files, so all .hx will be installed. + + -- Arjan Oosting Sun, 17 Feb 2008 04:53:19 +0100 + +hat (2.05+rerolled-4) unstable; urgency=low + + * debian/control: + - Drop the dummy hat-ghc6 package. + * debian/patches/18_no-strip.dpatch: Added. Do not strip + hat-trans. (Closes: #437174) + + -- Arjan Oosting Sun, 12 Aug 2007 17:51:13 +0200 + +hat (2.05+rerolled-3) unstable; urgency=low + + * debian/control: + - Adjust Xs-Vcs-* fields as the package has moved to the pkg-haskell + repository on svn.debian.org. + - Add libgch6-mtl-prof to the Build-Depends. + * debian/{mk-haskell-depends,rules}: + - Small cleanups. + * debian/patches/17_fix-ghcsym-detection.dpatch: Added to fix the + detection of the GHC version number. + + -- Arjan Oosting Mon, 28 May 2007 20:39:51 +0200 + +hat (2.05+rerolled-2) unstable; urgency=low + + * debian/compat: Bump debhelper compatibility level to 5. + * debian/control: + - Add Xs-Vcs-Browser field. + - Bump versioned dependency on debhelper. + * debian/rules: enclose paths in double quotes because directories can + contain spaces. + + -- Arjan Oosting Fri, 13 Apr 2007 18:35:33 +0200 + +hat (2.05+rerolled-1) unstable; urgency=high + + * (Not so) New upstream release. Upstream has rerolled the 2.05 tarball + as it was missing some fixes needed to compile against GHC 6.6: + - Drop debian/patches/15_include-version-in-package-name.dpatch as + it is fixed upstream. + - Upstream replaced "typedef unsigned long FileOffset" with "typedef + uint32_t FileOffset" which should fix issues on 64 bit + architectures. (Closes: #403841) + * debian/control: Add xterm as a Depends as hat needs the resize command + provided by xterm. (Closes: #403836) + * debian/patches/16_fix-buildflags.dpatch: Drop the profiling flags so + the tools are build without profiling enabled. (Closes: #403840) + + -- Arjan Oosting Thu, 21 Dec 2006 22:49:04 +0100 + +hat (2.05-7) unstable; urgency=low + + * debian/rules: don't do any optimisation on arm and m86k. This will be + my last try to get this bastard compiled on all arches. + + -- Arjan Oosting Sat, 25 Nov 2006 21:16:47 +0100 + +hat (2.05-6) unstable; urgency=low + + * debian/mk-haskell-depends: update script to take installed package + configuration files as arguments. + * debian/patches/25_no-gcc-optimisation.dpatch: + - Modified to use per file enviroment variables for ghc when compiling + hatlib. + * debian/rules: + - Use the per file environment variables to compile PreludeBasic.hs + without any optimisation on arm and m68k which should fix the FTBFS + on those architectures. + + -- Arjan Oosting Mon, 20 Nov 2006 22:58:02 +0100 + +hat (2.05-5) unstable; urgency=medium + + * Set urgency to medium so we might get this into etch after all. + * debian/rules: + - Drop support for multiple Haskell compilers as we only build against + ghc6 anyway. + - Build hat with optimisation (-O2) and disable deprecation warnings. + * debian/patches: reorder patches. + * debian/patches/16_fix-buildflags.dpatch: + - Fix the way the BUILDFLAGS are inserted when building the hattools. + * debian/patches/25_no-gcc-optimisation.dpatch: + - Call gcc with -O0 when Hat/PreludeBasic.hs gets compiled otherwise + cc1 will consume an awfull lot of memory. This should fix the FTBFS + on m86k, mipsel, powerpc and s390. + + -- Arjan Oosting Wed, 8 Nov 2006 15:37:30 +0100 + +hat (2.05-4) unstable; urgency=low + + * debian/control: add missing ${shlibs:Depends} (Closes: #397095) + + -- Arjan Oosting Sun, 5 Nov 2006 15:47:04 +0100 + +hat (2.05-3) unstable; urgency=low + + * debian/patches/27_include-version-in-package-name: + Change the -package-name hat to -package-name hat-$(HATVERSION) during + compilation to make sure the hi-files have the correct module + name. (Thanks Magnus Therning) + + -- Arjan Oosting Sat, 28 Oct 2006 20:23:53 +0200 + +hat (2.05-2) unstable; urgency=low + + * debian/control: add missing build dependency on ghc6-prof. + + -- Arjan Oosting Fri, 27 Oct 2006 02:53:45 +0000 + +hat (2.05-1) unstable; urgency=low + + * New upstream release. + * Update debian/copyright with the info from COPYRIGHT. + * debian/control: update maintainer email adres. + * debian/patches: dropped 01_patbind.dpatch, 02_cabal.dpatch, + 03_dirs.dpatch, 04_config.dpatch and 05_hat-anim-man-page.dpatch as + they are applied upstream. + * debian/patches/26_fix-for-ghc-6.6.dpatch: removed. Fixed upstream. + * debian/patches/26_fix-manpage.dpatch: fix 'a newline character is + not allowed in an escape name' + + -- Arjan Oosting Tue, 24 Oct 2006 22:48:22 +0200 + +hat (2.04-2) unstable; urgency=medium + + * Set urgency to medium as this upload fixes a couple of RC bugs which are + open for a long time. + * Stop using update-haskell-control and $ghc6_* variables, as it is not + necessary and not using it simplifies the work for porters and for me. + * debian/patches/25_byteorder.dpatch: correct location of byteorder.h + which should fix FTBFS on sparc. (Thanks Stefan Potyra) + * debian/control.in: + - Remove Ian Lynagh from Uploaders on his request. + - Add XS-Vcs-Svn field pointing to subversion archive which contains + this package. + - Add dctrl-tools to Build-Depends as it is needed by + debian/mk-haskell-depends. + - Add libghc6-mtl-dev to Build-Depends. + - Replace ${ghc:Depends} with ${haskell:Depends}. + * debian/patches/26_fix-for-ghc-6.6.dpatch: + - Fix build system to recognize GHC version higher than 6.4.* + - Use -fallow-undecidable-instances to compile the library. + * debian/rules: + - Replace debian/mk-ghc6-vars with debian/mk-haskell-depends script + which determines all dependencies by using the installed package + description file used by ghc-pkg. + + -- Arjan Oosting Mon, 23 Oct 2006 14:54:52 +0200 + +hat (2.04-1) unstable; urgency=low + + * New upstream release. + - New tools are added and resurrected. These are hat-detect, hat-anim, + hat-explore, hat-cover and hat-nonterm + - We have included more libraries from the hierarchical base package + as standard, so more programs should be immediately traceable. + - Works fully with ghc-6.2 and ghc-6.4. + * Change of maintainer. Set myself as maintainer and move Ian to the + co-maintainers list. Ian, thanks for your work on this package. + * Start using dpatch to make inclusion of new (upstream) patches easier. + - Dropped the patches to src/hatlib/Hat/Foreign/BuiltinTypes.hs, + src/hatlib/Foreign/BuiltinTypes.hx, src/hatlib/Makefile and the + special src/hatlib/Foreign/Foreign.hs handling which is no longer + neccessary with the new upstream release. + - Dropped obsolete patches to script/{confhc-hat,fixghc,hat-graph}, + src/hattools/{Makefile,Ident.hs,LowLevel.hs,Observe.hs,Run.hs} and + src/hatlib/Hat/Hat.hs + * Rename hat-ghc6 to libghc6-hat-dev, following the standard ghc6 + library names, and add a transitional dummy package. + * debian/control.in: + - add homepage field to the long descriptions. + - add ppc64 to the list of supported architectures. + - loosen build dependency on ghc6 and replace `fixed' Depends on ghc6 + with an at build time generated dependency. + - remove hat-nhc98 and the Build-Depends and the Suggest on nhc98 and + nhc98 because nhc98 is removed from the archive. (Closes: #334156) + - remove hat-ghc5 and the Build-Depends on ghc5 because ghc5 will be + removed from the archive as well and can not be installed for quite + some time now. + - replace ${Source-Version} with ${binary:Version} and add dpkg-dev + (>= 1.13.19) to Build-Depends. + - bump Standards-Version to 3.7.2. No changes needed. + * debian/control: update Depends for hat-ghc6 by running + update-haskell-control. (Closes: #310009) + * debian/rules: + - remove src/hattools/for_foreign_imports.h on clean to keep the + diff.gz small and tidy. + - remove not used debhelper calls. + * debian/watch: added uscan watch file. + + -- Arjan Oosting Fri, 21 Jul 2006 20:57:16 +0200 + +hat (2.02-12) unstable; urgency=low + + * Update debian/control from debian/control.in with the nhc98 arches from + nhc98 1.16-15. + + -- Ian Lynagh (wibble) Wed, 30 Mar 2005 09:20:38 +0000 + +hat (2.02-11) unstable; urgency=low + + * Update Isaac's e-mail address. + * Use variables for build-deps and deps using update-haskell-control. + * No longer generate "ghc6-version-min=6.2.2"-style substvars when + building. + * Build-deps updated for ghc6 6.2.2. Closes: #248980. + * Build-dep on haskell-utils (>= 1.5) and use + "update-haskell-control --check" before building. + + -- Ian Lynagh (wibble) Wed, 03 Nov 2004 15:07:42 +0000 + +hat (2.02-10) unstable; urgency=low + + * Bump the ghc6 (build-)dependency to 6.2.1. + * Add m68k to the list of ghc6 arches. + + -- Ian Lynagh (wibble) Sat, 03 Apr 2004 17:37:58 +0000 + +hat (2.02-9) unstable; urgency=low + + * Put the right file locations in manpage. Closes: #232609. + * Fix from upstream to fill in gaps in + src/hatlib/Hat/Foreign/BuiltinTypes.hs + * Don't patch src/hatlib/Hat/Foreign/ForeignPtr.hs as it is generated + anyway. + + -- Ian Lynagh (wibble) Sun, 07 Mar 2004 19:26:39 +0000 + +hat (2.02-8) unstable; urgency=low + + * Add "#include " to C files using malloc so they know what + it's meant to return. + + -- Ian Lynagh (wibble) Fri, 09 Jan 2004 00:45:41 +0000 + +hat (2.02-7) unstable; urgency=low + + * Make a header file for the foreign imports and change them to use it. + Closes: #226672. + + -- Ian Lynagh (wibble) Thu, 08 Jan 2004 01:31:02 +0000 + +hat (2.02-6) unstable; urgency=low + + * Handle unsafeForeignPtrToPtr as well as foreignPtrToPtr for GHC 6.2. + * Swap argument order for newForeignPtr and addForeignPtrFinalizer + with ghc6. + * Update ghc6 build dep to >= 6.2. Closes: #224762. + * Use "/usr/bin/ghc6 --print-libdir" rather than looking to see what + exists when adding and removing the hat package. + + -- Ian Lynagh (wibble) Sun, 28 Dec 2003 20:07:25 +0000 + +hat (2.02-5) unstable; urgency=low + + * Set DH_OPTIONS to -s rather than -a so the package build on arches + where not all compilers exist. + + -- Ian Lynagh (wibble) Wed, 05 Nov 2003 02:16:35 +0000 + +hat (2.02-4) unstable; urgency=low + + * Remove src/hatlib/Foreign/ForeignPtr.h{s,x} when building to ensure + it is replaced with the ghc6 version when appropriate. + + -- Ian Lynagh (wibble) Tue, 04 Nov 2003 03:35:03 +0000 + +hat (2.02-3) unstable; urgency=low + + * Remove dummy /usr/bin/ entry from compilers list. + * Alter script/confhc-hat to cope with GHC versions of the form x.y.z + as well as x.yy.z. Closes: #219024. + * Build the tools with the first compiler found in the list, and rename + the list COMPS (was ARCHES). + + -- Ian Lynagh (wibble) Mon, 03 Nov 2003 23:37:40 +0000 + +hat (2.02-2) unstable; urgency=low + + * Set me as maintainer and Isaac Jones as a co-maintainer. + * Put 4 in debian/compat and depend on >= 4 accordingly. + * Remade debian/rules from a debhelper example to bring it back + up-to-date given it needed lots of rewriting anyway to support + multiple compilers nicely. + * Also altered debian/control, the postinsts etc as part of the above + rewrite. + * Apply the ghc6-fixing patch from nhc98 upstream. + * Various other ghc6 fixes for hat, including some hackery to keep + nhc98 working. + + -- Ian Lynagh (wibble) Tue, 21 Oct 2003 20:59:18 +0000 + +hat (2.02-1) unstable; urgency=low + + * New upstream release. + * Remove manpage for hat-detect, which is no longer distributed by + upstream. (Closes:#186949) + * Force interfaces to be built against current GHC 5.04.2. + + -- Brent A. Fulgham Wed, 2 Apr 2003 21:01:42 -0800 + +hat (2.00-5) unstable; urgency=low + + * Rebuild with GHC5 support, now that Michael Weber kindly upgraded! + + -- Brent A. Fulgham Mon, 4 Nov 2002 21:06:01 -0800 + +hat (2.00-4) unstable; urgency=low + + * Building without support for GHC5, due to a bug in GHC's Locale + Haskell98 compatibility layer. The fix is in GHC's CVS (and + possibly a later release). When this bug is corrected, I will + re-upload with a working version. Until then, I can't build + under GHC5. (See Bug Report #167647) + + -- Brent A. Fulgham Sun, 3 Nov 2002 18:58:25 -0800 + +hat (2.00-3) unstable; urgency=low + + * Add a 'conflicts' with nhc98 (<< 1.14-3) to support proper upgrades. + (Thanks to Andrew Suffield for that fix.) (Closes:Bug#154807) + * Add a build dependency on glib-dev. (Closes:Bug#150816) + * Correct path for binary in manpage. (Closes:Bug#150540) + * Remove extranneous java-virtual-machine dependency, and have package + depend on either GHC (>= 5.04) or NHC98. (Closes:Bug#151770) + + -- Brent A. Fulgham Sat, 2 Nov 2002 22:22:09 -0800 + +hat (2.00-2) unstable; urgency=low + + * Correct build problem in _hmake_ that prevented the Haskell include + files from being incorporated into the package. (Closes:Bug#152747). + * Correct 'clean' in build package. (Closes:Bug#152741) + * Add depends on ghc so this flavor is also built. + * Include a tarball of the GHC output. I don't know the best way to automate + this, so for now all of you GHC users will need to install manually. + + -- Brent A. Fulgham Sat, 20 Jul 2002 00:21:27 -0700 + +hat (2.00-1) unstable; urgency=low + + * Initial package + + -- Brent A. Fulgham Fri, 21 Jun 2002 21:55:24 -0700 + --- hat-2.05+rerolled.orig/debian/README.source +++ hat-2.05+rerolled/debian/README.source @@ -0,0 +1,11 @@ +The used patch system is dpatch. + +To patch the source run "debian/rules patch" + +To add a new patch: +* put it under debian/patches +* add it to debian/patches/00list + +To unpatch the source run "debian/rules unpatch" + +See /usr/share/doc/dpatch for more information. --- hat-2.05+rerolled.orig/debian/copyright +++ hat-2.05+rerolled/debian/copyright @@ -0,0 +1,135 @@ +Hat-trans is partly based on the source code of the nhc98 Haskell +compiler, whose copyright and licensing terms are noted here: + http://haskell.org/nhc98 + +The Hat system as a whole was developed (mainly) at, and is copyright to + © The University of York, 1996-2005. + +Additionally, + +hat-trans is + © Copyright to Olaf Chitil and Malcolm Wallace, 2002-2004. +hat-observe is + © Copyright to Malcolm Wallace and Thorsten Brehm, 2001-2004. +hat-detect is + © Copyright to Malcolm Wallace and Thorsten Brehm, 2001-2004. +hat-trail is + © Copyright to Malcolm Wallace, 2002-2004. +hat-stack is + © Copyright to Malcolm Wallace, 2001-2004. +hat-check is + © Copyright to Colin Runciman, 2001-2004. +hat-cover is + © Copyright to Colin Runciman, 2004. +hat-explore is + © Copyright to Olaf Chitil, 2004-2005. +hat-anim is + © Copyright to Thomas Davie, 2004-2005. +hat-nonterm is + © Copyright to Mike Dodds, 2004. +black-hat is + © Copyright to Mike Dodds, 2004. + +The Hat tools are distributed under the terms of the licence +detailed below. If you link the Hat tools with the gtk+ library +'glib', you should know that 'glib' is governed by the LGPL. + +Some code from the libraries is copied directly from the +Haskell hierarchical libraries base package, which is + © Copyright the University of Glasgow, 2001-2004 +and was originally distributed under a separate BSD-style licence. + +LICENCE +------- +Definition: "this software" = any software which is distributed under + the conditions of this licence. + "small number of modules" = less than 10% of any one program + +It is the intention that this software be "freely available" in the Gnu +(http://www.gnu.org/) and Open Source (http://www.opensource.org/) +traditions. The following is a brief statement of the rights and +restrictions attached to this software distribution. This is version +2 of the licence, and governs this copy of the software. We may +publish modified terms and conditions at a later date, and if you +wish, you may apply any successor licence (when published), or the +GNU GPL, to this software as an alternative to the current terms. +(Note that if you convert your copy of the licence to the GPL, you +will not be able to convert it back later, and nor can anyone who +receives a copy from you.) + +If you are not sure about any of the terms of this licence, please +contact us to discuss your requirements. (Primary contact: +Malcolm.Wallace@cs.york.ac.uk) + +You may use, re-distribute, and modify this software, in whole or +in part, in source or binary form, but you must include without +alteration all the relevant copyright notices. (You may of course +remove a copyright notice pertaining to a piece of software no longer +included in your distribution.) You may add your own additional +copyright notices for any modifications or additions to this software +that you distribute. If you distribute a modified version, you must +also provide corresponding source code for it; any modifications must +be described in the documentation; and you must clearly indicate that +the software has been modified, for instance by changing the name of +the executable or its version number, or by some other method. + +You must not restrict anyone else's rights to use, re-distribute +or modify this software. Distributions of standard or modified +versions of any part of this software must retain this licence (or +its successor), or at your choice, be distributed instead under the +GNU GPL. + +In addition, you are explicitly granted the right to re-use a small +number of modules of this software in the creation of a new program +which does not perform substantially the same task as this software, +for instance, by re-using a parser but not the entire compiler. +In such a case, you are not forced to place the new software under +this or any other licence, but you must ensure that: + . you clearly acknowledge which code you have re-used from this software, + . you retain the relevant copyright notices, and + . if you distribute the new software, you indicate to recipients where + they can freely obtain a standard copy of this original software. + +Object files, intermediate files, and trace files, produced as output by +this software, do not fall under this copyright statement and are not +governed by the terms of this licence. You are free to use them (or +restrict their use) as you like. However, the inclusion of Hat's +runtime system (libHSHat.a) in a resulting executable, means that you +may not distribute that executable except under the terms of this +licence. (We can't see any reason why anyone would want to distribute a +traced version of their program anyway - but if this is a problem for +you, contact us. Also, you should check carefully the licence of any +other library you use in your traced program, whether supplied together +with this software or not.) + + +UNLESS OTHERWISE STATED IN WRITING, THIS SOFTWARE IS SUPPLIED "AS IS" +AND WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED, INCLUDING WITHOUT +LIMITATION THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A +PARTICULAR PURPOSE. NEITHER THE AUTHORS, COPYRIGHT HOLDERS, NOR ANY +OTHER PARTY WHO REDISTRIBUTES THIS SOFTWARE SHALL BE LIABLE FOR DAMAGES, +HOWSOEVER CAUSED, ARISING OUT OF THE USE OF THIS SOFTWARE. USE AT YOUR +OWN RISK. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +Debian packaging copyright: + © 2002 - 2003 Brent A. Fulgham + © 2003 - 2005 Ian Lynagh (wibble) + © 2006 - 2008 Arjan Oosting + + The changes in the Debian packaging made by Arjan Oosting can be + redistributed and/or modified under the same terms as hat itself. + + The script debian/mk-haskell-depends is dual-licensed under: + 1) The terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + 2) 3-clause BSD license + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +On Debian systems, the complete text of the 3-clause BSD License +can be found in `/usr/share/common-licenses/BSD'. --- hat-2.05+rerolled.orig/debian/control +++ hat-2.05+rerolled/debian/control @@ -0,0 +1,44 @@ +Source: hat +Section: devel +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Arjan Oosting +Uploaders: Isaac Jones +Standards-Version: 3.8.0 +Build-Depends: dctrl-tools, debhelper (>= 5), dpatch, + dpkg-dev (>= 1.13.19), libncurses5-dev, libglib2.0-dev, + hmake (>= 3.13), ghc6, ghc6-prof, sharutils, libghc6-mtl-dev, + libghc6-mtl-prof, libghc6-parsec-dev, libghc6-parsec-prof +Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/hat/trunk +Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk +Homepage: http://www.haskell.org/hat/ + +Package: hat +Architecture: any +Depends: libghc6-hat-dev (= ${binary:Version}), xterm, ${shlibs:Depends} +Recommends: hmake +Conflicts: nhc98 (<< 1.14-3) +Description: Haskell source-level tracer + This package contains a source-level tracer for analyzing the + behavior (and searching for bugs) in your Haskell programs. + . + Hat actually consists of several utilities that are used to + perform the actual analysis. See the package documentation for + usage details. + . + You will also need a package containing the library compiled for at + least one Haskell compiler for this to be useful. + +Package: libghc6-hat-dev +Section: libdevel +Architecture: any +Depends: ${haskell:Depends}, ${shlibs:Depends} +Recommends: hat (= ${binary:Version}) +Suggests: hmake +Provides: hat-ghc6 +Replaces: hat-ghc6 (<< 2.04-1) +Conflicts: nhc98 (<< 1.14-3), hat ( << 2.04-1) +Description: Haskell source-level tracer library for ghc6 + This package contains the HAT library compiled for ghc6. + You need it if you want to use HAT, a Haskell source-level tracer, + with ghc6.