[Pkg-haskell-commits] darcs: haskell-devscripts: Debugging code (disabled)
David Fox
dsf at seereason.com
Tue Mar 31 17:25:45 UTC 2015
Tue Mar 31 17:20:18 UTC 2015 David Fox <dsf at seereason.com>
* Debugging code (disabled)
M ./Dh_Haskell.sh +20
M ./dh_haskell_blurbs +3
M ./dh_haskell_depends +3
M ./dh_haskell_extra_depends +3
M ./dh_haskell_provides +3
M ./dh_haskell_shlibdeps +3
Tue Mar 31 17:20:18 UTC 2015 David Fox <dsf at seereason.com>
* Debugging code (disabled)
diff -rN -u old-haskell-devscripts/dh_haskell_blurbs new-haskell-devscripts/dh_haskell_blurbs
--- old-haskell-devscripts/dh_haskell_blurbs 2015-03-31 17:25:45.446420205 +0000
+++ new-haskell-devscripts/dh_haskell_blurbs 2015-03-31 17:25:45.458420224 +0000
@@ -11,6 +11,9 @@
. /usr/share/haskell-devscripts/Dh_Haskell.sh
+# PS4=" + dh_haskell_blurbs> "
+# set -x
+
packages=`dh_listpackages`
hc=`packages_hc ${DEB_DEFAULT_COMPILER} ${packages}`
diff -rN -u old-haskell-devscripts/dh_haskell_depends new-haskell-devscripts/dh_haskell_depends
--- old-haskell-devscripts/dh_haskell_depends 2015-03-31 17:25:45.446420205 +0000
+++ new-haskell-devscripts/dh_haskell_depends 2015-03-31 17:25:45.458420224 +0000
@@ -56,6 +56,9 @@
. /usr/share/haskell-devscripts/Dh_Haskell.sh
+# PS4=" + dh_haskell_depends> "
+# set -x
+
for pkg in `dh_listpackages $args`; do
sfile=debian/$pkg.substvars
touch $sfile
diff -rN -u old-haskell-devscripts/dh_haskell_extra_depends new-haskell-devscripts/dh_haskell_extra_depends
--- old-haskell-devscripts/dh_haskell_extra_depends 2015-03-31 17:25:45.442420200 +0000
+++ new-haskell-devscripts/dh_haskell_extra_depends 2015-03-31 17:25:45.458420224 +0000
@@ -59,6 +59,9 @@
. /usr/share/haskell-devscripts/Dh_Haskell.sh
+# PS4=" + dh_haskell_extra_depends> "
+# set -x
+
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|'`
diff -rN -u old-haskell-devscripts/dh_haskell_provides new-haskell-devscripts/dh_haskell_provides
--- old-haskell-devscripts/dh_haskell_provides 2015-03-31 17:25:45.442420200 +0000
+++ new-haskell-devscripts/dh_haskell_provides 2015-03-31 17:25:45.458420224 +0000
@@ -62,6 +62,9 @@
. /usr/share/haskell-devscripts/Dh_Haskell.sh
fi
+# PS4=" + dh_haskell_provides> "
+# set -x
+
for pkg in `dh_listpackages $args`; do
sfile=debian/$pkg.substvars
touch $sfile
diff -rN -u old-haskell-devscripts/Dh_Haskell.sh new-haskell-devscripts/Dh_Haskell.sh
--- old-haskell-devscripts/Dh_Haskell.sh 2015-03-31 17:25:45.446420205 +0000
+++ new-haskell-devscripts/Dh_Haskell.sh 2015-03-31 17:25:45.450420211 +0000
@@ -340,6 +340,7 @@
}
clean_recipe(){
+ # local PS5=$PS4; PS4=" + clean_recipe> "; set -x
DEB_SETUP_BIN_NAME=$1
CABAL_PACKAGE=$2
MAKEFILE=$3
@@ -357,14 +358,18 @@
rm -f ${MAKEFILE}
rm -rf debian/dh_haskell_shlibdeps
+ # PS4=$PS5
}
make_setup_recipe(){
+ # local PS5=$PS4; PS4=" + make_setup_recipe> "; set -x
DEB_SETUP_BIN_NAME=$1
for setup in Setup.lhs Setup.hs; do if test -e $setup; then ghc --make $setup -o ${DEB_SETUP_BIN_NAME}; exit 0; fi; done
+ # PS4=$PS5
}
configure_recipe(){
+ # local PS5=$PS4; PS4=" + configure_recipe> "; set -x
DEB_SETUP_BIN_NAME=$1
CABAL_PACKAGE=$2
CABAL_VERSION=$3
@@ -390,25 +395,31 @@
--haddockdir=/`hc_docdir ${hc} ${CABAL_PACKAGE}-${CABAL_VERSION}` --datasubdir=${CABAL_PACKAGE}\
--htmldir=/`hc_htmldir ${hc} ${CABAL_PACKAGE}` ${ENABLE_PROFILING} ${NO_GHCI_FLAG} \
${DEB_SETUP_GHC6_CONFIGURE_ARGS} ${DEB_SETUP_GHC_CONFIGURE_ARGS} ${OPTIMIZATION} ${TESTS}
+ # PS4=$PS5
}
build_recipe(){
+ # local PS5=$PS4; PS4=" + build_recipe> "; set -x
DEB_SETUP_BIN_NAME=$1
DEB_DEFAULT_COMPILER=$2
DEB_PACKAGES=$3
hc=`packages_hc "${DEB_DEFAULT_COMPILER}" "${DEB_PACKAGES}"`
${DEB_SETUP_BIN_NAME} build --builddir=dist-${hc}
+ # PS4=$PS5
}
check_recipe(){
+ # local PS5=$PS4; PS4=" + check_recipe> "; set -x
DEB_SETUP_BIN_NAME=$1
DEB_DEFAULT_COMPILER=$2
DEB_PACKAGES=$3
hc=`packages_hc "${DEB_DEFAULT_COMPILER}" "${DEB_PACKAGES}"`
${DEB_SETUP_BIN_NAME} test --builddir=dist-${hc} --show-details=always
+ # PS4=$PS5
}
haddock_recipe(){
+ # local PS5=$PS4; PS4=" + haddock_recipe> "; set -x
DEB_SETUP_BIN_NAME=$1
DEB_HADDOCK_OPTS=$2
DEB_DEFAULT_COMPILER=$3
@@ -417,17 +428,21 @@
haddock=`hc_haddock ${hc}`
[ ! -x /usr/bin/${haddock} ] || ${DEB_SETUP_BIN_NAME} haddock --builddir=dist-${hc} --with-haddock=/usr/bin/${haddock} --with-ghc=${hc} ${DEB_HADDOCK_OPTS} || \
echo "Haddock failed (no modules?), creating empty documentation package."
+ # PS4=$PS5
}
extra_depends_recipe(){
+ # local PS5=$PS4; PS4=" + extra_depends_recipe> "; set -x
DEB_SETUP_BIN_NAME=$1
hc=$2
pkg_config=`${DEB_SETUP_BIN_NAME} register --builddir=dist-${hc} --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'`
dh_haskell_extra_depends ${hc} $pkg_config
rm $pkg_config
+ # PS4=$PS5
}
install_dev_recipe(){
+ # local PS5=$PS4; PS4=" + install_dev_recipe> "; set -x
DEB_SETUP_BIN_NAME=$1
CABAL_PACKAGE=$2
CABAL_VERSION=$3
@@ -457,9 +472,11 @@
dh_haskell_provides -p${PKG}
dh_haskell_depends -p${PKG}
dh_haskell_shlibdeps -p${PKG}
+ # PS4=$PS5
}
install_prof_recipe(){
+ # local PS5=$PS4; PS4=" + install_prof_recipe> "; set -x
PKG=$1
libdir=`package_libdir ${PKG}`
( cd debian/tmp-inst-`package_hc ${PKG}` ; mkdir -p ${libdir} ; find ${libdir}/ \
@@ -467,9 +484,11 @@
-exec install -Dm 644 '{}' ../${PKG}/'{}' ';' )
dh_haskell_provides -p${PKG}
dh_haskell_depends -p${PKG}
+ # PS4=$PS5
}
install_doc_recipe(){
+ # local PS5=$PS4; PS4=" + install_doc_recipe> "; set -x
CABAL_PACKAGE=$1
CABAL_VERSION=$2
DEB_ENABLE_HOOGLE=$3
@@ -493,6 +512,7 @@
sed -i s,^debian/lib${hc}-${CABAL_PACKAGE}-doc,, debian/lib${hc}-${CABAL_PACKAGE}-doc.links
fi
dh_haskell_depends -p${PKG}
+ # PS4=$PS5
}
if ! [ `which grep-dctrl` > /dev/null ] ; then
diff -rN -u old-haskell-devscripts/dh_haskell_shlibdeps new-haskell-devscripts/dh_haskell_shlibdeps
--- old-haskell-devscripts/dh_haskell_shlibdeps 2015-03-31 17:25:45.442420200 +0000
+++ new-haskell-devscripts/dh_haskell_shlibdeps 2015-03-31 17:25:45.458420224 +0000
@@ -27,6 +27,9 @@
. /usr/share/haskell-devscripts/Dh_Haskell.sh
+# PS4=" + dh_haskell_shlibdeps> "
+# set -x
+
pkgs=`dh_listpackages $args`
for pkg in $pkgs
More information about the Pkg-haskell-commits
mailing list