[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.1+dfsg1-5.dsc

[Kari Pahula]

Wed Jan 28 07:23:11 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-5.dsc

    M ./changelog +10
    M ./control -1 +1
    M ./rules -4 +4

Wed Jan 28 07:23:11 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-5.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:06:01.700025910 +0000
+++ new-ghc/changelog	2011-01-15 06:06:01.968040029 +0000
@@ -1,3 +1,13 @@
+ghc6 (6.10.1+dfsg1-5) experimental; urgency=low
+
+  * Add libffi-dev as a dependency for ghc6. (Closes: #513289)
+  * Replaced libreadline5-dev with libedit-dev from ghc6's deps.
+  * Don't add any extra flags to GhcRTSWays build variable.
+  * Build a registerised build on kfreebsd-i386. (Closes: #513198)
+  * Build an unregisterised build on ia64.
+
+ -- Kari Pahula <kaol at debian.org>  Wed, 28 Jan 2009 09:23:11 +0200
+
 ghc6 (6.10.1+dfsg1-4) experimental; urgency=low
 
   * Add pkg-config as a build dep.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:06:01.700025910 +0000
+++ new-ghc/control	2011-01-15 06:06:01.968040029 +0000
@@ -8,7 +8,7 @@
 
 Package: ghc6
 Architecture: any
-Depends: haskell-utils, perl | perl5, gcc (>= 4:4.2), libgmp3-dev, ${shlibs:Depends}, ${misc:Depends}, ${readline}
+Depends: haskell-utils, perl | perl5, gcc (>= 4:4.2), libgmp3-dev, libffi-dev, ${shlibs:Depends}, ${misc:Depends}, libedit-dev
 Provides: haskell-compiler, ghc, ${provided-devs}
 Conflicts: ghc4 (<= 4.08.1-4)
 Suggests: ghc6-prof, ghc6-doc, haskell-doc
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:06:01.700025910 +0000
+++ new-ghc/rules	2011-01-15 06:06:01.968040029 +0000
@@ -35,9 +35,9 @@
 	rm -f mk/build.mk
 	echo "XMLDocWays := html" >> mk/build.mk
 	echo "HADDOCK_DOCS := $(BUILD_HADDOCK_DOCS)" >> mk/build.mk
-	echo "GhcRTSWays += debug_p thr_debug thr_debug_p" >> 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 powerpc ia64)' ''
+ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64 powerpc ia64 kfreebsd-i386)' ''
 	echo "GhcUnregisterised=YES" >> mk/build.mk
 endif
 #	echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
@@ -112,7 +112,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	echo "readline=`grep-status -r -FProvides '\<libreadline-dev\>' -a -FStatus installed -s Package -n | tr '\n' ,`" >> debian/ghc6.substvars
+#	echo "readline=`grep-status -r -FProvides '\<libreadline-dev\>' -a -FStatus installed -s Package -n | tr '\n' ,`" >> debian/ghc6.substvars
 
 	# Install the basic stuff
 	$(MAKE) DESTDIR=`pwd`/debian/tmp install
@@ -213,7 +213,7 @@
 
 	# Hacks:
 	rm -f compiler/stage2/ghc-6.8.2
-	rm -f libraries/readline/config.status
+	rm -f libraries/editline/config.status
 	rm -f compiler/stage1/ghc_boot_platform.h
 	rm -f compiler/stage2/ghc_boot_platform.h
 	rm -f compiler/stage1/ghc-inplace.o