[Git][haskell-team/haskell-devscripts][master] 3 commits: Turn off wordwrap on verbose register --gen-pkg-config output.

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / haskell-devscripts


Commits:
31cecf5c by Clint Adams at 2018-04-12T12:13:17-04:00
Turn off wordwrap on verbose register --gen-pkg-config output.

data-default-instances-containers-0.0.1.conf is long enough to
cause trouble by hitting the hard 79 margin.

- - - - -
1f69e808 by Clint Adams at 2018-04-12T12:16:42-04:00
Require ghc (>= 8.2) because the nowrap feature is new

- - - - -
0988653f by Clint Adams at 2018-04-12T12:16:42-04:00
changelog for 0.13.8

- - - - -


3 changed files:

- Dh_Haskell.sh
- debian/changelog
- debian/control


Changes:

=====================================
Dh_Haskell.sh
=====================================
--- a/Dh_Haskell.sh
+++ b/Dh_Haskell.sh
@@ -502,7 +502,7 @@ haddock_recipe(){
 extra_depends_recipe(){
     # local PS5=$PS4; PS4=" + extra_depends_recipe> "; set -x
     hc=$1
-    pkg_config=`LC_ALL=C.UTF-8 ${DEB_SETUP_BIN_NAME} register --builddir=dist-${hc} --gen-pkg-config --verbose=2 | sed -r -n '/^Creating package registration file: /s///p'`
+    pkg_config=$(LC_ALL=C.UTF-8 ${DEB_SETUP_BIN_NAME} register --builddir=dist-${hc} --gen-pkg-config --verbose=verbose+nowrap | sed -r -n '/^Creating package registration file: /s///p')
     run dh_haskell_extra_depends ${hc} $pkg_config
     rm $pkg_config
     # PS4=$PS5
@@ -519,7 +519,7 @@ install_dev_recipe(){
     ( run cd debian/tmp-inst-${hc} ; run mkdir -p ${libdir} ; run find ${libdir}/ \
         \( ! -name "*_p.a" ! -name "*.p_hi" ! -type d \) \
         -exec install -Dm 644 '{}' ../${PKG}/'{}' ';' )
-    pkg_config=`LC_ALL=C.UTF-8 ${DEB_SETUP_BIN_NAME} register --builddir=dist-${hc} --gen-pkg-config --verbose=2 | sed -r -n '/^Creating package registration file: /s///p'`
+    pkg_config=$(LC_ALL=C.UTF-8 ${DEB_SETUP_BIN_NAME} register --builddir=dist-${hc} --gen-pkg-config --verbose=verbose+nowrap | sed -r -n '/^Creating package registration file: /s///p')
     if [ "${HASKELL_HIDE_PACKAGES}" ]; then sed -i 's/^exposed: True$/exposed: False/' $pkg_config; fi
     run install -Dm 644 $pkg_config debian/${PKG}/${pkgdir}/$pkg_config
     run rm -f $pkg_config


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+haskell-devscripts (0.13.8) unstable; urgency=medium
+
+  * Disable wordwrap on setup register output to cope with
+    long filenames like data-default-instances-containers-0.0.1.conf.
+
+ -- Clint Adams <clint at debian.org>  Thu, 12 Apr 2018 12:14:18 -0400
+
 haskell-devscripts (0.13.7) unstable; urgency=medium
 
   * Use C.UTF-8 for setup register output.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Description: Tools to help Debian developers build Haskell packages
 Package: haskell-devscripts
 Architecture: all
 Depends: ${misc:Depends}
-  , ghc (>= 8.0.1)
+  , ghc (>= 8.2)
   , haskell-devscripts-minimal
   , hscolour
 Description: Tools to help Debian developers build Haskell packages



View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/compare/7b047caf1e5a873f74242be67938b35f4517bf7d...0988653f191f777bab7879c34dcd79d83e8e0cdc

---
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/compare/7b047caf1e5a873f74242be67938b35f4517bf7d...0988653f191f777bab7879c34dcd79d83e8e0cdc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-haskell-commits/attachments/20180412/8425e1f9/attachment-0001.html>