[Git][haskell-team/dh-haskell][history] 3 commits: Release version 0.6.4 into unstable.

[Felix Lechner (@lechner)]

Felix Lechner pushed to branch history at Debian Haskell Group / dh-haskell


Commits:
a8147eac by Felix Lechner at 2022-04-11T04:43:57-07:00
Release version 0.6.4 into unstable.

- - - - -
24f8e5fd by Felix Lechner at 2022-04-11T12:53:19-07:00
Make sure to insert spaces when appending command-line options to environment variables.

Avoids errors like that one:

ghc-doc: /usr/share/doc/ghc-doc/html/libraries/base-4.13.0.0/Control-Monad-IO-Class.html
dpkg-query: no path found matching pattern /usr/share/javascript/mathjax/MathJax.js--hyperlink-source
make: *** [debian/rules:4: binary] Error 25
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
debuild: fatal error at line 1182:
dpkg-buildpackage -rfakeroot -us -uc -ui failed

An examination of the HTML shows that we accidentally appended a Haddock option
to the MathJax file URL:

10d9
<     <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=PT+Sans:400,400i,700" />
13c12
<     <script src="file:///usr/share/javascript/mathjax/MathJax.js" type="text/javascript"></script>
---
>     <script src="file:///usr/share/javascript/mathjax/MathJax.js--hyperlink-source" type="text/javascript"></script>

It happened because our Haddock invocation was defective. It lacked a space,
which is fixed herein.

Running debian/hlibrary.setup haddock --builddir=dist-ghc --with-haddock=/usr/bin/haddock
 --with-ghc=ghc --verbose=2 --html --hoogle
 --haddock-options="--mathjax=file:///usr/share/javascript/mathjax/MathJax.js"--hyperlink-source

- - - - -
8f28d2df by Felix Lechner at 2022-04-11T13:05:18-07:00
Release version 0.6.5 into unstable.

- - - - -


2 changed files:

- debian/changelog
- lib/Debian/Debhelper/Buildsystem/haskell.pm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+dh-haskell (0.6.5) unstable; urgency=medium
+
+  * Make sure to insert spaces when appending command-line options to
+    environment variables. (undocumented Haddock/MathJax bug)
+
+ -- Felix Lechner <felix.lechner at lease-up.com>  Mon, 11 Apr 2022 13:05:08 -0700
+
+dh-haskell (0.6.4) unstable; urgency=medium
+
+  * Use new integrated install_recipe() adapted from the CDBS module
+    hlibrary.mk from haskell-devscripts. (Closes: #865640)
+
+ -- Felix Lechner <felix.lechner at lease-up.com>  Mon, 11 Apr 2022 04:42:40 -0700
+
 dh-haskell (0.6.3) unstable; urgency=medium
 
   * Use the same build recipes as the older CDBS module hlibrary.mk


=====================================
lib/Debian/Debhelper/Buildsystem/haskell.pm
=====================================
@@ -124,7 +124,7 @@ sub new {
     $ENV{DEB_ENABLE_HOOGLE} //= 'yes';
 
     $ENV{"DEB_DH_GENCONTROL_ARGS_libghc-$ENV{CABAL_PACKAGE}-dev"}
-      .= '-- -DGHC-Package=\${haskell:ghc-package}';
+      .= $SPACE . '-- -DGHC-Package=\${haskell:ghc-package}';
 
     $ENV{ENABLE_PROFILING}= '--enable-library-profiling'
       if any { /^libghc-$ENV{CABAL_PACKAGE}-prof$/ } @{$dh{DOPACKAGES}};
@@ -155,8 +155,9 @@ sub new {
     $ENV{GHC_VERSION} = qx{ghc --numeric-version};
 
     $ENV{DEB_HADDOCK_OPTS}
-      .= '--html --hoogle --haddock-options="--mathjax=file:///usr/share/javascript/mathjax/MathJax.js"';
-    $ENV{DEB_HADDOCK_OPTS} .= '--hyperlink-source'
+      .= $SPACE
+      . '--html --hoogle --haddock-options="--mathjax=file:///usr/share/javascript/mathjax/MathJax.js"';
+    $ENV{DEB_HADDOCK_OPTS} .= $SPACE . '--hyperlink-source'
       unless exists $ENV{DEB_NO_IMPLICIT_HADDOCK_HYPERLINK};
 
     $ENV{MAKEFILE} = 'debian/hlibrary.Makefile';



View it on GitLab: https://salsa.debian.org/haskell-team/dh-haskell/-/compare/5c92bfbb485ced17e20aa060ea9f01e11d54a334...8f28d2df971b87208353fb471ba76e4c6f24470b

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/dh-haskell/-/compare/5c92bfbb485ced17e20aa060ea9f01e11d54a334...8f28d2df971b87208353fb471ba76e4c6f24470b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220411/dab66ae7/attachment-0001.htm>