[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.8.2-1.dsc
Ian Lynagh (wibble)
igloo at debian.org
Sat Jan 15 06:07:13 UTC 2011
Tue Dec 18 22:05:22 UTC 2007 Ian Lynagh (wibble) <igloo at debian.org>
* Import of ghc6_6.8.2-1.dsc
M ./changelog +47
M ./control -20 +4
M ./copyright -3 +3
R ./gen_contents_index
M ./ghc6-doc.doc-base.users-guide -2 +2
R ./ghc6-doc.postinst
A ./ghc6-doc.postinst.in
M ./ghc6-doc.prerm -8 +8
M ./ghc6.postinst.in -1
M ./rules -23 +42
M ./scripts.mk -1 +2
Tue Dec 18 22:05:22 UTC 2007 Ian Lynagh (wibble) <igloo at debian.org>
* Import of ghc6_6.8.2-1.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2011-01-15 06:07:13.343799795 +0000
+++ new-ghc/changelog 2011-01-15 06:07:13.447805272 +0000
@@ -1,3 +1,50 @@
+ghc6 (6.8.2-1) unstable; urgency=low
+
+ * Strengthen haddock dep and build-dep to 0.8-2 as we need the
+ version that makes compatible files on 32 and 64 bit arches.
+ Closes: #433251.
+ * Add a build-dep on hscolour. We now use it when making the
+ documentation, so the haddock docs link to syntax highlighted
+ source.
+ * Remove the libsrc package. ghc6-doc now includes the sources anyway.
+ Closes: #432706.
+ * gen_contents_index is now provided by the upstream install, so we
+ no longer ship our own copy. However, we do have to move it into
+ /usr/lib rather than /usr/share/doc.
+ * Remove the stat2resid slave of the GHC symlink, as stat2resid
+ no longer exists. Closes: #432715.
+ * We set bindir, docdir, htmldir, dvidir, pdfdir and psdir in
+ mk/build.mk rather than with configure flags, as the way configure
+ currently works means they can't be set relative to other variables
+ if set with configure flags.
+ * We no longer pass --datadir to configure; we used to use this to
+ get the docs in the right place.
+ * When doing the install step, we now use DESTDIR rather than prefix
+ to override where the files go.
+ * We now need to set HADDOCK_DOCS=YES in mk/build.mk in order to get the
+ haddock docks built.
+ * Removed "html/" from the documentation path in ghc6-doc.postinst,
+ ghc6-doc.prerm and ghc6-doc.doc-base.users-guide.
+ * Use "[ ! -f mk/config.mk ] ||" to guard "make distclean" rather than
+ ignoring all errors from it.
+ * Use ${binary:Version} rather than ${Source-Version} to specify the
+ dependency of ghc6-prof on ghc6.
+ * All the libraries now install LICENSE files, so we remove them after
+ the install step.
+ * Follow change in man path from /usr/man to /usr/share/man.
+ * lintian thinks that Cabal's Distribution/License.hi is an extra
+ licence file, so add a lintian override.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org> Tue, 18 Dec 2007 22:05:22 +0000
+
+ghc6 (6.6.1-2) unstable; urgency=low
+
+ * ghc6-doc now depends on haddock as it needs to run
+ gen_contents_index in postinst. Closes: #423561.
+ * ghc6-doc and ghc6-libsrc depend on ${shlibs:Depends}, ${misc:Depends}.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org> Tue, 15 May 2007 14:12:53 +0000
+
ghc6 (6.6.1-1) unstable; urgency=low
* New upstream version.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control 2011-01-15 06:07:13.343799795 +0000
+++ new-ghc/control 2011-01-15 06:07:13.447805272 +0000
@@ -2,8 +2,8 @@
Section: devel
Priority: optional
Maintainer: Ian Lynagh (wibble) <igloo at debian.org>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libreadline5-dev | libreadline-dev, devscripts, haddock (>= 0.6), ghc6, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml
+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
Package: ghc6
Architecture: any
@@ -25,7 +25,7 @@
Section: devel
Architecture: any
Provides: ghc-prof, ${provided-profs}
-Depends: ghc6 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ghc6 (= ${binary:Version}), ${shlibs:Depends}, ${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,6 +45,7 @@
Architecture: all
Suggests: haskell-doc
Provides: ${provided-docs}
+Depends: haddock (>= 0.8-2), ${shlibs:Depends}, ${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.
@@ -58,20 +59,3 @@
This package includes HTML, DVI and PS versions of the SGML-based
documentation around GHC.
-Package: ghc6-libsrc
-Section: doc
-Suggests: ghc6-doc, haskell-doc
-Architecture: all
-Description: Library Sources of GHC, the Glasgow Haskell Compilation system
- Version 6 of the Glorious Glasgow Haskell Compilation system (GHC). GHC is
- a compiler for Haskell98.
- .
- Haskell is "the" standard lazy functional programming language. Haskell98
- is the current version of the language. The language definition and
- additional documentation can be found in the `haskell-doc' package.
- Alternatively, there is an online version at
- http://haskell.org/onlinereport/.
- .
- This package contains the Haskell source code of the GHC libraries. It is
- provided as additional documentation ("Use the source, Luke").
-
diff -rN -u old-ghc/copyright new-ghc/copyright
--- old-ghc/copyright 2011-01-15 06:07:13.339799584 +0000
+++ new-ghc/copyright 2011-01-15 06:07:13.447805272 +0000
@@ -23,14 +23,14 @@
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-· Redistributions of source code must retain the above copyright notice,
+* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-· Redistributions in binary form must reproduce the above copyright notice,
+* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-· Neither name of the University nor the names of its contributors may be
+* Neither name of the University nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.
diff -rN -u old-ghc/gen_contents_index new-ghc/gen_contents_index
--- old-ghc/gen_contents_index 2011-01-15 06:07:13.339799584 +0000
+++ new-ghc/gen_contents_index 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-HADDOCK_FILES=`ls -1 */*.haddock | sort`
-
-# Automagically create the prologue for the combined index via a
-# header, the package prologues (in alphabetical order of the
-# packages) and a footer.
-{
- cat libraries-header.txt
- echo
- # Hack to find out if we're in a build tree or installed docs
- for HADDOCK_FILE in $HADDOCK_FILES
- do
- NAME=`echo "$HADDOCK_FILE" | sed "s#/.*##"`
- PROLOGUE="$NAME"/prologue.txt
- if [ "$NAME" != haskell98 ]
- then
- echo "[@${NAME}@]"
- if [ -e "$PROLOGUE" ]
- then
- grep -v '^ *$$' "$PROLOGUE"
- fi
- echo
- HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
- fi
- done
- cat libraries-footer.txt
- echo
-} > libraries.txt
-
-# Now create the combined contents and index pages
-haddock --gen-index --gen-contents -o . \
- -t "Haskell Hierarchical Libraries" \
- -p libraries.txt \
- $HADDOCK_ARGS
-
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:07:13.339799584 +0000
+++ new-ghc/ghc6-doc.doc-base.users-guide 2011-01-15 06:07:13.439804851 +0000
@@ -12,5 +12,5 @@
Section: devel
Format: HTML
-Index: /usr/share/doc/ghc6-doc/html/index.html
-Files: /usr/share/doc/ghc6-doc/html/*/*.html
+Index: /usr/share/doc/ghc6-doc/index.html
+Files: /usr/share/doc/ghc6-doc/*/*.html
diff -rN -u old-ghc/ghc6-doc.postinst new-ghc/ghc6-doc.postinst
--- old-ghc/ghc6-doc.postinst 2011-01-15 06:07:13.339799584 +0000
+++ new-ghc/ghc6-doc.postinst 1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-#! /bin/sh
-# postinst script for ghc6-doc
-#
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see /usr/doc/packaging-manual/
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
- configure|abort-upgrade|abort-remove|abort-deconfigure)
- cd /usr/share/doc/ghc6-doc/html/libraries
- /usr/lib/ghc6-doc/gen_contents_index
- ;;
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -rN -u old-ghc/ghc6-doc.postinst.in new-ghc/ghc6-doc.postinst.in
--- old-ghc/ghc6-doc.postinst.in 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6-doc.postinst.in 2011-01-15 06:07:13.435804640 +0000
@@ -0,0 +1,41 @@
+#! /bin/sh
+# postinst script for ghc6-doc
+#
+set -e
+
+libdir=/usr/lib/ghc6-doc
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+ configure|abort-upgrade|abort-remove|abort-deconfigure)
+ cd /usr/share/doc/ghc6-doc/libraries
+ "$libdir"/gen_contents_index
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff -rN -u old-ghc/ghc6-doc.prerm new-ghc/ghc6-doc.prerm
--- old-ghc/ghc6-doc.prerm 2011-01-15 06:07:13.339799584 +0000
+++ new-ghc/ghc6-doc.prerm 2011-01-15 06:07:13.363800848 +0000
@@ -16,14 +16,14 @@
case "$1" in
remove|upgrade|deconfigure|failed-upgrade)
- rm -f /usr/share/doc/ghc6-doc/html/libraries/doc-index*.html
- rm -f /usr/share/doc/ghc6-doc/html/libraries/haddock.css
- rm -f /usr/share/doc/ghc6-doc/html/libraries/haddock.js
- rm -f /usr/share/doc/ghc6-doc/html/libraries/index.html
- rm -f /usr/share/doc/ghc6-doc/html/libraries/libraries.txt
- rm -f /usr/share/doc/ghc6-doc/html/libraries/haskell_icon.gif
- rm -f /usr/share/doc/ghc6-doc/html/libraries/minus.gif
- rm -f /usr/share/doc/ghc6-doc/html/libraries/plus.gif
+ rm -f /usr/share/doc/ghc6-doc/libraries/doc-index*.html
+ rm -f /usr/share/doc/ghc6-doc/libraries/haddock.css
+ rm -f /usr/share/doc/ghc6-doc/libraries/haddock.js
+ rm -f /usr/share/doc/ghc6-doc/libraries/index.html
+ rm -f /usr/share/doc/ghc6-doc/libraries/libraries.txt
+ rm -f /usr/share/doc/ghc6-doc/libraries/haskell_icon.gif
+ rm -f /usr/share/doc/ghc6-doc/libraries/minus.gif
+ rm -f /usr/share/doc/ghc6-doc/libraries/plus.gif
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
diff -rN -u old-ghc/ghc6.postinst.in new-ghc/ghc6.postinst.in
--- old-ghc/ghc6.postinst.in 2011-01-15 06:07:13.339799584 +0000
+++ new-ghc/ghc6.postinst.in 2011-01-15 06:07:13.447805272 +0000
@@ -44,7 +44,6 @@
--slave $mandir/man1/hp2ps.1.gz hp2ps.1.gz $mandir/man1/hp2ps-ghc6.1.gz \
--slave $mandir/man1/ghc.1.gz ghc.1.gz $mandir/man1/ghc6.1.gz \
--slave $mandir/man1/ghci.1.gz ghci.1.gz $mandir/man1/ghc6.1.gz \
- --slave $execdir/stat2resid stat2resid $bindir/stat2resid \
--slave $execdir/hasktags hasktags $bindir/hasktags
if [ ! -e $libdir/package.conf ]
then
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules 2011-01-15 06:07:13.339799584 +0000
+++ new-ghc/rules 2011-01-15 06:07:13.447805272 +0000
@@ -30,6 +30,7 @@
rm -f mk/build.mk
echo "XMLDocWays := html" >> mk/build.mk
+ 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)' ''
@@ -55,11 +56,22 @@
# echo "GhcLibHcOpts += -O0" >> mk/build.mk
echo "GhcRtsCcOpts += -O0" >> mk/build.mk
endif
+ # We can't do this with a configure flag in 6.8.1 as libdir is not
+ # defined at the point at which we := it
+ echo 'bindir := $${libdir}/bin' >> mk/build.mk
+ # docdir doesn't have a configure flag, and unfortunately
+ # we also need to explicitly define all of its dependents as they
+ # are set with :=
+ echo 'docdir := $$(datarootdir)/doc/ghc6-doc' >> mk/build.mk
+ echo 'htmldir := $$(docdir)' >> mk/build.mk
+ echo 'dvidir := $$(docdir)' >> mk/build.mk
+ echo 'pdfdir := $$(docdir)' >> mk/build.mk
+ echo 'psdir := $$(docdir)' >> mk/build.mk
rm -f config.sub
rm -f config.guess
ln -s /usr/share/misc/config.sub .
ln -s /usr/share/misc/config.guess .
- ./configure $(confflags) --prefix=/usr --bindir='$${libdir}/bin' --datadir='$${prefix}/share/doc/ghc6-doc' $(EXTRA_CONFIGURE_FLAGS)
+ ./configure $(confflags) --prefix=/usr $(EXTRA_CONFIGURE_FLAGS)
touch $@
@@ -95,8 +107,16 @@
echo "readline=`grep-status -r -FProvides '\<libreadline-dev\>' -a -FStatus installed -s Package -n | tr '\n' ,`" >> debian/ghc6.substvars
# Install the basic stuff
- $(MAKE) prefix=`pwd`/debian/tmp/usr install
- $(MAKE) prefix=`pwd`/debian/tmp/usr install-docs
+ $(MAKE) DESTDIR=`pwd`/debian/tmp install
+ $(MAKE) DESTDIR=`pwd`/debian/tmp install-docs
+
+ # Delete all the library LICENSE files
+ rm debian/tmp/usr/share/doc/ghc6-doc/libraries/*/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
# Sort out the package.conf files
mv debian/tmp/usr/lib/ghc-$(ProjectVersion)/package.conf \
@@ -126,17 +146,15 @@
done
rm -f debian/tmp/usr/bin/*-$(ProjectVersion)6
rm -f debian/tmp/usr/bin/runhaskell6
-
- # library documentation
- chmod +x debian/gen_contents_index
-
- # library source
- ln -s ../../../../../libraries debian/tmp/usr/share/doc/ghc6-libsrc
+ # gen_contents_index is a script, so move it into /usr/lib
+ mkdir debian/tmp/usr/lib/ghc6-doc
+ mv debian/tmp/usr/share/doc/ghc6-doc/libraries/gen_contents_index \
+ debian/tmp/usr/lib/ghc6-doc
# manpages
ProjectVersion=$(ProjectVersion) $(MAKE) -f debian/scripts.mk all
for m in ghci6 ghc-$(ProjectVersion) ghci-$(ProjectVersion); do echo ".so man1/ghc6.1" > debian/$$m.1; done
- mv debian/tmp/usr/man/man1/ghc.1 debian/ghc6.1
+ mv debian/tmp/usr/share/man/man1/ghc.1 debian/ghc6.1
cp utils/hp2ps/hp2ps.1 debian/hp2ps-ghc6.1
echo debian/*.1 > debian/ghc6.manpages
@@ -150,18 +168,18 @@
# Now all the files are sorted, create the package filelists
# ghc6
- find debian/tmp/usr/bin $(FILES) > debian/ghc6.install
- find debian/tmp/usr/man $(FILES) >> debian/ghc6.install
- find debian/tmp/usr/lib $(FILES) ! $(PROF_FILE) >> debian/ghc6.install
- echo debian/ghc6_vars /usr/lib/haskell-utils >> debian/ghc6.install
+ find debian/tmp/usr/bin $(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
+ 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
+ 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
# ghc6-doc
- find debian/tmp/usr/share/doc $(FILES) > debian/ghc6-doc.install
- echo debian/gen_contents_index /usr/lib/ghc6-doc >> debian/ghc6-doc.install
- # ghc6-libsrc
- find debian/tmp/usr/share/doc/ghc6-libsrc/ $(FILES) -name "*.*hs" \
- > debian/ghc6-libsrc.install
+ find debian/tmp/usr/share/doc $(FILES) > debian/ghc6-doc.install
+ find debian/tmp/usr/lib/ghc6-doc $(FILES) >> debian/ghc6-doc.install
touch $@
@@ -172,7 +190,7 @@
touch configure
- -$(MAKE) distclean
+ [ ! -f mk/config.mk ] || $(MAKE) distclean
rm -f config.sub config.guess
rm -f debian/*.install
rm -f debian/*.1
@@ -183,11 +201,12 @@
rm -rf debian/testghc
# Hacks:
- rm -f compiler/stage2/ghc-6.6.1
+ rm -f compiler/stage2/ghc-6.8.2
rm -f libraries/readline/config.status
rm -f compiler/stage1/ghc_boot_platform.h
rm -f compiler/stage2/ghc_boot_platform.h
- rm -rf libraries/html-docs/
+ rm -f compiler/stage1/ghc-inplace.o
+ rm -f compiler/stage2/ghc-inplace.o
dh_clean
diff -rN -u old-ghc/scripts.mk new-ghc/scripts.mk
--- old-ghc/scripts.mk 2011-01-15 06:07:13.339799584 +0000
+++ new-ghc/scripts.mk 2011-01-15 06:07:13.427804219 +0000
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
-FILES = debian/ghc6.postinst debian/ghc6.prerm debian/ghc6.postrm
+FILES = debian/ghc6.postinst debian/ghc6.prerm debian/ghc6.postrm
+FILES += debian/ghc6-doc.postinst
.PHONY: all clean
More information about the Pkg-haskell-commits
mailing list