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

[Kari Pahula]

Thu Feb  5 12:14:01 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-6.dsc

    M ./changelog +9
    M ./control -3 +3
    M ./ghc6.postinst.in -2
    M ./ghc6.prerm.in -2
    M ./rules -7 +5

Thu Feb  5 12:14:01 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-6.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:06:03.340112308 +0000
+++ new-ghc/changelog	2011-01-15 06:06:03.604126216 +0000
@@ -1,3 +1,12 @@
+ghc6 (6.10.1+dfsg1-6) experimental; urgency=low
+
+  * This time actually change the build on ia64 to be unregisterised.
+  * Dropped ghc6's dependency on haskell-utils.
+  * Removed calls to haskell-utils from prerm and postinst.
+  * Build haddock docs on i386 and amd64. (Closes: #514088)
+
+ -- Kari Pahula <kaol at debian.org>  Thu, 05 Feb 2009 14:14:01 +0200
+
 ghc6 (6.10.1+dfsg1-5) experimental; urgency=low
 
   * Add libffi-dev as a dependency for ghc6. (Closes: #513289)
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:06:03.340112308 +0000
+++ new-ghc/control	2011-01-15 06:06:03.604126216 +0000
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Kari Pahula <kaol at debian.org>
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libedit-dev, devscripts, ghc6, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml, gcc (>= 4:4.2), procps | hurd, quilt, libffi-dev, autoconf, pkg-config
+Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libedit-dev, devscripts, ghc6, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml, gcc (>= 4:4.2), procps | hurd, quilt, libffi-dev, autoconf, pkg-config, haddock (>= 2.4.1-2) [i386 amd64]
 Homepage: http://haskell.org/
 
 Package: ghc6
 Architecture: any
-Depends: haskell-utils, perl | perl5, gcc (>= 4:4.2), libgmp3-dev, libffi-dev, ${shlibs:Depends}, ${misc:Depends}, libedit-dev
+Depends: 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
@@ -46,7 +46,7 @@
 Architecture: all
 Suggests: haskell-doc
 Provides: ${provided-docs}
-Depends: ${misc:Depends}
+Depends: haddock (>= 2.4.1-2) [i386 amd64], ${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/ghc6.postinst.in new-ghc/ghc6.postinst.in
--- old-ghc/ghc6.postinst.in	2011-01-15 06:06:03.340112308 +0000
+++ new-ghc/ghc6.postinst.in	2011-01-15 06:06:03.584125162 +0000
@@ -50,8 +50,6 @@
         then
             cp $libdir/package.conf.shipped $libdir/package.conf
         fi
-        haskell-utils --add-compiler /usr/bin/ghc6 GHC @VERSION@
-        haskell-utils --add-compiler ghc6 GHC @VERSION@
     ;;
     *)
         echo "postinst called with unknown argument \`$1'" >&2
diff -rN -u old-ghc/ghc6.prerm.in new-ghc/ghc6.prerm.in
--- old-ghc/ghc6.prerm.in	2011-01-15 06:06:03.340112308 +0000
+++ new-ghc/ghc6.prerm.in	2011-01-15 06:06:03.584125162 +0000
@@ -21,8 +21,6 @@
 
 case "$1" in
     remove|upgrade|deconfigure|failed-upgrade)
-        haskell-utils --remove-compiler /usr/bin/ghc6
-        haskell-utils --remove-compiler ghc6
         update-alternatives --remove runhaskell $execdir/runghc6
         update-alternatives --remove haskell-compiler $execdir/ghc6
         update-alternatives --remove ghc $bindir/ghc
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:06:03.336112097 +0000
+++ new-ghc/rules	2011-01-15 06:06:03.604126216 +0000
@@ -24,7 +24,7 @@
 GHC=$(firstword $(shell bash -c "type -p ghc6 ghc"))
 EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
 # "YES" if yes
-BUILD_HADDOCK_DOCS=NO
+BUILD_HADDOCK_DOCS=$(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -qe '^(i386|amd64)$$' && echo YES || echo NO)
 
 configure: configure-stamp
 configure-stamp: patch
@@ -37,7 +37,7 @@
 	echo "HADDOCK_DOCS := $(BUILD_HADDOCK_DOCS)" >> 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 kfreebsd-i386)' ''
+ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64 powerpc kfreebsd-i386)' ''
 	echo "GhcUnregisterised=YES" >> mk/build.mk
 endif
 #	echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
@@ -91,7 +91,6 @@
 	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
 	ghc/stage2-inplace/ghc debian/testghc/foo.hs -o debian/testghc/foo
 	[ "$$(debian/testghc/foo)" = "Foo" ]
 	rm debian/testghc/*
@@ -184,7 +183,6 @@
 	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
-	echo debian/ghc6_vars /usr/lib/haskell-utils     >> debian/ghc6.install
 	# ghc6-prof
 	find debian/tmp/usr/lib $(FILES) $(PROF_FILE) > debian/ghc6-prof.install
 	echo debian/tmp/usr/share/lintian/overrides/ghc6-prof >> debian/ghc6-prof.install
@@ -234,9 +232,6 @@
 binary-common-stamp: install-stamp
 	dh_testdir
 	dh_testroot
-ifeq ($(BUILD_HADDOCK_DOCS),YES)
-	echo "interest /usr/share/doc/ghc6-doc/libraries" > debian/ghc6-doc/DEBIAN/triggers
-endif
 	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
@@ -261,6 +256,9 @@
 #	dh_python
 #	dh_makeshlibs
 	dh_installdeb
+ifeq ($(BUILD_HADDOCK_DOCS),YES)
+	echo "interest /usr/share/doc/ghc6-doc/libraries" > debian/ghc6-doc/DEBIAN/triggers
+endif
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums