diff -ruN debian.orig/changelog debian/changelog --- debian.orig/changelog 2010-02-12 16:49:12.000000000 -0800 +++ debian/changelog 2010-02-14 19:21:53.000000000 -0800 @@ -1,3 +1,9 @@ +ghc6 (6.13-0.2) unstable; urgency=low + + * Patching Debian's 6.12.1 package with 6.13-20091231 tarball. + + -- David Fox Sun, 14 Feb 2010 19:21:53 -0800 + ghc6 (6.12.1-9) unstable; urgency=low * Remove /usr/lib/ghc-$(ProjectVersion)/lib/haddock (ie. the internal diff -ruN debian.orig/control debian/control --- debian.orig/control 2010-02-12 23:18:21.000000000 -0800 +++ debian/control 2010-02-16 13:26:30.000000000 -0800 @@ -3,15 +3,15 @@ Priority: optional Maintainer: Kari Pahula Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 7), libgmp3-dev, devscripts, ghc6, grep-dctrl, autotools-dev, gcc (>= 4:4.2), procps | hurd, libffi-dev, autoconf, pkg-config, xsltproc, docbook-xsl, docbook-xml, binutils (>= 2.19.51.20090508) [arm armel], libncurses5-dev +Build-Depends: debhelper (>= 7), libgmp3-dev, devscripts, ghc6, grep-dctrl, autotools-dev, gcc (>= 4:4.2), procps | hurd, quilt, libffi-dev, autoconf, pkg-config, xsltproc, docbook-xsl, docbook-xml, binutils (>= 2.19.51.20090508) [arm armel], libncurses5-dev Homepage: http://haskell.org/ghc/ Package: ghc6 Architecture: any Depends: perl | perl5, gcc (>= 4:4.2), libgmp3-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends} Provides: haskell-compiler, ghc, haddock, ${provided-devs} -Conflicts: ghc4 (<= 4.08.1-4), haddock -Replaces: haddock, ghc6-doc (= 6.12.1-8) +Conflicts: ghc4 (<= 4.08.1-4) +Replaces: ghc6-doc (= 6.12.1-8) Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.6.19), ghc6-doc (<= 6.12.1-8) Suggests: ghc6-prof, ghc6-doc, haskell-doc Description: GHC - the Glasgow Haskell Compilation system diff -ruN debian.orig/ghc6.triggers debian/ghc6.triggers --- debian.orig/ghc6.triggers 2010-01-27 11:36:52.000000000 -0800 +++ debian/ghc6.triggers 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -interest /var/lib/ghc-6.12.1/package.conf.d diff -ruN debian.orig/patches/series debian/patches/series --- debian.orig/patches/series 2010-02-12 06:08:05.000000000 -0800 +++ debian/patches/series 2010-02-14 19:23:33.000000000 -0800 @@ -7,3 +7,4 @@ haddock-no-irrefutable-docname haddock-hardcode-ghc-paths debian-changes-6.12.1-9 +version diff -ruN debian.orig/patches/version debian/patches/version --- debian.orig/patches/version 1969-12-31 16:00:00.000000000 -0800 +++ debian/patches/version 2010-02-15 06:14:40.000000000 -0800 @@ -0,0 +1,7 @@ +Index: ghc6-6.12.1/VERSION +=================================================================== +--- ghc-6.12.1.orig/VERSION~ 2009-10-02 12:06:12.000000000 -0700 ++++ ghc-6.12.1/VERSION 2009-10-04 08:27:09.000000000 -0700 +@@ -1 +1 @@ +-6.13.20091231 ++6.13 diff -ruN debian.orig/rules debian/rules --- debian.orig/rules 2010-02-12 16:49:25.000000000 -0800 +++ debian/rules 2010-02-16 13:26:30.000000000 -0800 @@ -8,6 +8,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/quilt/quilt.make + # From /usr/share/doc/autotools-dev/examples/rules.gz: export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -20,6 +22,8 @@ # confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) #endif +confflags += --enable-shared --enable-bootstrap-with-devel-snapshot + ProjectVersion=$(shell awk -F\' "/^PACKAGE_VERSION='[0-9.]+'\$$/ { print \$$2 }" configure) GHC=$(firstword $(shell bash -c "type -p ghc6 ghc")) @@ -27,7 +31,8 @@ BUILD_HADDOCK_DOCS=YES configure: configure-stamp -configure-stamp: +configure-stamp: debian/stamp-patched + echo "interest /var/lib/ghc-`cat VERSION`/package.conf.d" > debian/ghc6.triggers dh_testdir touch configure @@ -224,7 +229,7 @@ echo "/var/lib/ghc-$(ProjectVersion)/package.conf.d /usr/lib/ghc-$(ProjectVersion)/package.conf.d" >> debian/ghc6.links touch $@ -clean: +clean: unpatch dh_testdir dh_testroot rm -f configure-stamp build-stamp install-stamp binary-arch-stamp binary-indep-stamp