[Pkg-haskell-commits] darcs: haskell-devscripts: Use a different path to store the extra-packages files, independent of Cabal's file scheme.

[Joachim Breitner]

Sun Dec 21 18:44:31 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Use a different path to store the extra-packages files, independent of Cabal's file scheme.

    M ./debian/changelog +7
    M ./dh_haskell_extra_depends -1 +1
    M ./hlibrary.mk -1 +2

Sun Dec 21 18:44:31 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Use a different path to store the extra-packages files, independent of Cabal's file scheme.
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog	2014-12-21 18:59:02.152366186 +0000
+++ new-haskell-devscripts/debian/changelog	2014-12-21 18:59:02.168366190 +0000
@@ -1,3 +1,10 @@
+haskell-devscripts (0.9.2) UNRELEASED; urgency=medium
+
+  * Use a different path to store the extra-packages files, independent of
+    Cabal's file scheme.
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 21 Dec 2014 19:43:49 +0100
+
 haskell-devscripts (0.9.1) experimental; urgency=medium
 
   * Move binary-or-shlib-defines-rpath override to the right target.
diff -rN -u old-haskell-devscripts/dh_haskell_extra_depends new-haskell-devscripts/dh_haskell_extra_depends
--- old-haskell-devscripts/dh_haskell_extra_depends	2014-12-21 18:59:02.152366186 +0000
+++ new-haskell-devscripts/dh_haskell_extra_depends	2014-12-21 18:59:02.164366189 +0000
@@ -59,7 +59,7 @@
 extradeps=''
 for dep in `cabal_depends $files` ; do
     dep_package_ver=`echo $dep | grep '^.\+-[0-9\.]\+-................................$' | sed 's|^\(.\+\)-\([0-9.]\+\)-[0-9a-f]\+$|\1-\2|'`
-    extra_packages_file=/usr/lib/haskell-packages/ghc/lib/$dep_package_ver/extra-packages
+    extra_packages_file=/usr/lib/haskell-packages/extra-packages/$dep_package_ver
     if [ -f $extra_packages_file ] ; then
         extradeps="$extradeps, `cat $extra_packages_file`"
     fi
diff -rN -u old-haskell-devscripts/hlibrary.mk new-haskell-devscripts/hlibrary.mk
--- old-haskell-devscripts/hlibrary.mk	2014-12-21 18:59:02.152366186 +0000
+++ new-haskell-devscripts/hlibrary.mk	2014-12-21 18:59:02.164366189 +0000
@@ -169,7 +169,8 @@
 		install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc/package.conf.d/$$pkg_config; \
 		rm -f $$pkg_config
 	if [ 'z$(DEB_GHC_EXTRA_PACKAGES)' != 'z' ] ; then \
-		echo '$(DEB_GHC_EXTRA_PACKAGES)' > debian/$(notdir $@)/usr/lib/haskell-packages/ghc/lib/$(CABAL_PACKAGE)-$(CABAL_VERSION)/extra-packages ; \
+		mkdir -p debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages; \
+		echo '$(DEB_GHC_EXTRA_PACKAGES)' > debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages/$(CABAL_PACKAGE)-$(CABAL_VERSION) ; \
 	fi
 	echo binary-or-shlib-defines-rpath > debian/libghc-$(CABAL_PACKAGE)-dev.lintian-overrides
 	dh_haskell_provides -p$(notdir $@)