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

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


Thu Oct 12 01:22:24 UTC 2006  Ian Lynagh (wibble) <igloo at debian.org>
  * Import of ghc6_6.6-1.dsc

    M ./changelog +47
    M ./control -14 +1
    M ./copyright -1 +1
    R ./examples/
    R ./examples/HOpenGL/
    R ./examples/HOpenGL/Cube.hs
    R ./examples/HOpenGL/Makefile
    M ./flags.xsl.in +3
    R ./ghc6-hopengl.README.debian
    R ./ghc6-hopengl.examples
    R ./ghc6-hopengl.postinst.in
    R ./ghc6-hopengl.prerm.in
    M ./ghc6.docs -2 +2
    M ./rules -40 +35
    M ./scripts.mk -3

Thu Oct 12 01:22:24 UTC 2006  Ian Lynagh (wibble) <igloo at debian.org>
  * Import of ghc6_6.6-1.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:07:05.959410901 +0000
+++ new-ghc/changelog	2011-01-15 06:07:06.179422488 +0000
@@ -1,3 +1,50 @@
+ghc6 (6.6-1) unstable; urgency=low
+
+  * New upstream version.
+  * Drop ghc6-hopengl package as HOpenGL is now split off from the
+    GHC core.
+  * Removed:
+    * ghc6-hopengl.README.debian
+    * ghc6-hopengl.examples
+    * ghc6-hopengl.postinst.in
+    * ghc6-hopengl.prerm.in
+  * Removed opengl examples.
+  * debian/scripts.mk no longer makes:
+    * debian/ghc6-hopengl.postinst
+    * debian/ghc6-hopengl.prerm
+  * Removed all opengl-related commands from debian/rules.
+  * Drop build-deps on
+      xlibmesa-gl-dev, libglu1-xorg-dev | libglu-dev, libglut3-dev
+    now we don't build the OpenGL libs.
+  * Added note to manpage that ghci is not yet available on all arches.
+  * Add ppc64 to the list of arches that have ghc6. Closes: #375623.
+  * Update locations of README and ANNOUNCE in ghc6.docs.
+  * Don't include ghc/mk/version.mk in debian/scripts.mk as it no longer
+    exists. Instead, get ProjectVersion with some shell magic.
+  * Don't include ghc/mk/version.mk in debian/scripts.mk as it no longer
+    exists. Instead, pass $(ProjectVersion) in from debian/rules.
+  * Remove mk/build.mk before we start filling it so the commands can be
+    more symmetric.
+  * Don't build the threaded RTS except on x86/amd64.
+  * Don't try to link ghc6 with the threaded RTS except on x86/amd64.
+  * Remove debian/test-build before creating it, so we can restart
+    builds part-way through without them falling over.
+  * Various paths in debian/rules lose their ghc/ prefix.
+  * Clean up debian/test-build/ after doing the test.
+  * hslibs no longer exists, so remove everything relating to it in
+    debian/rules.
+  * Remove register declarations from rts/StgCRun.c that break the
+    unregisterised build on alpha.
+  * Add to compiler/cmm/PprC.hs an option for loads and stores to be
+    printed in a way that works if they are not aligned as the arch
+    wishes. Enable this option for alpha.
+  * Remove the --source-module argument to haddock in mk/package.mk
+    as haddock 0.7 doesn't support it.
+  * Re-add the -optP-P when generating .raw-hs files as haddock 0.7
+    doesn't cope with line numbers in the files.
+
+ -- Ian Lynagh (wibble) <igloo at debian.org>  Thu, 12 Oct 2006 01:22:24 +0000
+
 ghc6 (6.4.2-2) unstable; urgency=low
 
   * Have ghc-pkg not create ~/.ghc when it doesn't need to, and return
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:07:05.959410901 +0000
+++ new-ghc/control	2011-01-15 06:07:06.111418906 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ian Lynagh (wibble) <igloo at debian.org>
 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, libx11-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml
+Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libreadline5-dev | libreadline-dev, time, xutils, devscripts, haddock (>= 0.6), ghc6, cpio, libx11-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml
 
 Package: ghc6
 Architecture: any
@@ -21,19 +21,6 @@
  Alternatively, there is an online version at
  http://haskell.org/onlinereport/.
 
-Package: ghc6-hopengl
-Section: devel
-Architecture: any
-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 | libc6.1-dev | libc-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
- This package contains additional HOpenGL libraries, including suitable
- profiling libraries for the Glorious Glasgow Haskell Compilation
- system (GHC).
- .
- The documentation for HOpenGL can be found in the ghc6-doc package. 
-
 Package: ghc6-prof
 Section: devel
 Architecture: any
diff -rN -u old-ghc/copyright new-ghc/copyright
--- old-ghc/copyright	2011-01-15 06:07:05.959410901 +0000
+++ new-ghc/copyright	2011-01-15 06:07:06.103418485 +0000
@@ -4,7 +4,7 @@
 released into the public domain.
 
 It was downloaded from
-http://www.haskell.org/ghc/dist/6.4.2/ghc-6.4.2-src.tar.bz2
+http://www.haskell.org/ghc/dist/6.6/ghc-6.6-src.tar.bz2
 
 Upstream Authors: The GHC team
     Simon Peyton Jones	<simonpj at microsoft.com>
diff -rN -u old-ghc/examples/HOpenGL/Cube.hs new-ghc/examples/HOpenGL/Cube.hs
--- old-ghc/examples/HOpenGL/Cube.hs	2011-01-15 06:07:05.955410690 +0000
+++ new-ghc/examples/HOpenGL/Cube.hs	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-
--- Written by Ian Lynagh <igloo at debian.org> in 2003.
--- Released into the public domain.
-
-module Main (main) where
-
-import Graphics.UI.GLUT
-import System(ExitCode(..), exitWith)
-import System.Time (getClockTime, ClockTime(..))
-import Data.IORef
-
-type St = (ClockTime, GLfloat, GLfloat, GLfloat)
-
-dx, dy, dz :: GLfloat
-dx = 0.02
-dy = 0.05
-dz = 0.09
-
-red, green, yellow, blue, purple, cyan :: Color3 GLfloat
-red    = Color3 1 0 0
-green  = Color3 0 1 0
-yellow = Color3 1 1 0
-blue   = Color3 0 0 1
-purple = Color3 1 0 1
-cyan   = Color3 0 1 1
-
-main :: IO ()
-main = do getArgsAndInitialize
-          initialDisplayMode $= [ WithDepthBuffer, DoubleBuffered, RGBAMode ]
-          _win <- createWindow "Hello World"
-          myInit
-          depthFunc $= Just Less
-          drawBuffer $= BackBuffers
-          t <- getClockTime
-          ref <- newIORef (t, 0, 0, 0)
-          displayCallback $= (display ref)
-          keyboardMouseCallback $= Just keyboardMouse
-          idleCallback $= Just (inc_anim ref)
-          mainLoop
-
-inc_anim :: IORef St -> IO ()
-inc_anim x = do (t, r_x, r_y, r_z) <- readIORef x
-                t' <- getClockTime
-                let d = fromIntegral $ getMilliSecDiff t' t
-                writeIORef x (t', r_x + d*dx, r_y + d*dy, r_z + d*dz)
-                draw_colourful_cube x
-
-myInit :: IO () 
-myInit = do clearColor $= (Color4 0.0 0.0 0.0 0.0)
-            matrixMode $= Projection
-            loadIdentity
-            -- ortho 0.0 1.0 0.0 1.0 (-1.0) 1.0
-            -- frustum left right bottom top near far
-            frustum (-1) 1 (-1) 1 (-1) 40
-            matrixMode $= Modelview 0
-
-keyboardMouse :: KeyboardMouseCallback
-keyboardMouse (Char '\27') _ _ _ = exitWith ExitSuccess
-keyboardMouse (Char 'q')   _ _ _ = exitWith ExitSuccess
-keyboardMouse _ _ _ _ = return ()
-
-display :: IORef St -> DisplayCallback
-display x = draw_colourful_cube x
-
-draw_colourful_cube :: IORef St -> IO ()
-draw_colourful_cube x =
-               do (_, r_x, r_y, r_z) <- readIORef x
-                  clear [DepthBuffer, ColorBuffer]
-                  loadIdentity
-                  rotate r_x (Vector3 1 0 0 :: Vector3 GLfloat)
-                  rotate r_y (Vector3 0 1 0 :: Vector3 GLfloat)
-                  rotate r_z (Vector3 0 0 1 :: Vector3 GLfloat)
-                  mapM_ draw_face (zip colours faces)
-                  swapBuffers
-    where draw_face :: (Color3 GLfloat, IO ()) -> IO ()
-          draw_face (colour, face) = do color colour
-                                        renderPrimitive Quads face
-          faces = map (mapM_ vertex) face_vertices :: [IO ()]
-          colours = [red, green, yellow, blue, purple, cyan]
-          face_vertices = [
-                 [Vertex3     to     to     to,
-                  Vertex3   from     to     to,
-                  Vertex3   from   from     to,
-                  Vertex3     to   from     to],
-                 [Vertex3     to     to   from,
-                  Vertex3   from     to   from,
-                  Vertex3   from   from   from,
-                  Vertex3     to   from   from],
-                 [Vertex3     to     to     to,
-                  Vertex3   from     to     to,
-                  Vertex3   from     to   from,
-                  Vertex3     to     to   from],
-                 [Vertex3     to   from     to,
-                  Vertex3   from   from     to,
-                  Vertex3   from   from   from,
-                  Vertex3     to   from   from],
-                 [Vertex3     to     to     to,
-                  Vertex3     to   from     to,
-                  Vertex3     to   from   from,
-                  Vertex3     to     to   from],
-                 [Vertex3   from     to     to,
-                  Vertex3   from   from     to,
-                  Vertex3   from   from   from,
-                  Vertex3   from     to   from]]
-
-from, to :: GLfloat
-from = -0.4
-to   =  0.4
-
-getMilliSecDiff :: ClockTime -> ClockTime -> Integer
-getMilliSecDiff (TOD s1 u1) (TOD s2 u2) =
-    let d = (s1 - s2) * sec + u1 `div` to_milli - u2 `div` to_milli
-    in if d >= 0 then d else error "Time going backwards"
-  where sec = 10^(3 :: Int)
-        to_milli = 10^(9 :: Int)
-
diff -rN -u old-ghc/examples/HOpenGL/Makefile new-ghc/examples/HOpenGL/Makefile
--- old-ghc/examples/HOpenGL/Makefile	2011-01-15 06:07:05.955410690 +0000
+++ new-ghc/examples/HOpenGL/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-
-all:
-	ghc6 -Wall --make Cube -o cube
-
-clean:
-	rm -f *.o *.hi cube
-
diff -rN -u old-ghc/flags.xsl.in new-ghc/flags.xsl.in
--- old-ghc/flags.xsl.in	2011-01-15 06:07:05.955410690 +0000
+++ new-ghc/flags.xsl.in	2011-01-15 06:07:06.111418906 +0000
@@ -35,6 +35,9 @@
 and
 .B ghci
 commands.
+Note that
+.B ghci
+is not yet available on all architectures.
 Extensive documentation is available in various other formats
 including DVI, PostScript and HTML; see below.
 
diff -rN -u old-ghc/ghc6.docs new-ghc/ghc6.docs
--- old-ghc/ghc6.docs	2011-01-15 06:07:05.955410690 +0000
+++ new-ghc/ghc6.docs	2011-01-15 06:07:05.975411744 +0000
@@ -1,3 +1,3 @@
-ghc/README
-ghc/ANNOUNCE
+README
+ANNOUNCE
 
diff -rN -u old-ghc/ghc6-hopengl.examples new-ghc/ghc6-hopengl.examples
--- old-ghc/ghc6-hopengl.examples	2011-01-15 06:07:05.955410690 +0000
+++ new-ghc/ghc6-hopengl.examples	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-debian/examples/HOpenGL/Makefile
-debian/examples/HOpenGL/Cube.hs
-
diff -rN -u old-ghc/ghc6-hopengl.postinst.in new-ghc/ghc6-hopengl.postinst.in
--- old-ghc/ghc6-hopengl.postinst.in	2011-01-15 06:07:05.955410690 +0000
+++ new-ghc/ghc6-hopengl.postinst.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#! /bin/sh
-# postinst script for ghc6-hopengl
-#
-# SOURCE: ghc6-hopengl.postinst.in
-set -e
-
-execdir=/usr/bin
-libdir=/usr/lib/ghc- at VERSION@
-bindir=$libdir/bin
-mandir=/usr/share/man
-
-# 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)
-        $bindir/ghc-pkg update $libdir/package.conflets/OpenGL.package.conf
-        $bindir/ghc-pkg update $libdir/package.conflets/GLUT.package.conf
-    ;;
-    *)
-        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-hopengl.prerm.in new-ghc/ghc6-hopengl.prerm.in
--- old-ghc/ghc6-hopengl.prerm.in	2011-01-15 06:07:05.955410690 +0000
+++ new-ghc/ghc6-hopengl.prerm.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-#! /bin/sh
-# prerm script for ghc6-hopengl
-#
-# SOURCE: ghc6-hopengl.prerm.in
-
-set -e
-
-execdir=/usr/bin
-libdir=/usr/lib/ghc- at VERSION@
-bindir=$libdir/bin
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/doc/packaging-manual/
-
-case "$1" in
-    remove|upgrade|deconfigure|failed-upgrade)
-        $bindir/ghc-pkg unregister GLUT
-        $bindir/ghc-pkg unregister OpenGL
-    ;;
-    *)
-        echo "prerm 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-hopengl.README.debian new-ghc/ghc6-hopengl.README.debian
--- old-ghc/ghc6-hopengl.README.debian	2011-01-15 06:07:05.955410690 +0000
+++ new-ghc/ghc6-hopengl.README.debian	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-
-HOpenGL was built as a part of the GHC compiler.  Note that this is
--not- the 'official' (aka. standalone) version of HOpenGL.  Due to the
-hierarchical library transition, not everything is working yet.  See
-<URL:http://bugs.debian.org/156339:> for the full story.
-
-
-Documentation for the HOpenGL libraries can be found in the ghc6-doc
-package.
-
-Additional material, examples, screenshots, tutorials etc. are
-available online:
-
-http://www.haskell.org/HOpenGL/
-http://www.cin.ufpe.br/~haskell/hopengl/
-
-
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:07:05.955410690 +0000
+++ new-ghc/rules	2011-01-15 06:07:06.179422488 +0000
@@ -20,7 +20,7 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-include ghc/mk/version.mk
+ProjectVersion=$(shell awk -F\' "/^PACKAGE_VERSION='[0-9.]+'\$$/ { print \$$2 }" configure)
 
 GHC=$(firstword $(shell bash -c "type -p ghc6 ghc"))
 EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
@@ -33,7 +33,8 @@
 
 	touch configure
 
-	echo "XMLDocWays   := html" > mk/build.mk
+	rm -f mk/build.mk
+	echo "XMLDocWays := html" >> 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)' ''
@@ -41,6 +42,9 @@
 	echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
 	echo "GhcWithInterpreter=NO" >> mk/build.mk
 	echo "SplitObjs=NO" >> mk/build.mk
+	# The threaded RTS doesn't seem happy on non-x86/amd64
+	echo 'GhcRTSWays := $$(shell echo $$(GhcRTSWays) | sed "s/\<[a-z_]*thr[a-z_]*\>//g")' >> mk/build.mk
+	echo "GhcNotThreaded=YES" >> mk/build.mk
 endif
 ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	echo "SRC_HC_OPTS   += -H32m -O0" >> mk/build.mk
@@ -60,28 +64,30 @@
 	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) --prefix=/usr --bindir='$${libdir}/bin' $(EXTRA_CONFIGURE_FLAGS)
 	$(MAKE)
 
+	rm -rf debian/test-build
 	mkdir debian/test-build
 	echo 'main = putStrLn "Foo"' > debian/test-build/foo.hs
-	ghc/compiler/stage2/ghc-inplace debian/test-build/foo.hs -o debian/test-build/foo
-	[ "$$(debian/test-build/foo)" = "Foo" ]                    
+	compiler/stage2/ghc-inplace debian/test-build/foo.hs -o debian/test-build/foo
+	[ "$$(debian/test-build/foo)" = "Foo" ]
 	rm debian/test-build/*
 	echo 'main = putStrLn "Foo"' > debian/test-build/foo.hs
-	ghc/compiler/stage2/ghc-inplace debian/test-build/foo.hs -o debian/test-build/foo -O2
+	compiler/stage2/ghc-inplace debian/test-build/foo.hs -o debian/test-build/foo -O2
 	[ "$$(debian/test-build/foo)" = "Foo" ]
+	rm debian/test-build/*
 
-	$(MAKE) -f debian/scripts.mk all
+	ProjectVersion=$(ProjectVersion) $(MAKE) -f debian/scripts.mk all
 	# Put some entities before the <?xml tag and then manpagify flags.xml
-	{ head -1 ghc/docs/users_guide/flags.xml; \
+	{ head -1 docs/users_guide/flags.xml; \
 	  echo "<!DOCTYPE sect1 [<!ENTITY ndash  \"-\"> \
 	                         <!ENTITY ldquo  \"\`\"> \
 	                         <!ENTITY rdquo  \"'\">]>"; \
-	  tail -n +2 ghc/docs/users_guide/flags.xml; } \
+	  tail -n +2 docs/users_guide/flags.xml; } \
 	      | xsltproc debian/flags.xsl - > debian/ghc6.1
 	for m in ghci6 ghc-$(ProjectVersion) ghci-$(ProjectVersion); do echo ".so man1/ghc6.1" > debian/$$m.1; done
-	cp ghc/utils/hp2ps/hp2ps.1 debian/hp2ps-ghc6.1
+	cp utils/hp2ps/hp2ps.1 debian/hp2ps-ghc6.1
 	echo debian/*.1 > debian/ghc6.manpages
 
 	touch build-stamp
@@ -101,39 +107,23 @@
 	cd libraries && find . \( -type f -o -type l \) \
 	                       \( -name "*.hs" -o -name "*.lhs" \) -print0 \
 	    | cpio -updV0 ../debian/ghc6-libsrc/usr/share/doc/ghc6-libsrc
-	cd hslibs    && find . \( -type f -o -type l \) \
-	                       \( -name "*.hs" -o -name "*.lhs" \) -print0 \
-	    | cpio -updV0 ../debian/ghc6-libsrc/usr/share/doc/ghc6-libsrc
 
-	# Take out the files for the hopengl package
-	find debian/tmp -type f | grep "OpenGL\|GLUT" > debian/ghc6-hopengl.install
-	# Take out the profiling files not yet accounted for, and put then
-	# in ghc6-prof
-	{ find debian/tmp \( -type f -o -type l \) \
-	                  \( -name "*.p_hi" -o -name "*_p.a" \) ; \
-	  cat debian/ghc6-hopengl.install; \
-	  cat debian/ghc6-hopengl.install; } \
-	    | sort | uniq -u > debian/ghc6-prof.install
+	# Put all the profiling files in ghc6-prof
+	find debian/tmp \( -type f -o -type l \) \
+	                \( -name "*.p_hi" -o -name "*_p.a" \) \
+	    > debian/ghc6-prof.install
 	# Take anything left and put it in ghc6 itself
 	{ find debian/tmp -type f -o -type l ; \
-	  cat debian/ghc6-hopengl.install debian/ghc6-prof.install; \
-	  cat debian/ghc6-hopengl.install debian/ghc6-prof.install; } \
+	  cat debian/ghc6-prof.install; \
+	  cat debian/ghc6-prof.install; } \
 	    | sort | uniq -u > debian/ghc6.install
 	dh_install
 	/usr/bin/install -c -m 755 -d debian/ghc6/usr/bin
-	
+
 	# Sort out the package.conf files
-	ghc/utils/ghc-pkg/ghc-pkg-inplace unregister GLUT -f \
-	    debian/ghc6/usr/lib/ghc-$(ProjectVersion)/package.conf
-	ghc/utils/ghc-pkg/ghc-pkg-inplace unregister OpenGL -f \
-	    debian/ghc6/usr/lib/ghc-$(ProjectVersion)/package.conf
 	mv debian/ghc6/usr/lib/ghc-$(ProjectVersion)/package.conf \
 	   debian/ghc6/usr/lib/ghc-$(ProjectVersion)/package.conf.shipped
-	/usr/bin/install -c -m 755 -d \
-	    debian/ghc6-hopengl/usr/lib/ghc-$(ProjectVersion)/package.conflets
-	cp libraries/OpenGL/package.conf.installed debian/ghc6-hopengl/usr/lib/ghc-$(ProjectVersion)/package.conflets/OpenGL.package.conf
-	cp libraries/GLUT/package.conf.installed debian/ghc6-hopengl/usr/lib/ghc-$(ProjectVersion)/package.conflets/GLUT.package.conf
-	PACKAGE=`ghc/utils/ghc-pkg/ghc-pkg-inplace list -f debian/ghc6/usr/lib/ghc-$(ProjectVersion)/package.conf.shipped | perl -ne 'print if $$foo; $$foo = 1 if /^debian/' | tr '\n,A-Z' '  a-z' | sed -e "s/([^)]*)//g" -e "s/-[0-9]\+\(\.[0-9]\+\)*//g" -e [...incomplete...]



More information about the Pkg-haskell-commits mailing list