[Pkg-haskell-commits] darcs: cabal-debian: New upstream version 3.7.

[Clint Adams]

Fri Oct  4 23:57:15 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 3.7.

    M ./changelog -2 +8
    M ./control -15 +29
    R ./patches/no-data-files.diff
    M ./patches/series -1
    M ./rules -5 +9

Fri Oct  4 23:57:15 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 3.7.
diff -rN -u old-cabal-debian/changelog new-cabal-debian/changelog
--- old-cabal-debian/changelog	2013-10-04 23:58:30.209562738 +0000
+++ new-cabal-debian/changelog	2013-10-04 23:58:30.217552345 +0000
@@ -1,11 +1,17 @@
-cabal-debian (1.25-2) UNRELEASED; urgency=low
+cabal-debian (3.7-1) unstable; urgency=low
 
+  [ Joachim Breitner ]
   * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
     against experimental
   * Bump standards version, no change
   * Enable compat level 9
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 13 Oct 2012 14:06:58 +0200
+  [ Clint Adams ]
+  * New upstream version.
+    - Builds with newer haskell-debian.  closes: #720683.
+  * Don't use runhaskell to build.  closes: #676476.
+
+ -- Clint Adams <clint at debian.org>  Fri, 04 Oct 2013 19:41:21 -0400
 
 cabal-debian (1.25-1) unstable; urgency=low
 
diff -rN -u old-cabal-debian/control new-cabal-debian/control
--- old-cabal-debian/control	2013-10-04 23:58:30.205543795 +0000
+++ new-cabal-debian/control	2013-10-04 23:58:30.217552345 +0000
@@ -4,21 +4,35 @@
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: Clint Adams <clint at debian.org>
 Build-Depends: debhelper (>= 9)
-             , haskell-devscripts (>= 0.8.13)
-             , ghc
-             , ghc-prof
-             , libghc-unixutils-dev (>> 1.50)
-             , libghc-unixutils-prof
-             , libghc-debian-dev (>> 3.63)
-             , libghc-debian-prof
-             , libghc-mtl-dev
-             , libghc-mtl-prof
-             , libghc-parsec3-dev
-             , libghc-parsec3-prof
-             , libghc-regex-tdfa-dev
-             , libghc-regex-tdfa-prof
-             , libghc-utf8-string-dev
-             , libghc-utf8-string-prof
+  , haskell-devscripts (>= 0.8.13)
+  , ghc
+  , ghc-prof
+  , libghc-ansi-wl-pprint-dev
+  , libghc-ansi-wl-pprint-prof
+  , libghc-data-lens-dev
+  , libghc-data-lens-prof
+  , libghc-debian-dev (>> 3.71)
+  , libghc-debian-prof
+  , libghc-diff-dev
+  , libghc-diff-prof
+  , libghc-hsemail-dev
+  , libghc-hsemail-prof
+  , libghc-hunit-dev
+  , libghc-hunit-prof
+  , libghc-mtl-dev
+  , libghc-mtl-prof
+  , libghc-parsec3-dev
+  , libghc-parsec3-prof
+  , libghc-puremd5-dev
+  , libghc-puremd5-prof
+  , libghc-regex-tdfa-dev
+  , libghc-regex-tdfa-prof
+  , libghc-syb-dev
+  , libghc-syb-prof
+  , libghc-text-dev
+  , libghc-text-prof
+  , libghc-utf8-string-dev
+  , libghc-utf8-string-prof
 Standards-Version: 3.9.4
 Homepage: http://src.seereason.com/cabal-debian
 
diff -rN -u old-cabal-debian/patches/no-data-files.diff new-cabal-debian/patches/no-data-files.diff
--- old-cabal-debian/patches/no-data-files.diff	2013-10-04 23:58:30.205543795 +0000
+++ new-cabal-debian/patches/no-data-files.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
---- a/cabal-debian.cabal
-+++ b/cabal-debian.cabal
-@@ -12,14 +12,6 @@
- Description:
-   A program which creates a debian subdirectory containing the required
-   files to build a deb.
--Data-Files:
--  debian/cabal-debian.1,
--  debian/cabal-debian.manpages,
--  debian/changelog,
--  debian/compat,
--  debian/control,
--  debian/copyright,
--  debian/rules
- 
- Source-Repository head
-   type: darcs
diff -rN -u old-cabal-debian/patches/series new-cabal-debian/patches/series
--- old-cabal-debian/patches/series	2013-10-04 23:58:30.205543795 +0000
+++ new-cabal-debian/patches/series	2013-10-04 23:58:30.221548729 +0000
@@ -1,2 +1 @@
-no-data-files.diff
 man-page.diff
diff -rN -u old-cabal-debian/rules new-cabal-debian/rules
--- old-cabal-debian/rules	2013-10-04 23:58:30.197561233 +0000
+++ new-cabal-debian/rules	2013-10-04 23:58:30.221548729 +0000
@@ -10,24 +10,28 @@
 
 clean:
 	$(checkdir)
+	rm -f debian/$(package).setup
 
 	rm -f debian/files debian/substvars build-arch stamp-*
 	rm -rf dist 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
+	touch $@
 
-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 \