[Pkg-haskell-commits] darcs: ghc: Undo the symlink-workarounds introduced in 7.0.4-3. The -doc work-around is still needed, as the haddock interface version did not change.

[Joachim Breitner]

Sat Jul 30 14:15:04 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Undo the symlink-workarounds introduced in 7.0.4-3. The -doc work-around is still needed, as the haddock interface version did not change.
  Ignore-this: 88b5c7cd2e5dfe11ac1c87da76aba554

    M! ./ghc.postinst -16
    M! ./ghc.triggers -2
    M! ./rules -2

Sat Jul 30 14:15:04 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Undo the symlink-workarounds introduced in 7.0.4-3. The -doc work-around is still needed, as the haddock interface version did not change.
  Ignore-this: 88b5c7cd2e5dfe11ac1c87da76aba554
diff -rN -u old-ghc//ghc.postinst new-ghc//ghc.postinst
--- old-ghc//ghc.postinst	2012-02-03 16:41:21.178251794 +0000
+++ new-ghc//ghc.postinst	2012-02-03 16:41:21.242249327 +0000
@@ -36,22 +36,6 @@
         update-alternatives \
             --install $execdir/haskell-compiler haskell-compiler $execdir/ghc 600 \
             --slave $mandir/man1/haskell-compiler.1.gz haskell-compiler.1.gz $mandir/man1/ghc.1.gz
-	# The package.conf.d path used to contain the ghc version number. This
-	# was dropped in 7.0.4-3, but to be able to use old libraries, we do
-	# this symlinking hack. This can be removed once all packages use the
-	# new path.
-	for path in /var/lib/ghc-7.0.3/package.conf.d /var/lib/ghc-7.0.4/package.conf.d
-        do
-            if [ -d $path -a ! -L $path ]
-            then
-                echo "Turning $path into a symbolic link to /var/lib/ghc/package.conf.d/"
-		# This line should successfully do nothing for an empty directory
-                find $path -maxdepth 1 -mindepth 1 -print0 | xargs -0 -r mv -t /var/lib/ghc/package.conf.d
-                rmdir $path
-                ln -s ../ghc/package.conf.d $path
-            fi
-        done
-
 	$bindir/ghc-pkg recache --global
 	$bindir/ghc-pkg check --global || true
     ;;
diff -rN -u old-ghc//ghc.triggers new-ghc//ghc.triggers
--- old-ghc//ghc.triggers	2012-02-03 16:41:21.178251794 +0000
+++ new-ghc//ghc.triggers	2012-02-03 16:41:21.258247490 +0000
@@ -1,3 +1 @@
 interest /var/lib/ghc/package.conf.d
-interest /var/lib/ghc-7.0.4/package.conf.d
-interest /var/lib/ghc-7.0.3/package.conf.d
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules	2012-02-03 16:41:21.178251794 +0000
+++ new-ghc//rules	2012-02-03 16:41:23.019248450 +0000
@@ -155,8 +155,6 @@
 	# Sort out the package.conf files
 	mkdir -p debian/tmp/var/lib/ghc
 	# Old directories for symlink-workaround. Remove once all libraries use new path
-	mkdir -p debian/tmp/var/lib/ghc-7.0.3/package.conf.d
-	mkdir -p debian/tmp/var/lib/ghc-7.0.4/package.conf.d
 	mv debian/tmp/usr/lib/ghc/package.conf.d \
 	   debian/tmp/var/lib/ghc/
 	rm debian/tmp/var/lib/ghc/package.conf.d/package.cache