Hi,

Here is the diff of the NMU I did.


Kurt

diff -u ghc6-6.4/debian/changelog ghc6-6.4/debian/changelog
--- ghc6-6.4/debian/changelog
+++ ghc6-6.4/debian/changelog
@@ -1,3 +1,18 @@
+ghc6 (6.4-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * C++ ABI transition: Relink against new libgmp3c2 package.
+    This will require a manual bootstrapping on each arch since ghc6
+    build depends on itself and the new and old version of gmp3
+    conflict with each other.  (Closes: #319222)
+    - Versioned build dependency on libgmp3-dev (>= 4.1.4-6)
+  * Build using gcc-3.3 since this version doesn't build/work using 4.0
+    and a new upstream version that fixes it isn't available yet.
+
+  See instructions in debian/bootstrap-extracted on how to build this.
+
+ -- Kurt Roeckx <[EMAIL PROTECTED]>  Wed, 31 Aug 2005 19:08:22 +0200
+
 ghc6 (6.4-4) unstable; urgency=low
 
   * Use &(arr->payload) instead of BYTE_ARR_CTS(arr) in Adjustor.c on
diff -u ghc6-6.4/debian/control ghc6-6.4/debian/control
--- ghc6-6.4/debian/control
+++ ghc6-6.4/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ian Lynagh (wibble) <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libreadline5-dev | 
libreadline-dev, xlibmesa-gl-dev, xlibmesa-glu-dev, libglut3-dev, time, xutils, 
devscripts, haddock (>= 0.6), ghc6, cpio, jade, docbook-utils, gcc-3.3 (>= 
1:3.3.4), xlibs-dev, grep-dctrl, autotools-dev, xmltex, docbook-xsl, docbook-xml
+Build-Depends: debhelper (>= 4), libgmp3-dev (>= 4.1.4-6), xsltproc, 
libreadline5-dev | libreadline-dev, xlibmesa-gl-dev, xlibmesa-glu-dev, 
libglut3-dev, time, xutils, devscripts, haddock (>= 0.6), ghc6, cpio, jade, 
docbook-utils, gcc-3.3 (>= 1:3.3.4), xlibs-dev, grep-dctrl, autotools-dev, 
xmltex, docbook-xsl, docbook-xml
 
 Package: ghc6
 Architecture: any
diff -u ghc6-6.4/debian/rules ghc6-6.4/debian/rules
--- ghc6-6.4/debian/rules
+++ ghc6-6.4/debian/rules
@@ -57,7 +57,7 @@
        rm -f config.guess
        ln -s /usr/share/misc/config.sub .
        ln -s /usr/share/misc/config.guess .
-       ./configure $(confflags) --enable-hopengl --prefix=/usr 
--bindir='$${libdir}/bin' $(EXTRA_CONFIGURE_FLAGS)
+       ./configure $(confflags) --enable-hopengl --prefix=/usr 
--bindir='$${libdir}/bin' $(EXTRA_CONFIGURE_FLAGS) --with-gcc=gcc-3.3
        $(MAKE)
 
        mkdir debian/test-build
only in patch2:
unchanged:
--- ghc6-6.4.orig/debian/bootstrap-extracted
+++ ghc6-6.4/debian/bootstrap-extracted
@@ -0,0 +1,27 @@
+# This script can be used to bootstrap the the package when
+# a working older version of ghc6 is extracted in the source dir.
+# It should work with the following build dependencies not installed:
+# ghc6, haddock and haskell-utils
+# Instead, they should get extracted:
+# dpkg -x ghc6_$version_$arch.deb .
+# dpkg -x haskell-utils_$version_$arch.deb .
+# dpkg -x haddock_$version_$arch.deb .
+# Then run this script as: . ./debian/bootstrap-extracted
+# (It needs to set the PATH correctly)
+# dpkg-checkbuilddeps will complain about missing dependencies
+# for: haddock (>= 0.6) ghc6
+# It's safe to ignore those, and use the -d option.
+
+sed -i "s#/usr/#`pwd`/usr/#g" usr/bin/*
+for p in usr/lib/ghc-*/package.conf.shipped
+do sed -e "s#/usr/\(lib\|share\)/ghc#`pwd`&#g" \
+                       < "$p" > `echo "$p" | sed "s/\.shipped$//"`
+done
+for f in usr/bin/*6
+do
+    ln -s `echo "$f" | sed "s#.*/##"` `echo "$f" | sed "s/6$//"`
+done
+
+PATH=$PATH:`pwd`/usr/bin
+export PATH
+

Reply via email to