[Pkg-haskell-commits] darcs: hscolour: ghc6 → ghc

[Joachim Breitner]

Wed Apr 13 06:38:58 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * ghc6 [_\e2_][_\86_][_\92_] ghc
  Ignore-this: f97c11eaa6e26958444485996d4ff1f8

    M ./changelog -1 +2
    M ./control -10 +10
    M ./hscolour-wrapper -2 +2
    M ./hscolour.install -1 +1
    M ./rules -4 +4

Wed Apr 13 06:38:58 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * ghc6 → ghc
  Ignore-this: f97c11eaa6e26958444485996d4ff1f8
diff -rN -u old-hscolour/changelog new-hscolour/changelog
--- old-hscolour/changelog	2011-04-13 06:40:07.654430162 +0000
+++ new-hscolour/changelog	2011-04-13 06:40:07.666430792 +0000
@@ -7,8 +7,9 @@
   
   [ Joachim Breitner ]
   * Remove doc-base file per Haskell policy
+  * ghc6 → ghc
 
- -- Erik de Castro Lopo <erikd at mega-nerd.com>  Thu, 22 Jul 2010 21:27:22 +1000
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 13 Apr 2011 12:04:52 +0530
 
 hscolour (1.16-1) unstable; urgency=low
 
diff -rN -u old-hscolour/control new-hscolour/control
--- old-hscolour/control	2011-04-13 06:40:07.654430162 +0000
+++ new-hscolour/control	2011-04-13 06:40:07.662430582 +0000
@@ -5,10 +5,10 @@
 Uploaders: Erik de Castro Lopo <erikd at mega-nerd.com>
 Build-Depends: debhelper (>= 7),
  cdbs,
- haskell-devscripts (>= 0.7),
- ghc6,
- ghc6-prof
-Build-Depends-Indep: ghc6-doc
+ haskell-devscripts (>= 0.8),
+ ghc,
+ ghc-prof
+Build-Depends-Indep: ghc-doc
 Standards-Version: 3.9.0
 Homepage: http://hackage.haskell.org/package/hscolour
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/hscolour
@@ -23,7 +23,7 @@
  with <font> tags, HTML 4.01 with CSS, LaTeX, and mIRC chat client
  codes.
 
-Package: libghc6-hscolour-dev
+Package: libghc-hscolour-dev
 Architecture: any
 Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Suggests: ${haskell:Suggests}, drift (>= 2.2.0)
@@ -35,9 +35,9 @@
  with <font> tags, HTML 4.01 with CSS, LaTeX, and mIRC chat client
  codes.
  .
- This package contains the libraries compiled for GHC 6.
+ This package contains the libraries compiled for GHC.
 
-Package: libghc6-hscolour-prof
+Package: libghc-hscolour-prof
 Architecture: any
 Depends: ${haskell:Depends}, ${misc:Depends}
 Suggests: ${haskell:Suggests}
@@ -49,15 +49,15 @@
  with <font> tags, HTML 4.01 with CSS, LaTeX, and mIRC chat client
  codes.
  .
- This package contains the profiling libraries compiled for GHC 6.
+ This package contains the profiling libraries compiled for GHC.
 
-Package: libghc6-hscolour-doc
+Package: libghc-hscolour-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}, ${haskell:Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
-Description: Documentation for libghc6-hscolour-dev
+Description: Documentation for libghc-hscolour-dev
  .
  HsColour currently has five output formats: ANSI terminal codes, HTML 3.2
  with <font> tags, HTML 4.01 with CSS, LaTeX, and mIRC chat client
diff -rN -u old-hscolour/hscolour.install new-hscolour/hscolour.install
--- old-hscolour/hscolour.install	2011-04-13 06:40:07.654430162 +0000
+++ new-hscolour/hscolour.install	2011-04-13 06:40:07.662430582 +0000
@@ -1 +1 @@
-dist-ghc6/build/HsColour/HsColour	usr/bin
+dist-ghc/build/HsColour/HsColour	usr/bin
diff -rN -u old-hscolour/hscolour-wrapper new-hscolour/hscolour-wrapper
--- old-hscolour/hscolour-wrapper	2011-04-13 06:40:07.654430162 +0000
+++ new-hscolour/hscolour-wrapper	2011-04-13 06:40:07.662430582 +0000
@@ -5,8 +5,8 @@
 # If the real HsColour exists, run it.
 if test -x dist/build/HsColour/HsColour ; then
 	exec dist/build/HsColour/HsColour "$@"
-elif test -x dist-ghc6/build/HsColour/HsColour ; then
-	exec dist-ghc6/build/HsColour/HsColour "$@"
+elif test -x dist-ghc/build/HsColour/HsColour ; then
+	exec dist-ghc/build/HsColour/HsColour "$@"
 	fi
 	
 # If the real HsColour doesn't exist, at least do something sensible when
diff -rN -u old-hscolour/rules new-hscolour/rules
--- old-hscolour/rules	2011-04-13 06:40:07.654430162 +0000
+++ new-hscolour/rules	2011-04-13 06:40:07.662430582 +0000
@@ -6,15 +6,15 @@
 
 DEB_BUILD_DEPENDENCIES = build-arch
 
-# In order to generated colourised HTML for the libghc6-hscolour-doc package
+# In order to generated colourised HTML for the libghc-hscolour-doc package
 # we need a special hack because the colour docs are generated by an executable
 # create by this package and we don't want this package to depend on itself.
 
 pwd := $(shell pwd)
 
-# Modify the GHC6 configure parameters to point to a local version of
+# Modify the GHC configure parameters to point to a local version of
 # HsColour.
-DEB_SETUP_GHC6_CONFIGURE_ARGS += --with-hscolour=$(pwd)/hscolour-wrapper
+DEB_SETUP_GHC_CONFIGURE_ARGS += --with-hscolour=$(pwd)/hscolour-wrapper
 
 # Generate a fake version of the executable (a trivial shell script) which is
 # available at configure time. This shell script will exec the real HsColour
@@ -26,7 +26,7 @@
 	chmod u+x $@
 
 # Force generation of the wrapper script.
-dist-ghc6 : hscolour-wrapper
+dist-ghc : hscolour-wrapper
 
 clean ::
 	rm -f hscolour-wrapper