[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.4.1-2.dsc

[Ian Lynagh (wibble)]

Fri Mar  3 00:32:06 UTC 2006  Ian Lynagh (wibble) <igloo at debian.org>
  * Import of ghc6_6.4.1-2.dsc

    M ./changelog +31
    M ./control -2 +2
    R ./ghc6.README.Debian
    M ./rules -2 +3

Fri Mar  3 00:32:06 UTC 2006  Ian Lynagh (wibble) <igloo at debian.org>
  * Import of ghc6_6.4.1-2.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:06:55.998886308 +0000
+++ new-ghc/changelog	2011-01-15 06:06:56.470911174 +0000
@@ -1,3 +1,34 @@
+ghc6 (6.4.1-2) unstable; urgency=low
+
+  * Due to problems with xmltex's uninstallability and its long-standing
+    bugs with lists rendering some docs unbuildable:
+    * Set XMLDocWays to "html" in debian/rules, rather than "html dvi ps".
+    * Remove build-deps on jade, docbook-utils, xmltex, docbook-xml.
+  * Change ghc6-hopengl's dep on "libc6-dev" to
+    "libc6-dev | libc6.1-dev | libc-dev"
+  * Fix building cabal packages that build executables with HS-Source-Dir.
+    Closes: #337909.
+  * Use "tail -n +2" rather than the deprecated "tail +2" in debian/rules.
+    Closes: #339606.
+  * On the list of arches we build registerised:
+    * Add amd64. Closes: #354872.
+    * Remove sparc (it has bitrotted).
+    List now reads "i386 amd64".
+  * Remove ghc6.README.Debian (appeal for registerised ports). The problems
+    when they bitrot outweigh the advantages IMO, at least until we have a
+    testsuite we can run when building.
+  * Apply fix for ghci failing to start ("Unable to mmap( MAP_FIXED ) for
+    Jump Islands") from Ryan Lortie. Closes: #343428.
+  * Delete ".SECONDARY:" from mk/suffix.mk as make >3.80 was taking
+    forever due to bug #346248. Closes: #348633.
+  * Changed xlibs-dev build-dep to:
+    libx11-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev.
+    Closes: #346752.
+  * Add "GhcWithNativeCodeGen=NO" to mk/build.mk when we are building
+    unregisterised.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org>  Fri, 03 Mar 2006 00:32:06 +0000
+
 ghc6 (6.4.1-1) unstable; urgency=low
 
   * New upstream release. Closes: #329322.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:06:55.998886308 +0000
+++ new-ghc/control	2011-01-15 06:06:56.470911174 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ian Lynagh (wibble) <igloo at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libreadline5-dev | libreadline-dev, xlibmesa-gl-dev, libglu1-xorg-dev | libglu-dev, libglut3-dev, time, xutils, devscripts, haddock (>= 0.6), ghc6, cpio, jade, docbook-utils, xlibs-dev, grep-dctrl, autotools-dev, xmltex, docbook-xsl, docbook-xml
+Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libreadline5-dev | libreadline-dev, xlibmesa-gl-dev, libglu1-xorg-dev | libglu-dev, libglut3-dev, time, xutils, devscripts, haddock (>= 0.6), ghc6, cpio, libx11-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, grep-dctrl, autotools-dev, docbook-xsl
 
 Package: ghc6
 Architecture: any
@@ -24,7 +24,7 @@
 Package: ghc6-hopengl
 Section: devel
 Architecture: any
-Depends: ghc6 (= ${Source-Version}), xlibmesa-gl-dev, libglu1-xorg-dev | libglu-dev, libglut3-dev, libx11-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: ghc6 (= ${Source-Version}), xlibmesa-gl-dev, libglu1-xorg-dev | libglu-dev, libglut3-dev, libx11-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libc6-dev | libc6.1-dev | libc-dev, ${shlibs:Depends}, ${misc:Depends}
 Provides: ghc-hopengl, libghc6-opengl-dev, libghc6-opengl-prof, libghc6-glut-dev, libghc6-glut-prof
 Suggests: ghc6-doc
 Description: HOpenGL libraries for the Glasgow Haskell Compilation system
diff -rN -u old-ghc/ghc6.README.Debian new-ghc/ghc6.README.Debian
--- old-ghc/ghc6.README.Debian	2011-01-15 06:06:55.998886308 +0000
+++ new-ghc/ghc6.README.Debian	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-
-GHC can be compiled either "unregisterised" or "registerised". A
-registerised build is about 25% faster than an unregisterised build, but
-it requires some bits of code be written specially for the architecture
-in question. Currently Debian has registerised builds for i386 and sparc.
-
-Part of the work has been done for ia64, powerpc, m68k, alpha, mips (=> mipsel
-too?) and hppa. This means that either it works but for a different
-operating system or that it worked at some point in the past but hasn't
-been maintained. No attempt has been made for arm or s390. Interested
-experts on any of these architectures are encouraged to try to get GHC
-working registerised; some information on what is needed is available at
-http://www.haskell.org/ghc/docs/latest/html/building/sec-porting-ghc.html
-and you may be able to get help on the GHC mailing lists if you get
-stuck.
-
-
-Ian Lynagh <igloo at debian.org>
-
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:06:55.998886308 +0000
+++ new-ghc/rules	2011-01-15 06:06:56.470911174 +0000
@@ -35,8 +35,9 @@
 
 	echo "XMLDocWays   := html" > mk/build.mk
 	echo "GhcRTSWays += debug_p thr_debug thr_debug_p" >> mk/build.mk
-ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 sparc)' ''
+ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64)' ''
 	echo "GhcUnregisterised=YES" >> mk/build.mk
+	echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
 	echo "SplitObjs=NO" >> mk/build.mk
 endif
 ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
@@ -75,7 +76,7 @@
 	  echo "<!DOCTYPE sect1 [<!ENTITY ndash  \"-\"> \
 	                         <!ENTITY ldquo  \"\`\"> \
 	                         <!ENTITY rdquo  \"'\">]>"; \
-	  tail +2 ghc/docs/users_guide/flags.xml; } \
+	  tail -n +2 ghc/docs/users_guide/flags.xml; } \
 	      | xsltproc debian/flags.xsl - > debian/ghc6.1
 	for m in ghci6 ghc-$(ProjectVersion) ghci-$(ProjectVersion); do echo ".so man1/ghc6.1" > debian/$$m.1; done
 	cp ghc/utils/hp2ps/hp2ps.1 debian/hp2ps-ghc6.1