[Pkg-haskell-commits] darcs: haskell-happstack: Use ghc instead of ghc6

[Marco Silva]

Sat Jan 15 15:05:56 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: c91d2994aa66ff02608d11f8738b581b

    M ./changelog +6
    M ./control -46 +46
    M ./rules -3 +3

Sat Jan 15 15:05:56 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: c91d2994aa66ff02608d11f8738b581b
diff -rN -u old-haskell-happstack/changelog new-haskell-happstack/changelog
--- old-haskell-happstack/changelog	2011-01-15 15:32:30.758921990 +0000
+++ new-haskell-happstack/changelog	2011-01-15 15:32:30.758921990 +0000
@@ -1,3 +1,9 @@
+haskell-happstack (0.5.0.2-3) UNRELEASED; urgency=low
+
+  * Use ghc instead of ghc
+
+ -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:41:03 -0200
+
 haskell-happstack (0.5.0.2-2) unstable; urgency=low
 
   * Add missing dependency in debian/rules, fixing FTBFS.
diff -rN -u old-haskell-happstack/control new-haskell-happstack/control
--- old-haskell-happstack/control	2011-01-15 15:32:30.758921990 +0000
+++ new-haskell-happstack/control	2011-01-15 15:32:30.758921990 +0000
@@ -7,49 +7,49 @@
  debhelper (>= 7),
  haskell-devscripts (>= 0.7),
  cdbs,
- ghc6,
- ghc6-prof,
- libghc6-binary-dev,
- libghc6-binary-prof,
- libghc6-happstack-data-dev,
- libghc6-happstack-data-prof,
- libghc6-happstack-server-dev,
- libghc6-happstack-server-prof,
- libghc6-happstack-state-dev,
- libghc6-happstack-state-prof,
- libghc6-happstack-ixset-dev,
- libghc6-happstack-ixset-prof,
- libghc6-happstack-util-dev,
- libghc6-happstack-util-prof,
- libghc6-harp-dev,
- libghc6-harp-prof,
- libghc6-hslogger-dev,
- libghc6-hslogger-prof,
- libghc6-hsp-dev,
- libghc6-hsp-prof,
- libghc6-hstringtemplate-dev,
- libghc6-hstringtemplate-prof,
- libghc6-hsx-dev,
- libghc6-hsx-prof,
- libghc6-mtl-dev,
- libghc6-mtl-prof,
- libghc6-text-dev,
- libghc6-text-prof
+ ghc,
+ ghc-prof,
+ libghc-binary-dev,
+ libghc-binary-prof,
+ libghc-happstack-data-dev,
+ libghc-happstack-data-prof,
+ libghc-happstack-server-dev,
+ libghc-happstack-server-prof,
+ libghc-happstack-state-dev,
+ libghc-happstack-state-prof,
+ libghc-happstack-ixset-dev,
+ libghc-happstack-ixset-prof,
+ libghc-happstack-util-dev,
+ libghc-happstack-util-prof,
+ libghc-harp-dev,
+ libghc-harp-prof,
+ libghc-hslogger-dev,
+ libghc-hslogger-prof,
+ libghc-hsp-dev,
+ libghc-hsp-prof,
+ libghc-hstringtemplate-dev,
+ libghc-hstringtemplate-prof,
+ libghc-hsx-dev,
+ libghc-hsx-prof,
+ libghc-mtl-dev,
+ libghc-mtl-prof,
+ libghc-text-dev,
+ libghc-text-prof
 Build-Depends-Indep:
- ghc6-doc,
- libghc6-binary-doc,
- libghc6-happstack-data-doc,
- libghc6-happstack-server-doc,
- libghc6-happstack-state-doc,
- libghc6-happstack-ixset-doc,
- libghc6-happstack-util-doc,
- libghc6-harp-doc,
- libghc6-hslogger-doc,
- libghc6-hsp-doc,
- libghc6-hstringtemplate-doc,
- libghc6-hsx-doc,
- libghc6-mtl-doc,
- libghc6-text-doc
+ ghc-doc,
+ libghc-binary-doc,
+ libghc-happstack-data-doc,
+ libghc-happstack-server-doc,
+ libghc-happstack-state-doc,
+ libghc-happstack-ixset-doc,
+ libghc-happstack-util-doc,
+ libghc-harp-doc,
+ libghc-hslogger-doc,
+ libghc-hsp-doc,
+ libghc-hstringtemplate-doc,
+ libghc-hsx-doc,
+ libghc-mtl-doc,
+ libghc-text-doc
 Standards-Version: 3.9.0
 Homepage: http://hackage.haskell.org/package/happstack
 Vcs-Darcs: http://darcs.debian.org/darcs/pkg-haskell/haskell-happstack
@@ -61,7 +61,7 @@
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
- libghc6-happstack-dev
+ libghc-happstack-dev
 Description: Haskell web framework
  Happstack is a Haskell web framework, designed so that developers can
  prototype quickly, deploy painlessly, scale massively, operate reliably,
@@ -77,7 +77,7 @@
  This package contains the tool used to create and manage a Happstack
  project.
 
-Package: libghc6-happstack-dev
+Package: libghc-happstack-dev
 Architecture: any
 Depends:
  ${haskell:Depends},
@@ -100,7 +100,7 @@
  .
  This package contains the libraries compiled for GHC 6.
 
-Package: libghc6-happstack-prof
+Package: libghc-happstack-prof
 Architecture: any
 Depends:
  ${haskell:Depends},
@@ -122,7 +122,7 @@
  .
  This package contains the profiling libraries compiled for GHC 6.
 
-Package: libghc6-happstack-doc
+Package: libghc-happstack-doc
 Section: doc
 Architecture: all
 Depends:
diff -rN -u old-haskell-happstack/rules new-haskell-happstack/rules
--- old-haskell-happstack/rules	2011-01-15 15:32:30.754921779 +0000
+++ new-haskell-happstack/rules	2011-01-15 15:32:30.758921990 +0000
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-install/happstack:: debian/tmp-inst-ghc6
-	mv debian/tmp-inst-ghc6/usr/bin/happstack debian/happstack/usr/bin
-	mv debian/tmp-inst-ghc6/usr/share/happstack-$(CABAL_VERSION) debian/happstack/usr/share
+install/happstack:: debian/tmp-inst-ghc
+	mv debian/tmp-inst-ghc/usr/bin/happstack debian/happstack/usr/bin
+	mv debian/tmp-inst-ghc/usr/share/happstack-$(CABAL_VERSION) debian/happstack/usr/share