[Pkg-haskell-commits] darcs: haskell-hledger-vty: Compile Setup.hs, work with cmdargs 0.9.

[Clint Adams]

Thu Jan  5 04:51:34 UTC 2012  Clint Adams <clint at debian.org>
  * Compile Setup.hs, work with cmdargs 0.9.
  Ignore-this: d15ec34119d481cd87b7d18987ee1d99

    M ./changelog +7
    M ./control -1 +1
    A ./patches/
    A ./patches/newer-cmdargs.diff
    A ./patches/series
    M ./rules -7 +11

Thu Jan  5 04:51:34 UTC 2012  Clint Adams <clint at debian.org>
  * Compile Setup.hs, work with cmdargs 0.9.
  Ignore-this: d15ec34119d481cd87b7d18987ee1d99
diff -rN -u old-haskell-hledger-vty//changelog new-haskell-hledger-vty//changelog
--- old-haskell-hledger-vty//changelog	2012-01-05 04:52:41.859717489 +0000
+++ new-haskell-hledger-vty//changelog	2012-01-05 04:52:41.866185971 +0000
@@ -1,3 +1,10 @@
+haskell-hledger-vty (0.16.1-2) unstable; urgency=low
+
+  * Don't rely on runhaskell to build.  closes: #654624.
+  * Increase cmdargs upper bound.
+
+ -- Clint Adams <clint at debian.org>  Wed, 04 Jan 2012 20:31:16 -0500
+
 haskell-hledger-vty (0.16.1-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-hledger-vty//control new-haskell-hledger-vty//control
--- old-haskell-hledger-vty//control	2012-01-05 04:52:41.859717489 +0000
+++ new-haskell-hledger-vty//control	2012-01-05 04:52:41.866185971 +0000
@@ -7,7 +7,7 @@
   , ghc
   , ghc-prof
   , libghc-cmdargs-dev (>> 0.8)
-  , libghc-cmdargs-dev (<< 0.9)
+  , libghc-cmdargs-dev (<< 0.10)
   , libghc-cmdargs-prof
   , libghc-hledger-dev (>> 0.16.1)
   , libghc-hledger-dev (<< 0.16.2)
diff -rN -u old-haskell-hledger-vty//patches/newer-cmdargs.diff new-haskell-hledger-vty//patches/newer-cmdargs.diff
--- old-haskell-hledger-vty//patches/newer-cmdargs.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hledger-vty//patches/newer-cmdargs.diff	2012-01-05 04:52:41.866185971 +0000
@@ -0,0 +1,11 @@
+--- a/hledger-vty.cabal
++++ b/hledger-vty.cabal
+@@ -41,7 +41,7 @@
+                  ,hledger-lib == 0.16.1
+                  ,HUnit
+                  ,base >= 3 && < 5
+-                 ,cmdargs >= 0.8   && < 0.9
++                 ,cmdargs >= 0.8   && < 0.10
+                  -- ,containers
+                  -- ,csv
+                  -- ,directory
diff -rN -u old-haskell-hledger-vty//patches/series new-haskell-hledger-vty//patches/series
--- old-haskell-hledger-vty//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hledger-vty//patches/series	2012-01-05 04:52:41.866185971 +0000
@@ -0,0 +1 @@
+newer-cmdargs.diff
diff -rN -u old-haskell-hledger-vty//rules new-haskell-hledger-vty//rules
--- old-haskell-hledger-vty//rules	2012-01-05 04:52:41.771673918 +0000
+++ new-haskell-hledger-vty//rules	2012-01-05 04:52:41.866185971 +0000
@@ -8,26 +8,30 @@
 
 package=hledger-vty
 
-clean:
-	$(checkdir)
-	runhaskell Setup.hs clean
+clean: checkroot
+#	debian/$(package).setup clean
+	rm -f debian/$(package).setup *.o *.hi
 	rm -f build-arch stamp-configure debian/files debian/substvars
+	rm -rf dist
 	rm -rf debian/$(package)
 
+debian/$(package).setup:
+	ghc Setup.hs -o $@
+
 build: build-arch build-indep
 build-indep:
 
 build-arch: stamp-configure
 	$(checkdir)
 
-	runhaskell Setup.hs build
+	debian/$(package).setup build
 
 	touch build-arch
 
-stamp-configure:
+stamp-configure: debian/$(package).setup
 	$(checkdir)
 
-	runhaskell Setup.hs configure --prefix=/usr
+	debian/$(package).setup configure --prefix=/usr
 
 	touch stamp-configure
 
@@ -38,7 +42,7 @@
 binary-arch:	checkroot build
 	$(checkdir)
 
-	runhaskell Setup.hs copy --destdir=$(CURDIR)/debian/$(package)
+	debian/$(package).setup copy --destdir=$(CURDIR)/debian/$(package)
 	rm -rf debian/$(package)/usr/share/doc/$(package)-*
 	cd debian/$(package) && $(INSTALL_DIR) \
 		usr/bin \