Closes: #571174
authorJoachim Breitner <mail@joachim-breitner.de>
Wed, 24 Feb 2010 11:19:35 +0000 (11:19 +0000)
committerJoachim Breitner <mail@joachim-breitner.de>
Wed, 24 Feb 2010 11:19:35 +0000 (11:19 +0000)
changelog
control
rules

index 83337ca..508fd2f 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+arbtt (0.4.4-2) UNRELEASED; urgency=low
+
+  * No need to shuffle dist/ghc6-dist with current haskell-devscripts
+    (Closes: #571174)
+
+ -- Joachim Breitner <nomeata@debian.org>  Wed, 24 Feb 2010 12:16:00 +0100
+
 arbtt (0.4.4-1) unstable; urgency=low
 
   * New upstream release
diff --git a/control b/control
index 3a9e7bc..e2da574 100644 (file)
--- a/control
+++ b/control
@@ -3,9 +3,9 @@ Section: haskell
 Priority: optional
 Maintainer: Joachim Breitner <nomeata@debian.org>
 Build-Depends: cdbs,
- haskell-devscripts (>= 0.6.16),
+ haskell-devscripts (>= 0.7),
  debhelper (>= 7),
- ghc6 (>= 6.10.4),
+ ghc6,
  libghc6-mtl-dev,
  libghc6-binary-dev,
  libghc6-time-dev,
diff --git a/rules b/rules
index a2c5413..9e3559f 100644 (file)
--- a/rules
+++ b/rules
@@ -14,8 +14,6 @@ doc/users_guide:
 build/$(CABAL_PACKAGE) :: build-ghc6-stamp doc/users_guide
 
 install/$(CABAL_PACKAGE) :: build/$(CABAL_PACKAGE)
-       mv dist-ghc6 dist
        $(DEB_SETUP_BIN_NAME) copy --destdir=debian/$(CABAL_PACKAGE)
        rm -rf debian/$(CABAL_PACKAGE)/usr/share/doc
-       mv dist dist-ghc6