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

[Marco Silva]

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

    M ./changelog +4
    M ./control -10 +10
    M ./rules -2 +2

Sat Jan 15 15:05:46 UTC 2011  Marco Silva <marcot at debian.org>
  * Use ghc instead of ghc6
  Ignore-this: 44ba66e0824201e4e2282f6e02dd757f
diff -rN -u old-bluetile/changelog new-bluetile/changelog
--- old-bluetile/changelog	2011-01-15 15:14:03.768566997 +0000
+++ new-bluetile/changelog	2011-01-15 15:14:03.776567418 +0000
@@ -1,7 +1,11 @@
 bluetile (0.5.2-1) UNRELEASED; urgency=low
 
+  [ Joachim Breitner ]
   * New upstream release
 
+  [ Marco Silva ]
+  * Use ghc instead of ghc
+
  -- Joachim Breitner <nomeata at debian.org>  Sat, 31 Jul 2010 19:50:01 +0200
 
 bluetile (0.5.1-2) unstable; urgency=low
diff -rN -u old-bluetile/control new-bluetile/control
--- old-bluetile/control	2011-01-15 15:14:03.768566997 +0000
+++ new-bluetile/control	2011-01-15 15:14:03.772567208 +0000
@@ -6,16 +6,16 @@
 Build-Depends: debhelper (>= 7)
   , cdbs
   , haskell-devscripts (>= 0.7)
-  , ghc6
-  , ghc6-prof
-  , libghc6-mtl-dev
-  , libghc6-xmonad-dev (>= 0.9.1)
-  , libghc6-xmonad-contrib-dev (>= 0.9.1)
-  , libghc6-x11-dev (>= 1.4)
-  , libghc6-gtk-dev
-  , libghc6-glade-dev
-  , libghc6-regex-compat-dev
-  , libghc6-configfile-dev
+  , ghc
+  , ghc-prof
+  , libghc-mtl-dev
+  , libghc-xmonad-dev (>= 0.9.1)
+  , libghc-xmonad-contrib-dev (>= 0.9.1)
+  , libghc-x11-dev (>= 1.4)
+  , libghc-gtk-dev
+  , libghc-glade-dev
+  , libghc-regex-compat-dev
+  , libghc-configfile-dev
 Standards-Version: 3.9.1
 Homepage: http://hackage.haskell.org/package/bluetile
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/bluetile
diff -rN -u old-bluetile/rules new-bluetile/rules
--- old-bluetile/rules	2011-01-15 15:14:03.768566997 +0000
+++ new-bluetile/rules	2011-01-15 15:14:03.772567208 +0000
@@ -5,11 +5,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-build/$(CABAL_PACKAGE) :: build-ghc6-stamp
+build/$(CABAL_PACKAGE) :: build-ghc-stamp
 
 install/$(CABAL_PACKAGE) :: build/$(CABAL_PACKAGE)
 	dh_installwm
-	$(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc6 --destdir=debian/$(CABAL_PACKAGE)
+	$(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/$(CABAL_PACKAGE)
 	rm -rf debian/$(CABAL_PACKAGE)/usr/share/doc
 	install -D -m 0644 misc/gnome-bluetile-session.desktop debian/bluetile/usr/share/xsessions/gnome-bluetile.desktop
 	install -D -m 0644 misc/bluetile.desktop debian/bluetile/usr/share/applications/bluetile.desktop