[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.12.1-11.dsc

[Kari Pahula]

Mon Feb 22 01:24:02 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-11.dsc

    M ./changelog +8
    M ./rules -1 +5

Mon Feb 22 01:24:02 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-11.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:07:46.381539706 +0000
+++ new-ghc/changelog	2011-01-15 06:07:46.433542444 +0000
@@ -1,3 +1,11 @@
+ghc6 (6.12.1-11) unstable; urgency=low
+
+  * Add "unset LC_ALL\export LC_CTYPE=en_US" to bin/ghc wrapper on ia64.
+  * Actually append GhcWithInterpreter=YES to mk/build.mk on kfreebsd-*,
+    don't just echo it to stdout.
+
+ -- Kari Pahula <kaol at debian.org>  Mon, 22 Feb 2010 03:24:02 +0200
+
 ghc6 (6.12.1-10) unstable; urgency=low
 
   * Use dh_haskell_depends from haskell-devscripts to create provides
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:07:46.381539706 +0000
+++ new-ghc/rules	2011-01-15 06:07:46.429542234 +0000
@@ -50,7 +50,7 @@
 	echo "SRC_HC_OPTS += -optc-G0" >> mk/build.mk
 endif
 ifneq (,$(findstring $(DEB_HOST_ARCH), kfreebsd-i386 kfreebsd-amd64))
-	echo "GhcWithInterpreter=YES"
+	echo "GhcWithInterpreter=YES" >> mk/build.mk
 endif
 ifneq (,$(findstring $(DEB_HOST_ARCH), arm armel alpha))
 	echo "UseLibFFIForAdjustors=YES" >> mk/build.mk
@@ -188,6 +188,10 @@
 	install -Dm 644 debian/index.html debian/tmp/usr/share/doc/ghc6-doc/index.html
 endif
 
+ifeq (ia64,$(DEB_HOST_ARCH)) # Tested and seen to be necessary with 6.12.1
+	sed -i "s/exec /unset LC_ALL\nexport LC_CTYPE=en_US\nexec /" debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/ghc-$(ProjectVersion)
+endif
+
 	# manpages
 	echo ".so man1/ghc6.1" > debian/ghc-$(ProjectVersion).1
 	if test -e debian/tmp/usr/bin/ghci-$(ProjectVersion); then \