[Pkg-haskell-commits] darcs: haskell-devscripts: Add GHC-Package field to the Packages file

[Joachim Breitner]

Sat May 11 12:17:37 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Add GHC-Package field to the Packages file 
  Ignore-this: 92b09545e5051c9a69bb362c3abca6bc

    M ./debian/changelog +1
    M ./dh_haskell_provides -2 +8
    M ./hlibrary.mk +2

Sat May 11 12:17:37 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Add GHC-Package field to the Packages file 
  Ignore-this: 92b09545e5051c9a69bb362c3abca6bc
diff -rN -u old-haskell-devscripts//debian/changelog new-haskell-devscripts//debian/changelog
--- old-haskell-devscripts//debian/changelog	2013-05-11 12:38:50.283196401 +0000
+++ new-haskell-devscripts//debian/changelog	2013-05-11 12:38:50.299022065 +0000
@@ -6,6 +6,7 @@
     profiling is desired.
   * Support installing Cabal-built binaries: Put the name of the binary in
     debian/pkg.haskell-binaries to ship the binary in that package
+  * Add GHC-Package field to the Packages file 
 
  -- Joachim Breitner <nomeata at debian.org>  Sun, 27 Jan 2013 19:35:58 +0100
 
diff -rN -u old-haskell-devscripts//dh_haskell_provides new-haskell-devscripts//dh_haskell_provides
--- old-haskell-devscripts//dh_haskell_provides	2013-05-11 12:38:50.275316063 +0000
+++ new-haskell-devscripts//dh_haskell_provides	2013-05-11 12:38:50.295061410 +0000
@@ -3,7 +3,7 @@
 # Calculated provides substvars for haskell library packages.
 #
 # Copyright (C) 2006-2007 Arjan Oosting <arjan at debian.org>
-# Copyright (C) 2009 Joachim Breitner <nomeata at debian.org>
+# Copyright (C) 2009,2013 Joachim Breitner <nomeata at debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of either:
@@ -83,15 +83,21 @@
                         -e ^haskell:Provides \
                         $sfile > $sfile.tmp || true
 	            echo "haskell:Provides=`provides_for_ghc $cfiles`" >> $sfile.tmp
+		    mv $sfile.tmp $sfile
+	            grep -v \
+                        -e ^haskell:ghc-package \
+                        $sfile > $sfile.tmp || true
+	            echo "haskell:ghc-package=`cabal_package_ids $cfiles`" >> $sfile.tmp
+		    mv $sfile.tmp $sfile
 		    ;;
 		libghc-*-prof|ghc-prof)
 	            grep -v \
                         -e ^haskell:Provides \
                         $sfile > $sfile.tmp || true
 	            echo "haskell:Provides=`provides_for_ghc_prof $cfiles`" >> $sfile.tmp
+		    mv $sfile.tmp $sfile
 		    ;;
 	    esac
-	    mv $sfile.tmp $sfile
 	    ;;
 	*)
 	    ;;
diff -rN -u old-haskell-devscripts//hlibrary.mk new-haskell-devscripts//hlibrary.mk
--- old-haskell-devscripts//hlibrary.mk	2013-05-11 12:38:50.251340340 +0000
+++ new-haskell-devscripts//hlibrary.mk	2013-05-11 12:38:50.311100730 +0000
@@ -32,6 +32,8 @@
 
 DEB_ENABLE_TESTS ?= no
 
+DEB_DH_GENCONTROL_ARGS_libghc-$(CABAL_PACKAGE)-dev += -- '-DGHC-Package=$${haskell:ghc-package}'
+
 ifneq (,$(filter libghc-$(CABAL_PACKAGE)-prof,$(DEB_PACKAGES)))
 ENABLE_PROFILING = --enable-library-profiling
 endif