Attached is the diff for the NMU I'm going to upload in a little while.
It consists of the two patches mailed by Stefan Potyra to this bug. I've
done my best to verify that they work: the package builds, no new
lintian/linda warnings happen, and no (new) failures found with
piuparts.
--
Policy is your friend. Trust the Policy. Love the Policy. Obey the
Policy.
diff -ru hmake-3.10.untouched/debian/changelog hmake-3.10/debian/changelog
--- hmake-3.10.untouched/debian/changelog 2006-01-06 17:23:37.000000000 +0000
+++ hmake-3.10/debian/changelog 2006-01-06 17:31:31.000000000 +0000
@@ -1,3 +1,15 @@
+hmake (3.10-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Applied patches from Stefan Potyra to fix bug reported by Daniel
+ Schepler to adapt to output changes in new ghc6 version that make
+ "__GLASGOW_HASKELL__" be expanded into many lines instead of one.
+ scripts/confhc uses the output to create lib/debian/config, and
+ makes assumptions about the format. Similarly for
+ src/interpreter/HInteractive.hs. Closes: #335842.
+
+ -- Lars Wirzenius <[EMAIL PROTECTED]> Fri, 6 Jan 2006 19:30:00 +0200
+
hmake (3.10-1) unstable; urgency=low
* New upstream version. Closes: #309837.
diff -ru hmake-3.10.untouched/script/confhc hmake-3.10/script/confhc
--- hmake-3.10.untouched/script/confhc 2005-03-10 17:45:32.000000000 +0000
+++ hmake-3.10/script/confhc 2006-01-06 17:27:17.000000000 +0000
@@ -78,7 +78,7 @@
ghcsym () {
echo __GLASGOW_HASKELL__ >ghcsym.hs;
$1 -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
- grep -v '^#' ghcsym.out > $2;
+ grep -E '[0-9]+' ghcsym.out | grep -v '#' > $2;
rm -f ghcsym.hs ghcsym.out;
}
echo -n " Looking for ghc... "
Only in hmake-3.10.untouched/src/hmake: Makefile~
diff -ru hmake-3.10.untouched/src/interpreter/HInteractive.hs hmake-3.10/src/interpreter/HInteractive.hs
--- hmake-3.10.untouched/src/interpreter/HInteractive.hs 2005-03-02 17:14:28.000000000 +0000
+++ hmake-3.10/src/interpreter/HInteractive.hs 2006-01-06 17:27:22.000000000 +0000
@@ -348,39 +348,39 @@
help = "hi - help command does not work in hbc < 0.9999.5"
#else
-banner = "\
-\__ __ __ _____________________________________\n\
-\|| || ______ ___ || _ ____ hmake interactive (hi):\n\
-\||___|| || || || ___|| ||/ ||__|| Copyright (c) May 2000\n\
-\||---|| || || || ||__|| ||\\_ ||__ http://www.cs.york.ac.uk/fp/hmake/\n\
-\|| || Report bugs to: [EMAIL PROTECTED]
-\|| || Version: "++hmakeVersion++" -------------------------------------"
+banner = "\
+__ __ __ _____________________________________\n\
+|| || ______ ___ || _ ____ hmake interactive (hi):\n\
+||___|| || || || ___|| ||/ ||__|| Copyright (c) May 2000\n\
+||---|| || || || ||__|| ||\\_ ||__ http://www.cs.york.ac.uk/fp/hmake/\n\
+|| || Report bugs to: [EMAIL PROTECTED]
+|| || Version: "++hmakeVersion++" -------------------------------------"
-help = "\
-\Commands (can be abbreviated to first letter):\n\
-\ <expr> evaluate expression\n\
-\ :type <expr> show type of expression [nhc98 only]\n\
-\ :quit quit\n\
-\ :Quit quit\n\
-\ :load mod [mod...] load modules (note, not filenames)\n\
-\ :load clear all modules\n\
-\ :also mod [mod...] load additional modules (note, not filenames)\n\
-\ :reload repeat last load command\n\
-\ :freshen remove, recompile, and reload all current modules\n\
-\ :module mod set module scope for evaluating expressions\n\
-\ :edit file edit filename\n\
-\ :edit edit current module\n\
-\ :cd dir change directory\n\
-\ :cd show current directory\n\
-\ :dir list current directory\n\
-\ :hc compiler set Haskell compiler to use\n\
-\ :hc show current compiler and other available compilers\n\
-\ :set options set hmake/compiler options\n\
-\ :unset options remove hmake/compiler options\n\
-\ :observe name debug function 'name' with 'Hood' [coming soon]\n\
-\ :trace [on|off] switch on/off debugging with 'Hat' [nhc98 only]\n\
-\ :!command shell escape\n\
-\ :version show hmake version\n\
-\ :? display this list of commands"
+help = "\
+Commands (can be abbreviated to first letter):\n\
+ <expr> evaluate expression\n\
+ :type <expr> show type of expression [nhc98 only]\n\
+ :quit quit\n\
+ :Quit quit\n\
+ :load mod [mod...] load modules (note, not filenames)\n\
+ :load clear all modules\n\
+ :also mod [mod...] load additional modules (note, not filenames)\n\
+ :reload repeat last load command\n\
+ :freshen remove, recompile, and reload all current modules\n\
+ :module mod set module scope for evaluating expressions\n\
+ :edit file edit filename\n\
+ :edit edit current module\n\
+ :cd dir change directory\n\
+ :cd show current directory\n\
+ :dir list current directory\n\
+ :hc compiler set Haskell compiler to use\n\
+ :hc show current compiler and other available compilers\n\
+ :set options set hmake/compiler options\n\
+ :unset options remove hmake/compiler options\n\
+ :observe name debug function 'name' with 'Hood' [coming soon]\n\
+ :trace [on|off] switch on/off debugging with 'Hat' [nhc98 only]\n\
+ :!command shell escape\n\
+ :version show hmake version\n\
+ :? display this list of commands"
#endif
