[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.1+dfsg1-1.dsc
Kari Pahula
kaol at debian.org
Sat Jan 15 06:05:52 UTC 2011
Mon Jan 19 10:03:16 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.1+dfsg1-1.dsc
M ./changelog +28
M ./control -4 +5
M ./copyright -2 +26
M ./ghc6-doc.doc-base.users-guide -1 +1
M ./ghc6-doc.postinst.in -3 +5
A ./ghc6-doc.triggers
A ./patches/
A ./patches/gen_contents_index-trac2764
A ./patches/readline-not-editline
A ./patches/series
A ./patches/system-libffi
A ./patches/tuple3-trac2750
M ./rules -16 +29
Mon Jan 19 10:03:16 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.1+dfsg1-1.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2011-01-15 06:05:51.775503097 +0000
+++ new-ghc/changelog 2011-01-15 06:05:52.055517848 +0000
@@ -1,3 +1,31 @@
+ghc6 (6.10.1+dfsg1-1) experimental; urgency=low
+
+ * New upstream release (Closes: #495126)
+ * Change the calling conventions for unboxed tuples slightly.
+ (Closes: #365497)
+ * Better documentation for swapMVar. (Closes: #405717)
+ * Don't change code in error messages. (Closes: #499137)
+ * Improve error reporting for 'deriving' (Closes: #499216)
+ * Better error message when -XRankNTypes is missing. (Closes: #499217)
+ * ghc-pkg respects --global with 'field' option. (Closes: #510499)
+ * Repackaged to remove a copy of GNU MP library.
+ * Enable building the stage2 compiler on all architectures.
+ * Added information about libffi (which is included with GHC) to
+ debian/copyright.
+ * Manage changes to the source with quilt.
+ * Link against the system's libffi and add libffi-dev as a build
+ dependency.
+ * Build-dep on haddock >= 2.4.1-1.
+ * Build-dep on libedit-dev, removed build-dep on libreadline-dev.
+ * Patched gen_contents_index: fixed the case when not run inplace; trac
+ #2764
+ * Patched libraries/base/Data/Data.hs: use Prelude.(,,) for
+ tuple3DataType; trac #2750
+ * Added a trigger to ghc6-doc for /usr/share/doc/ghc6-doc/libraries to
+ run gen_contents_index. (Closes: #506568)
+
+ -- Kari Pahula <kaol at debian.org> Mon, 19 Jan 2009 12:03:16 +0200
+
ghc6 (6.8.2dfsg1-1) unstable; urgency=medium
* Repackaged the upstream tarball to remove a copy of GNU MP library
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control 2011-01-15 06:05:51.771502887 +0000
+++ new-ghc/control 2011-01-15 06:05:52.055517848 +0000
@@ -2,8 +2,9 @@
Section: devel
Priority: optional
Maintainer: Kari Pahula <kaol at debian.org>
-Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libreadline5-dev | libreadline-dev, devscripts, haddock (>= 0.8-2), hscolour, ghc6, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml, gcc (>= 4:4.2), procps | hurd
+Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libedit-dev, devscripts, haddock (>= 2.4.1), hscolour, ghc6, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml, gcc (>= 4:4.2), procps | hurd, quilt, libffi-dev, autoconf
+Homepage: http://haskell.org/
Package: ghc6
Architecture: any
@@ -25,7 +26,7 @@
Section: devel
Architecture: any
Provides: ghc-prof, ${provided-profs}
-Depends: ghc6 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ghc6 (= ${binary:Version}), ${misc:Depends}
Description: Profiling libraries for the Glasgow Haskell Compilation system
Version 6 of the Glorious Glasgow Haskell Compilation system (GHC). GHC is
a compiler for Haskell98.
@@ -45,7 +46,7 @@
Architecture: all
Suggests: haskell-doc
Provides: ${provided-docs}
-Depends: haddock (>= 0.8-2), ${shlibs:Depends}, ${misc:Depends}
+Depends: haddock (>= 2.4.1-1), ${misc:Depends}
Description: Documentation for the Glasgow Haskell Compilation system
Version 6 of the Glorious Glasgow Haskell Compilation system (GHC). GHC is
a compiler for Haskell98.
diff -rN -u old-ghc/copyright new-ghc/copyright
--- old-ghc/copyright 2011-01-15 06:05:51.771502887 +0000
+++ new-ghc/copyright 2011-01-15 06:05:52.027516373 +0000
@@ -4,7 +4,7 @@
released into the public domain.
It was downloaded from
-http://www.haskell.org/ghc/dist/6.8.2/ghc-6.8.2-src.tar.bz2
+http://www.haskell.org/ghc/dist/
Upstream Authors: The GHC team
Simon Peyton Jones <simonpj at microsoft.com>
@@ -17,7 +17,7 @@
The Glasgow Haskell Compiler License
-Copyright 2002, The University Court of the University of Glasgow.
+Copyright 2002-2008, The University Court of the University of Glasgow.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -46,3 +46,27 @@
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.
+
+
+GHC includes libffi.
+libffi - Copyright (c) 1996-2008 Red Hat, Inc and others.
+See source files for details.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+``Software''), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -rN -u old-ghc/ghc6-doc.doc-base.users-guide new-ghc/ghc6-doc.doc-base.users-guide
--- old-ghc/ghc6-doc.doc-base.users-guide 2011-01-15 06:05:51.771502887 +0000
+++ new-ghc/ghc6-doc.doc-base.users-guide 2011-01-15 06:05:52.003515109 +0000
@@ -9,7 +9,7 @@
additional documentation can be found in the `haskell-doc' package.
Alternatively, there is an online version at
http://haskell.org/onlinereport/.
-Section: devel
+Section: Programming/Haskell
Format: HTML
Index: /usr/share/doc/ghc6-doc/index.html
diff -rN -u old-ghc/ghc6-doc.postinst.in new-ghc/ghc6-doc.postinst.in
--- old-ghc/ghc6-doc.postinst.in 2011-01-15 06:05:51.771502887 +0000
+++ new-ghc/ghc6-doc.postinst.in 2011-01-15 06:05:52.043517216 +0000
@@ -23,14 +23,16 @@
# `abort-remove' or `abort-deconfigure'.
case "$1" in
- configure|abort-upgrade|abort-remove|abort-deconfigure)
+ triggered)
cd /usr/share/doc/ghc6-doc/libraries
"$libdir"/gen_contents_index
- ;;
+ ;;
+ configure|abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 0
- ;;
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
diff -rN -u old-ghc/ghc6-doc.triggers new-ghc/ghc6-doc.triggers
--- old-ghc/ghc6-doc.triggers 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6-doc.triggers 2011-01-15 06:05:52.055517848 +0000
@@ -0,0 +1 @@
+interest /usr/share/doc/ghc6-doc/libraries
diff -rN -u old-ghc/patches/gen_contents_index-trac2764 new-ghc/patches/gen_contents_index-trac2764
--- old-ghc/patches/gen_contents_index-trac2764 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/gen_contents_index-trac2764 2011-01-15 06:05:51.999514898 +0000
@@ -0,0 +1,13 @@
+Index: ghc6-6.10.1+dfsg1/libraries/gen_contents_index
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/libraries/gen_contents_index 2009-01-18 21:25:23.000000000 +0200
++++ ghc6-6.10.1+dfsg1/libraries/gen_contents_index 2009-01-18 21:25:50.000000000 +0200
+@@ -23,7 +23,7 @@
+
+ for HADDOCK_FILE in $HADDOCK_FILES
+ do
+- NAME=` echo "$HADDOCK_FILE" | sed 's#/dist/.*##' | sed 's#.*/##' `
++ NAME=` echo "$HADDOCK_FILE" | sed 's#/dist/.*##' | sed 's#.*/##' | sed 's#\.haddock##' `
+ HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
+ NAMES="$NAMES $NAME"
+ done
diff -rN -u old-ghc/patches/readline-not-editline new-ghc/patches/readline-not-editline
--- old-ghc/patches/readline-not-editline 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/readline-not-editline 2011-01-15 06:05:52.051517638 +0000
@@ -0,0 +1,73 @@
+Index: ghc6-6.10.1+dfsg1/compiler/ghc.cabal.in
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/compiler/ghc.cabal.in 2009-01-17 09:23:33.000000000 +0200
++++ ghc6-6.10.1+dfsg1/compiler/ghc.cabal.in 2009-01-17 09:30:06.000000000 +0200
+@@ -72,7 +72,7 @@
+ Build-Depends: unix
+
+ if flag(editline)
+- Build-Depends: editline
++ Build-Depends: readline
+ CPP-Options: -DUSE_EDITLINE
+
+ GHC-Options: -Wall -fno-warn-name-shadowing -fno-warn-orphans
+Index: ghc6-6.10.1+dfsg1/compiler/ghci/InteractiveUI.hs
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/compiler/ghci/InteractiveUI.hs 2009-01-17 09:23:33.000000000 +0200
++++ ghc6-6.10.1+dfsg1/compiler/ghci/InteractiveUI.hs 2009-01-17 10:56:00.000000000 +0200
+@@ -66,7 +66,7 @@
+
+ #ifdef USE_EDITLINE
+ import Control.Concurrent ( yield ) -- Used in readline loop
+-import System.Console.Editline.Readline as Readline
++import System.Console.Readline as Readline
+ #endif
+
+ --import SystemExts
+@@ -326,10 +326,6 @@
+ when is_tty $ withReadline $ do
+ Readline.initialize
+
+- withGhcAppData
+- (\dir -> Readline.readHistory (dir </> "ghci_history"))
+- (return True)
+-
+ Readline.setAttemptedCompletionFunction (Just completeWord)
+ --Readline.parseAndBind "set show-all-if-ambiguous 1"
+
+@@ -367,9 +363,6 @@
+
+ #ifdef USE_EDITLINE
+ liftIO $ do
+- Readline.stifleHistory 100
+- withGhcAppData (\dir -> Readline.writeHistory (dir </> "ghci_history"))
+- (return True)
+ Readline.resetTerminal Nothing
+ #endif
+
+Index: ghc6-6.10.1+dfsg1/libraries/Makefile
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/libraries/Makefile 2009-01-17 09:23:33.000000000 +0200
++++ ghc6-6.10.1+dfsg1/libraries/Makefile 2009-01-17 09:35:10.000000000 +0200
+@@ -46,7 +46,7 @@
+ ifeq "$(Windows)" "YES"
+ SUBDIRS += $(wildcard Win32)
+ endif
+-SUBDIRS += directory process pretty hpc template-haskell editline Cabal random haskell98
++SUBDIRS += directory process pretty hpc template-haskell readline Cabal random haskell98
+
+ # Set GhcBootLibs=YES from the command line to work with just the libraries
+ # needed to bootstrap GHC.
+Index: ghc6-6.10.1+dfsg1/mk/config.mk.in
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/mk/config.mk.in 2009-01-17 14:08:08.000000000 +0200
++++ ghc6-6.10.1+dfsg1/mk/config.mk.in 2009-01-17 14:08:30.000000000 +0200
+@@ -890,7 +890,7 @@
+ GhcDir = $(dir $(GHC))
+
+ # Set to YES if $(GHC) has the editline package installed
+-GhcHasEditline = @GhcHasEditline@
++GhcHasEditline = YES
+
+ HBC = @HBC@
+ NHC = @NHC@
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/series 2011-01-15 06:05:52.055517848 +0000
@@ -0,0 +1,3 @@
+system-libffi
+gen_contents_index-trac2764
+tuple3-trac2750
diff -rN -u old-ghc/patches/system-libffi new-ghc/patches/system-libffi
--- old-ghc/patches/system-libffi 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/system-libffi 2011-01-15 06:05:52.019515952 +0000
@@ -0,0 +1,60 @@
+Index: ghc6-6.10.1+dfsg1/Makefile
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/Makefile 2009-01-16 12:45:48.000000000 +0200
++++ ghc6-6.10.1+dfsg1/Makefile 2009-01-16 12:45:57.000000000 +0200
+@@ -72,7 +72,7 @@
+ SUBDIRS_BUILD = includes utils driver docs compiler libraries/Cabal/doc
+ endif
+
+-SUBDIRS = gmp libffi includes utils docs rts compiler ghc driver libraries libraries/Cabal/doc
++SUBDIRS = gmp includes utils docs rts compiler ghc driver libraries libraries/Cabal/doc
+
+ check-all: check-packages
+
+@@ -102,7 +102,6 @@
+ stage1 : $(GCC_LIB_DEP) check-all
+ $(MAKE) -C libraries boot
+ $(MAKE) -C gmp all
+- $(MAKE) -C libffi all
+ $(MAKE) -C utils/mkdependC boot
+ $(MAKE) -C utils with-bootstrapping-compiler
+ @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+@@ -336,7 +335,6 @@
+ $(MAKE) -C driver binary-dist WHERE_AM_I=$(WHERE_AM_I)/driver
+ $(MAKE) -C utils binary-dist WHERE_AM_I=$(WHERE_AM_I)/utils
+ $(MAKE) -C docs binary-dist WHERE_AM_I=$(WHERE_AM_I)/docs
+- $(MAKE) -C libffi binary-dist WHERE_AM_I=$(WHERE_AM_I)/libffi
+ $(MAKE) -C libraries binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries
+ $(MAKE) -C libraries/Cabal/doc binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries/Cabal/doc
+ # Now thinks get messier. Some files we need to move around, rename or
+Index: ghc6-6.10.1+dfsg1/rts/Makefile
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/rts/Makefile 2009-01-16 12:45:48.000000000 +0200
++++ ghc6-6.10.1+dfsg1/rts/Makefile 2009-01-16 12:45:57.000000000 +0200
+@@ -361,10 +361,10 @@
+ #-----------------------------------------------------------------------------
+ # libffi stuff
+
+-SRC_CC_OPTS += -I../libffi/build/include
+-SRC_HC_OPTS += -I../libffi/build/include
+-SRC_HSC2HS_OPTS += -I../libffi/build/include
+-SRC_LD_OPTS += -L../libffi/build/include
++SRC_CC_OPTS += $(shell pkg-config --cflags libffi)
++SRC_HC_OPTS += $(shell pkg-config --cflags libffi)
++SRC_HSC2HS_OPTS += $(shell pkg-config --cflags libffi)
++SRC_LD_OPTS += $(shell pkg-config --libs libffi)
+
+ #-----------------------------------------------------------------------------
+ #
+Index: ghc6-6.10.1+dfsg1/compiler/ghc.cabal.in
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/compiler/ghc.cabal.in 2009-01-16 16:04:47.000000000 +0200
++++ ghc6-6.10.1+dfsg1/compiler/ghc.cabal.in 2009-01-16 16:05:33.000000000 +0200
+@@ -80,7 +80,6 @@
+ if flag(ghci)
+ Build-Depends: template-haskell
+ CPP-Options: -DGHCI
+- Include-Dirs: ../libffi/build/include
+
+ if !flag(ncg)
+ CPP-Options: -DOMIT_NATIVE_CODEGEN
diff -rN -u old-ghc/patches/tuple3-trac2750 new-ghc/patches/tuple3-trac2750
--- old-ghc/patches/tuple3-trac2750 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/tuple3-trac2750 2011-01-15 06:05:51.995514687 +0000
@@ -0,0 +1,13 @@
+Index: ghc6-6.10.1+dfsg1/libraries/base/Data/Data.hs
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/libraries/base/Data/Data.hs 2009-01-18 21:32:35.000000000 +0200
++++ ghc6-6.10.1+dfsg1/libraries/base/Data/Data.hs 2009-01-18 21:32:58.000000000 +0200
+@@ -1177,7 +1177,7 @@
+ tuple3Constr = mkConstr tuple3DataType "(,,)" [] Infix
+
+ tuple3DataType :: DataType
+-tuple3DataType = mkDataType "Prelude.(,)" [tuple3Constr]
++tuple3DataType = mkDataType "Prelude.(,,)" [tuple3Constr]
+
+ instance (Data a, Data b, Data c) => Data (a,b,c) where
+ gfoldl f z (a,b,c) = z (,,) `f` a `f` b `f` c
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules 2011-01-15 06:05:51.771502887 +0000
+++ new-ghc/rules 2011-01-15 06:05:52.055517848 +0000
@@ -8,6 +8,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
# From /usr/share/doc/autotools-dev/examples/rules.gz:
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -23,7 +25,7 @@
EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
dh_testdir
touch configure
@@ -33,15 +35,16 @@
echo "HADDOCK_DOCS := YES" >> mk/build.mk
echo "GhcRTSWays += debug_p thr_debug thr_debug_p" >> mk/build.mk
echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
-ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64)' ''
- echo "GhcUnregisterised=YES" >> mk/build.mk
- echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
- echo "GhcWithInterpreter=NO" >> mk/build.mk
- echo "SplitObjs=NO" >> mk/build.mk
- # The threaded RTS doesn't seem happy on non-x86/amd64
- echo 'GhcRTSWays := $$(shell echo $$(GhcRTSWays) | sed "s/\<[a-z_]*thr[a-z_]*\>//g")' >> mk/build.mk
- echo "GhcNotThreaded=YES" >> mk/build.mk
-endif
+# Let's see if we could do without this with 6.10.1.
+#ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64)' ''
+# echo "GhcUnregisterised=YES" >> mk/build.mk
+# echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
+# echo "GhcWithInterpreter=NO" >> mk/build.mk
+# echo "SplitObjs=NO" >> mk/build.mk
+# # The threaded RTS doesn't seem happy on non-x86/amd64
+# echo 'GhcRTSWays := $$(shell echo $$(GhcRTSWays) | sed "s/\<[a-z_]*thr[a-z_]*\>//g")' >> mk/build.mk
+# echo "GhcNotThreaded=YES" >> mk/build.mk
+#endif
ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
echo "SRC_HC_OPTS += -H32m -O0" >> mk/build.mk
echo "GhcHcOpts += -Rghc-timing -DDEBUG" >> mk/build.mk
@@ -85,11 +88,12 @@
rm -rf debian/testghc
mkdir debian/testghc
echo 'main = putStrLn "Foo"' > debian/testghc/foo.hs
- compiler/stage2/ghc-inplace debian/testghc/foo.hs -o debian/testghc/foo
+# compiler/stage2/ghc-inplace debian/testghc/foo.hs -o debian/testghc/foo
+ ghc/stage2-inplace/ghc debian/testghc/foo.hs -o debian/testghc/foo
[ "$$(debian/testghc/foo)" = "Foo" ]
rm debian/testghc/*
echo 'main = putStrLn "Foo"' > debian/testghc/foo.hs
- compiler/stage2/ghc-inplace debian/testghc/foo.hs -o debian/testghc/foo -O2
+ ghc/stage2-inplace/ghc debian/testghc/foo.hs -o debian/testghc/foo -O2
[ "$$(debian/testghc/foo)" = "Foo" ]
rm debian/testghc/*
@@ -113,11 +117,12 @@
# Delete all the library LICENSE files
rm debian/tmp/usr/share/doc/ghc6-doc/libraries/*/LICENSE
+ rm debian/tmp/usr/share/doc/ghc6-doc/LICENSE
# Generate lintian overrides
mkdir -p debian/tmp/usr/share/lintian/overrides
- echo "ghc6 binary: extra-license-file `cd debian/tmp && echo usr/lib/ghc-*/lib/Cabal-*/Distribution/License.hi`" >> debian/tmp/usr/share/lintian/overrides/ghc6
- echo "ghc6-prof binary: extra-license-file `cd debian/tmp && echo usr/lib/ghc-*/lib/Cabal-*/Distribution/License.p_hi`" >> debian/tmp/usr/share/lintian/overrides/ghc6-prof
+ echo "ghc6 binary: extra-license-file `cd debian/tmp && echo usr/lib/ghc-*/Cabal-*/Distribution/License.hi`" >> debian/tmp/usr/share/lintian/overrides/ghc6
+ echo "ghc6-prof binary: extra-license-file `cd debian/tmp && echo usr/lib/ghc-*/Cabal-*/Distribution/License.p_hi`" >> debian/tmp/usr/share/lintian/overrides/ghc6-prof
# Sort out the package.conf files
mv debian/tmp/usr/lib/ghc-$(ProjectVersion)/package.conf \
@@ -170,7 +175,7 @@
# ghc6
find debian/tmp/usr/bin $(FILES) > debian/ghc6.install
- find debian/tmp/usr/share/ghc* $(FILES) >> debian/ghc6.install
+# find debian/tmp/usr/share/ghc* $(FILES) >> debian/ghc6.install
find debian/tmp/usr/share/man $(FILES) >> debian/ghc6.install
find debian/tmp/usr/lib/ghc-$(ProjectVersion) $(FILES) ! $(PROF_FILE) >> debian/ghc6.install
echo debian/tmp/usr/share/lintian/overrides/ghc6 >> debian/ghc6.install
@@ -184,7 +189,7 @@
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f configure-stamp build-stamp install-stamp binary-common-stamp
@@ -208,6 +213,14 @@
rm -f compiler/stage2/ghc_boot_platform.h
rm -f compiler/stage1/ghc-inplace.o
rm -f compiler/stage2/ghc-inplace.o
+ rm -f ghc/inplace-datadir/package.conf
+
+ rm -f utils/pwd/pwd utils/pwd/pwd.hi utils/pwd/pwd.o
+ rm -f config.log
+ rm -f libraries/ghc-prim/GHC/PrimopWrappers.hs
+ rm -f libraries/ghc-prim/GHC/Prim.hs
+
+ rm -rf .pc
dh_clean
More information about the Pkg-haskell-commits
mailing list