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

Ian Lynagh (wibble) igloo at debian.org
Sat Jan 15 06:06:53 UTC 2011


Fri Oct 14 10:44:34 UTC 2005  Ian Lynagh (wibble) <igloo at debian.org>
  * Import of ghc6_6.4.1-1.dsc

    R ./bootstrap-extracted
    M ./changelog +17
    M ./control -4 +4
    M ./copyright -1 +1
    M ./rules -2 +2

Fri Oct 14 10:44:34 UTC 2005  Ian Lynagh (wibble) <igloo at debian.org>
  * Import of ghc6_6.4.1-1.dsc
diff -rN -u old-ghc/bootstrap-extracted new-ghc/bootstrap-extracted
--- old-ghc/bootstrap-extracted	2011-01-15 06:06:53.426750812 +0000
+++ new-ghc/bootstrap-extracted	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# 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
-
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:06:53.426750812 +0000
+++ new-ghc/changelog	2011-01-15 06:06:53.562757977 +0000
@@ -1,3 +1,20 @@
+ghc6 (6.4.1-1) unstable; urgency=low
+
+  * New upstream release. Closes: #329322.
+  * Relax the libgmp3-dev build-dep to make backporting easier.
+  * Don't force using gcc-3.3 to build; drop gcc-3.3 build-dep.
+  * Apply patch to add support for kfreebsdgnu to configure(.ac) and the
+    mangler. Closes: #332977.
+  * Add kfreebsd-i386 to ghc6_arches.
+  * Add missing deps on libx11-dev, libsm-dev, libice-dev, libxmu-dev,
+    libxi-dev, libc6-dev to ghc6-hopengl. Closes: #317069.
+  * Update (build-)dep xlibmesa-glu-dev to libglu1-xorg-dev | libglu-dev.
+  * Standards version 3.6.1 -> 3.6.2.
+  * Upstream fixed a panic to give a sensible error message.
+    Closes: #319294.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org>  Fri, 14 Oct 2005 10:44:34 +0000
+
 ghc6 (6.4-4.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:06:53.426750812 +0000
+++ new-ghc/control	2011-01-15 06:06:53.562757977 +0000
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Ian Lynagh (wibble) <igloo at debian.org>
-Standards-Version: 3.6.1
-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
+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
 
 Package: ghc6
 Architecture: any
-Depends: haskell-utils, perl | perl5, gcc-3.3 (>= 1:3.3.4), libgmp3-dev, ${shlibs:Depends}, ${misc:Depends}, ${readline}
+Depends: haskell-utils, perl | perl5, gcc, libgmp3-dev, ${shlibs:Depends}, ${misc:Depends}, ${readline}
 Provides: haskell-compiler, ghc, ${provided-devs}
 Conflicts: ghc4 (<= 4.08.1-4)
 Suggests: ghc6-prof, ghc6-doc, haskell-doc
@@ -24,7 +24,7 @@
 Package: ghc6-hopengl
 Section: devel
 Architecture: any
-Depends: ghc6 (= ${Source-Version}), xlibmesa-gl-dev, xlibmesa-glu-dev, libglut3-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, ${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/copyright new-ghc/copyright
--- old-ghc/copyright	2011-01-15 06:06:53.426750812 +0000
+++ new-ghc/copyright	2011-01-15 06:06:53.562757977 +0000
@@ -4,7 +4,7 @@
 released into the public domain.
 
 It was downloaded from
-http://www.haskell.org/ghc/dist/6.4/ghc-6.4-src.tar.bz2
+http://www.haskell.org/ghc/dist/6.4.1/ghc-6.4.1-src.tar.bz2
 
 Upstream Authors: The GHC team
     Simon Peyton Jones	<simonpj at microsoft.com>
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:06:53.422750601 +0000
+++ new-ghc/rules	2011-01-15 06:06:53.562757977 +0000
@@ -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) --with-gcc=gcc-3.3
+	./configure $(confflags) --enable-hopengl --prefix=/usr --bindir='$${libdir}/bin' $(EXTRA_CONFIGURE_FLAGS)
 	$(MAKE)
 
 	mkdir debian/test-build
@@ -153,7 +153,7 @@
 	rm -f debian/ghc6/usr/bin/runhaskell6
 
 	/usr/bin/install -c -m 755 -d debian/ghc6/`dirname $(VARFILE)`
-	echo 'ghc6_arches="alpha amd64 hppa i386 ia64 m68k powerpc s390 sparc"' > debian/ghc6/$(VARFILE)
+	echo 'ghc6_arches="alpha amd64 hppa i386 ia64 kfreebsd-i386 m68k powerpc s390 sparc"' > debian/ghc6/$(VARFILE)
 	echo 'ghc6_lib_bdeps="ghc6 (>= $(ProjectVersion)) [$$ghc6_arches], ghc6 (<< $(ProjectVersion)+) [$$ghc6_arches]"' >> debian/ghc6/$(VARFILE)
 	echo 'ghc6_lib_deps="ghc6 (>= $(ProjectVersion)), ghc6 (<< $(ProjectVersion)+)"' >> debian/ghc6/$(VARFILE)
 	echo 'ghc6_app_bdeps="ghc6 [$$ghc6_arches]"' >> debian/ghc6/$(VARFILE)





More information about the Pkg-haskell-commits mailing list