From 691e2f17638663f75e5940e57ec8ddef9ae00cd9 Mon Sep 17 00:00:00 2001 From: Ilias Tsitsimpis Date: Sun, 23 Feb 2020 16:56:57 +0200 Subject: Make indentation more consistent The dh_haskell_{depends,provides,shlibdeps} files were a mix of mostly spaces and a few tabs. Replace all tabs with 8 spaces. --- dh_haskell_depends | 62 ++++++++++++++++++++++++++-------------------------- dh_haskell_provides | 60 +++++++++++++++++++++++++------------------------- dh_haskell_shlibdeps | 14 ++++++------ 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/dh_haskell_depends b/dh_haskell_depends index fc240de..970ee01 100644 --- a/dh_haskell_depends +++ b/dh_haskell_depends @@ -67,25 +67,25 @@ for pkg in `dh_listpackages $args`; do ext=`package_ext ${pkg}` case "$hc,$ext" in - ghc,dev|ghc,prof|ghcjs,dev|ghcjs,prof) - if [ -z "$files" ] ; then - cfiles=`find_config_for_ghc $pkg` - else - cfiles="$files" - fi - if [ -z "$cfiles" ] ; then - echo "dh_haskell_depends - no installed package description files found" >&2 - exit 1 - fi - case "$ext" in - dev) - grep -v -a \ - -e ^haskell:Extra-Depends \ + ghc,dev|ghc,prof|ghcjs,dev|ghcjs,prof) + if [ -z "$files" ] ; then + cfiles=`find_config_for_ghc $pkg` + else + cfiles="$files" + fi + if [ -z "$cfiles" ] ; then + echo "dh_haskell_depends - no installed package description files found" >&2 + exit 1 + fi + case "$ext" in + dev) + grep -v -a \ + -e ^haskell:Extra-Depends \ -e ^haskell:Depends \ -e ^haskell:Recommends \ -e ^haskell:Suggests \ $sfile > $sfile.tmp || true - echo "haskell:Depends=`depends_for_ghc ${hc} $cfiles`" >> $sfile.tmp + echo "haskell:Depends=`depends_for_ghc ${hc} $cfiles`" >> $sfile.tmp echo "haskell:Recommends=" >> $sfile.tmp doc=`echo $pkg | sed -e 's/-dev$/-doc/'` prof=`echo $pkg | sed -e 's/-dev$/-prof/'` @@ -99,10 +99,10 @@ for pkg in `dh_listpackages $args`; do || suggests="$suggests, $prof" fi echo "haskell:Suggests=$suggests" >> $sfile.tmp - ;; - prof) - grep -a -v \ - -e ^haskell:Extra-Depends \ + ;; + prof) + grep -a -v \ + -e ^haskell:Extra-Depends \ -e ^haskell:Depends \ -e ^haskell:Recommends \ -e ^haskell:Suggests \ @@ -110,31 +110,31 @@ for pkg in `dh_listpackages $args`; do dev=`echo $pkg | sed -e 's/-prof$/-dev/'` version='(=${binary:Version})' depends="$dev ${version}, `depends_for_ghc_prof ${hc} $cfiles`" - echo "haskell:Depends=$depends" >> $sfile.tmp + echo "haskell:Depends=$depends" >> $sfile.tmp echo "haskell:Recommends=" >> $sfile.tmp echo "haskell:Suggests=" >> $sfile.tmp - ;; - esac - ;; - hugs,*) - grep -a -v \ + ;; + esac + ;; + hugs,*) + grep -a -v \ -e ^haskell:Extra-Depends \ -e ^haskell:Depends \ -e ^haskell:Recommends \ -e ^haskell:Suggests \ $sfile > $sfile.tmp || true - echo "haskell:Depends=`depends_for_hugs`" >> $sfile.tmp + echo "haskell:Depends=`depends_for_hugs`" >> $sfile.tmp echo "haskell:Recommends=" >> $sfile.tmp echo "haskell:Suggests=" >> $sfile.tmp - ;; + ;; ghc,doc|ghcjs,doc) - grep -a -v \ + grep -a -v \ -e ^haskell:Extra-Depends \ -e ^haskell:Depends \ -e ^haskell:Recommends \ -e ^haskell:Suggests \ $sfile > $sfile.tmp || true - depends=haddock-interface-`haddock --interface-version` + depends=haddock-interface-`haddock --interface-version` echo "haskell:Depends=$depends" >> $sfile.tmp recommends=` \ find debian/$pkg -name \*.html -exec hxwls -r \{\} \; \ @@ -153,9 +153,9 @@ for pkg in `dh_listpackages $args`; do echo "haskell:Recommends=$recommends" >> $sfile.tmp echo "haskell:Suggests=$suggests" >> $sfile.tmp ;; - *) + *) cp $sfile $sfile.tmp - ;; + ;; esac echo "haskell:Extra-Depends=`cat debian/extra-depends-${hc}`" >> $sfile.tmp diff --git a/dh_haskell_provides b/dh_haskell_provides index 48e3bf9..90cffb2 100644 --- a/dh_haskell_provides +++ b/dh_haskell_provides @@ -57,9 +57,9 @@ set -e if test -e debian/Dh_Haskell.sh then - . debian/Dh_Haskell.sh + . debian/Dh_Haskell.sh else - . /usr/share/haskell-devscripts/Dh_Haskell.sh + . /usr/share/haskell-devscripts/Dh_Haskell.sh fi # PS4=" + dh_haskell_provides> " @@ -73,39 +73,39 @@ for pkg in `dh_listpackages $args`; do ext=`package_ext ${pkg}` case "$ext" in - dev|prof) - if [ -z "$files" ] ; then - cfiles=`find_config_for_ghc $pkg` - else - cfiles="$files" - fi - if [ -z "$cfiles" ] ; then - echo "dh_haskell_provides - no installed package description files found" >&2 - exit 1 - fi - case "$ext" in - dev) - grep -a -v \ + dev|prof) + if [ -z "$files" ] ; then + cfiles=`find_config_for_ghc $pkg` + else + cfiles="$files" + fi + if [ -z "$cfiles" ] ; then + echo "dh_haskell_provides - no installed package description files found" >&2 + exit 1 + fi + case "$ext" in + dev) + grep -a -v \ -e ^haskell:Provides \ $sfile > $sfile.tmp || true - echo "haskell:Provides=`provides_for_ghc $hc $cfiles`" >> $sfile.tmp - mv $sfile.tmp $sfile - grep -a -v \ + echo "haskell:Provides=`provides_for_ghc $hc $cfiles`" >> $sfile.tmp + mv $sfile.tmp $sfile + grep -a -v \ -e ^haskell:${hc}-package \ $sfile > $sfile.tmp || true - echo "haskell:${hc}-package=`cabal_package_ids $cfiles`" >> $sfile.tmp - mv $sfile.tmp $sfile - ;; - prof) - grep -a -v \ + echo "haskell:${hc}-package=`cabal_package_ids $cfiles`" >> $sfile.tmp + mv $sfile.tmp $sfile + ;; + prof) + grep -a -v \ -e ^haskell:Provides \ $sfile > $sfile.tmp || true - echo "haskell:Provides=`provides_for_ghc_prof $hc $cfiles`" >> $sfile.tmp - mv $sfile.tmp $sfile - ;; - esac - ;; - *) - ;; + echo "haskell:Provides=`provides_for_ghc_prof $hc $cfiles`" >> $sfile.tmp + mv $sfile.tmp $sfile + ;; + esac + ;; + *) + ;; esac done diff --git a/dh_haskell_shlibdeps b/dh_haskell_shlibdeps index c530c22..2e6a7d1 100644 --- a/dh_haskell_shlibdeps +++ b/dh_haskell_shlibdeps @@ -37,17 +37,17 @@ do ext=`package_ext ${pkg}` case "$ext" in dev) - if [ -z "$files" ] ; then - files=`find_config_for_ghc $pkg` - fi + if [ -z "$files" ] ; then + files=`find_config_for_ghc $pkg` + fi ;; esac done if [ -z "$files" ] then - echo "dh_haskell_shlibdeps - no installed package description files found" >&2 - exit 1 + echo "dh_haskell_shlibdeps - no installed package description files found" >&2 + exit 1 fi T_DIR=debian/dh_haskell_shlibdeps @@ -58,11 +58,11 @@ for file in $files do for dir in $(grep-dctrl -s library-dirs -n . < $file) do - args="$args -L$dir" + args="$args -L$dir" done for lib in $(grep-dctrl -s extra-libraries -n . < $file) do - args="$args -l$lib" + args="$args -l$lib" done done -- cgit v1.2.3