[Pkg-haskell-commits] darcs: haskell-devscripts: Also install package.conf in version-agnostic path

[Joachim Breitner]

Mon Jul 11 11:06:49 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Also install package.conf in version-agnostic path 
  Ignore-this: 4fcbb1aa6b9695c0da0aad091ce6a2fe

    M ./Dh_Haskell.sh -1 +1
    M ./debian/changelog +6
    M ./debian/control -1 +1
    M ./hlibrary.mk -1 +1

Mon Jul 11 11:06:49 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Also install package.conf in version-agnostic path 
  Ignore-this: 4fcbb1aa6b9695c0da0aad091ce6a2fe
diff -rN -u old-haskell-devscripts//debian/changelog new-haskell-devscripts//debian/changelog
--- old-haskell-devscripts//debian/changelog	2011-07-11 11:14:23.268557500 +0000
+++ new-haskell-devscripts//debian/changelog	2011-07-11 11:14:23.292557578 +0000
@@ -1,3 +1,9 @@
+haskell-devscripts (0.8.7) UNRELEASED; urgency=low
+
+  * Also install package.conf in version-agnostic path 
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Jul 2011 11:19:25 +0200
+
 haskell-devscripts (0.8.6) unstable; urgency=low
 
   * Install .haddock files in version-agnostic path
diff -rN -u old-haskell-devscripts//debian/control new-haskell-devscripts//debian/control
--- old-haskell-devscripts//debian/control	2011-07-11 11:14:23.268557500 +0000
+++ new-haskell-devscripts//debian/control	2011-07-11 11:14:23.280563268 +0000
@@ -13,7 +13,7 @@
 Architecture: all
 Depends: dctrl-tools
   , debhelper
-  , ghc
+  , ghc (>= 7.0.4-3)
   , cdbs
   , ${misc:Depends}
   , html-xml-utils
diff -rN -u old-haskell-devscripts//Dh_Haskell.sh new-haskell-devscripts//Dh_Haskell.sh
--- old-haskell-devscripts//Dh_Haskell.sh	2011-07-11 11:14:23.272557424 +0000
+++ new-haskell-devscripts//Dh_Haskell.sh	2011-07-11 11:14:23.276564460 +0000
@@ -205,7 +205,7 @@
 	*)
 	    ;;
     esac
-    for f in debian/$pkg/var/lib/ghc-*/package.conf.d/*.conf ; do
+    for f in debian/$pkg/var/lib/ghc/package.conf.d/*.conf ; do
 	if [ -f "$f" ] ; then
 	    echo $f
 	    echo " "
diff -rN -u old-haskell-devscripts//hlibrary.mk new-haskell-devscripts//hlibrary.mk
--- old-haskell-devscripts//hlibrary.mk	2011-07-11 11:14:23.268557500 +0000
+++ new-haskell-devscripts//hlibrary.mk	2011-07-11 11:14:23.292557578 +0000
@@ -115,7 +115,7 @@
 		-exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
 	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'`; \
 		$(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \
-		install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc-$(GHC_VERSION)/package.conf.d/$$pkg_config; \
+		install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc/package.conf.d/$$pkg_config; \
 		rm -f $$pkg_config
 	dh_haskell_provides -p$(notdir $@)
 	dh_haskell_depends -p$(notdir $@)