Hi Ian,
I have prepared and will upload a NMU for hmake which fixes two bugs:
* Bug#427311: hmake: FTBFS: *** missing separator.
* Bug#459737: "Can't find ghc includes
at /usr/lib/ghc-6.8.2/imports"
The diff is attached.
Greetings Arjan
hmake (3.13-0.1) unstable; urgency=high
* Non-maintainer upload.
* Set urgency to high as this upload fixes an RC bug.
* New upstream release:
* Dropped patch to script/fixghc (applied upstream).
* Dropped patch to src/interpreter/Makefile (applied upstream).
* src/interpreter/SimpleLineEditor.hs (applied upstream).
* scripts/confhc:
* Filter out LINE pragma when determining the version number of
GHC. (Closes: #427311)
* src/hmake/{Config.hs,PackageConfig.hs}:
* Update the program to search for the imports in another directory
if the GHC version >= 6.8 as of that version they are shipped in
$ghclibdir/lib/$package instead of $ghclibdir/imports
(Closes: #459737)
-- Arjan Oosting <[EMAIL PROTECTED]> Sat, 16 Feb 2008 23:02:48 +0100
diff -Nru hmake-3.12/configure hmake-3.13/configure
--- hmake-3.12/configure 2008-02-17 00:44:46.000000000 +0100
+++ hmake-3.13/configure 2008-02-17 00:44:46.000000000 +0100
@@ -9,7 +9,7 @@
# When incrementing this version number, don't forget to change the
# corresponding definition in Makefile.inc!
-HMAKEVERSION="3.12 (2006-09-12)" export HMAKEVERSION
+HMAKEVERSION="3.13 (2006-11-01)" export HMAKEVERSION
if uname >/dev/null 2>&1
then OS=`uname -s`
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/debian/changelog /tmp/9JeFm9DgiE/hmake-3.13/debian/changelog
--- hmake-3.12/debian/changelog 2008-02-17 00:44:46.000000000 +0100
+++ hmake-3.13/debian/changelog 2008-02-17 00:44:46.000000000 +0100
@@ -1,3 +1,22 @@
+hmake (3.13-0.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Set urgency to high as this upload fixes an RC bug.
+ * New upstream release:
+ * Dropped patch to script/fixghc (applied upstream).
+ * Dropped patch to src/interpreter/Makefile (applied upstream).
+ * src/interpreter/SimpleLineEditor.hs (applied upstream).
+ * scripts/confhc:
+ * Filter out LINE pragma when determining the version number of
+ GHC. (Closes: #427311)
+ * src/hmake/{Config.hs,PackageConfig.hs}:
+ * Update the program to search for the imports in another directory
+ if the GHC version >= 6.8 as of that version they are shipped in
+ $ghclibdir/lib/$package instead of $ghclibdir/imports
+ (Closes: #459737)
+
+ -- Arjan Oosting <[EMAIL PROTECTED]> Sat, 16 Feb 2008 23:02:48 +0100
+
hmake (3.12-1) unstable; urgency=low
* New upstream version:
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/docs/hmake/changes.html /tmp/9JeFm9DgiE/hmake-3.13/docs/hmake/changes.html
--- hmake-3.12/docs/hmake/changes.html 2006-09-12 16:00:43.000000000 +0200
+++ hmake-3.13/docs/hmake/changes.html 2006-11-01 18:10:12.000000000 +0100
@@ -9,6 +9,15 @@
<hr>
<table>
+
+<tr>
+<td valign=top><b>3.13</b></td>
+ <td valign=top>
+ <ul>
+ <li> No, really fix hmake to build with ghc-6.6.
+ </ul>
+</td></tr><tr>
+
<tr>
<td valign=top><b>3.12</b></td>
<td valign=top>
@@ -371,7 +380,7 @@
<tt>http://www.cs.york.ac.uk/fp/hmake/</tt></a>
<p>
-Information last updated: 12th Sept 2006<br>
+Information last updated: 1st Nov 2006<br>
<a href="http://www.cs.york.ac.uk/fp/";>
York Functional Programming Group</a><br>
[EMAIL PROTECTED]
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/docs/hmake/index.html /tmp/9JeFm9DgiE/hmake-3.13/docs/hmake/index.html
--- hmake-3.12/docs/hmake/index.html 2006-09-12 16:02:42.000000000 +0200
+++ hmake-3.13/docs/hmake/index.html 2006-11-01 18:11:51.000000000 +0100
@@ -48,21 +48,17 @@
<h3><a name="news">Recent News</a></h3>
<p>
-The current version is hmake-3.12 (date 2006-09-12).
+The current version is hmake-3.13 (date 2006-11-01).
<ul>
-<li> New feature: hmake -M dependency analysis now adds
- "# -cpp" if cpp is required.
-<li> Fix to enable hmake to build with ghc-6.6.
+<li> No, really fix hmake to build with ghc-6.6.
</ul>
<p>
-The previous version was hmake-3.11 (date 2006-05-03).
+The previous version was hmake-3.12 (date 2006-09-12).
<ul>
-<li> New: the <tt>#! runhs</tt> script interpreter.
-<li> Bugfix: now finds dependency B in
- <tt>module A where { import B; ... }</tt>
-<li> Bugfixes: for compatibility problems with gcc-4.0.
-<li> Re-organised the internal cpphs library.
+<li> New feature: hmake -M dependency analysis now adds
+ "# -cpp" if cpp is required.
+<li> Fix to enable hmake to build with ghc-6.6.
</ul>
@@ -207,7 +203,7 @@
<tt>http://www.cs.york.ac.uk/fp/hmake/</tt></a> (mirror)
<p>
-Information last updated: 12th Sept 2006<br>
+Information last updated: 1st Nov 2006<br>
<a href="http://www.cs.york.ac.uk/fp/";>
York Functional Programming Group</a><br>
[EMAIL PROTECTED]
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/Makefile.inc /tmp/9JeFm9DgiE/hmake-3.13/Makefile.inc
--- hmake-3.12/Makefile.inc 2006-09-12 15:56:22.000000000 +0200
+++ hmake-3.13/Makefile.inc 2006-11-01 18:07:56.000000000 +0100
@@ -14,7 +14,7 @@
# corresponding version in the configure script!
# (odd minor number = CVS version; even minor number = release version)
-HMAKEVERSION = 3.12
+HMAKEVERSION = 3.13
# HMAKEVERSION is the separate version number for hmake.
# (odd/even minor number is irrelevant - all are release versions)
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/script/confhc /tmp/9JeFm9DgiE/hmake-3.13/script/confhc
--- hmake-3.12/script/confhc 2006-07-07 18:01:16.000000000 +0200
+++ hmake-3.13/script/confhc 2008-02-17 00:44:46.000000000 +0100
@@ -78,7 +78,7 @@
ghcsym () {
echo __GLASGOW_HASKELL__ >ghcsym.hs;
$1 -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
- grep -v '^#' ghcsym.out | grep -v '^$' > $2;
+ grep -v '^#' ghcsym.out | grep -v '^$' | grep -v '^{-#' > $2;
rm -f ghcsym.hs ghcsym.out;
}
echo -n " Looking for ghc... "
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/cpphs/cpphs.cabal /tmp/9JeFm9DgiE/hmake-3.13/src/cpphs/cpphs.cabal
--- hmake-3.12/src/cpphs/cpphs.cabal 2006-07-11 16:15:34.000000000 +0200
+++ hmake-3.13/src/cpphs/cpphs.cabal 2006-10-09 14:52:53.000000000 +0200
@@ -1,5 +1,5 @@
Name: cpphs
-Version: 1.2
+Version: 1.3
Copyright: 2004-6, Malcolm Wallace
Build-Depends: base, haskell98
License: LGPL
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/cpphs/cpphs.hs /tmp/9JeFm9DgiE/hmake-3.13/src/cpphs/cpphs.hs
--- hmake-3.12/src/cpphs/cpphs.hs 2006-08-18 14:39:33.000000000 +0200
+++ hmake-3.13/src/cpphs/cpphs.hs 2006-10-09 14:51:28.000000000 +0200
@@ -20,7 +20,7 @@
version :: String
-version = "1.2"
+version = "1.3"
main :: IO ()
@@ -88,7 +88,7 @@
f e ("-o":x:xs) = ('-':'O':x) : f e xs
f e (('-':'o':x):xs) = ('-':'O':drop 2 x) : f e xs
f e (('-':x):xs) | "ansi" `isPrefixOf` x = f e{traditional=False} xs
- | "tranditional" `isPrefixOf` x = f e{traditional=True} xs
+ | "traditional" `isPrefixOf` x = f e{traditional=True} xs
| "std" `isPrefixOf` x = f e xs -- ignore language spec
f e ("-x":x:xs) = f e xs -- ignore langauge spec
f e ("-include":x:xs) = x : f e xs
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/cpphs/cpphs.spec /tmp/9JeFm9DgiE/hmake-3.13/src/cpphs/cpphs.spec
--- hmake-3.12/src/cpphs/cpphs.spec 2006-07-11 16:15:34.000000000 +0200
+++ hmake-3.13/src/cpphs/cpphs.spec 2006-10-09 14:53:47.000000000 +0200
@@ -5,7 +5,7 @@
Summary: Liberalized C pre-processor re-implementation in Haskell
Name: cpphs
-Version: 1.2
+Version: 1.3
Release: 1%{?_distver:.%{_distver}}
License: LGPL 2.1
Group: Development/Tools
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/cpphs/Language/Preprocessor/Cpphs/Options.hs /tmp/9JeFm9DgiE/hmake-3.13/src/cpphs/Language/Preprocessor/Cpphs/Options.hs
--- hmake-3.12/src/cpphs/Language/Preprocessor/Cpphs/Options.hs 2006-07-11 16:15:34.000000000 +0200
+++ hmake-3.13/src/cpphs/Language/Preprocessor/Cpphs/Options.hs 2006-10-09 14:23:33.000000000 +0200
@@ -28,6 +28,7 @@
deriving (Eq, Show)
+flags :: [(String, CpphsOption)]
flags = [ ("--nomacro", CpphsNoMacro)
, ("--noline", CpphsNoLine)
, ("--text", CpphsText)
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/cpphs/Language/Preprocessor/Cpphs/Tokenise.hs /tmp/9JeFm9DgiE/hmake-3.13/src/cpphs/Language/Preprocessor/Cpphs/Tokenise.hs
--- hmake-3.12/src/cpphs/Language/Preprocessor/Cpphs/Tokenise.hs 2006-07-11 16:15:34.000000000 +0200
+++ hmake-3.13/src/cpphs/Language/Preprocessor/Cpphs/Tokenise.hs 2006-10-09 14:23:33.000000000 +0200
@@ -65,6 +65,7 @@
-- * Other is anything else.
data WordStyle = Ident Posn String | Other String | Cmd (Maybe HashDefine)
deriving (Eq,Show)
+other :: Posn -> String -> WordStyle
other _ s = Other s
deWordStyle :: WordStyle -> String
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/cpphs/Language/Preprocessor/Unlit.hs /tmp/9JeFm9DgiE/hmake-3.13/src/cpphs/Language/Preprocessor/Unlit.hs
--- hmake-3.12/src/cpphs/Language/Preprocessor/Unlit.hs 2006-07-11 16:15:34.000000000 +0200
+++ hmake-3.13/src/cpphs/Language/Preprocessor/Unlit.hs 2006-10-09 14:23:33.000000000 +0200
@@ -51,6 +51,7 @@
adjacent file n _ ([EMAIL PROTECTED] :xs) = x: adjacent file (n+1) x xs
adjacent file n _ [] = []
+message :: String -> Int -> String -> String -> String
message "\"\"" n p c = "Line "++show n++": "++p++ " line before "++c++" line.\n"
message [] n p c = "Line "++show n++": "++p++ " line before "++c++" line.\n"
message file n p c = "In file " ++ file ++ " at line "++show n++": "++p++ " line before "++c++" line.\n"
@@ -58,6 +59,7 @@
-- Re-implementation of 'lines', for better efficiency (but decreased laziness).
-- Also, importantly, accepts non-standard DOS and Mac line ending characters.
+inlines :: String -> [String]
inlines s = lines' s id
where
lines' [] acc = [acc []]
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/cpphs/Makefile /tmp/9JeFm9DgiE/hmake-3.13/src/cpphs/Makefile
--- hmake-3.12/src/cpphs/Makefile 2006-08-18 14:39:33.000000000 +0200
+++ hmake-3.13/src/cpphs/Makefile 2006-10-09 14:52:29.000000000 +0200
@@ -1,5 +1,5 @@
LIBRARY = cpphs
-VERSION = 1.2
+VERSION = 1.3
DIRS = Language/Preprocessor/Cpphs \
Text/ParserCombinators
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/cpphs/Makefile.nhc98 /tmp/9JeFm9DgiE/hmake-3.13/src/cpphs/Makefile.nhc98
--- hmake-3.12/src/cpphs/Makefile.nhc98 2006-07-11 16:15:34.000000000 +0200
+++ hmake-3.13/src/cpphs/Makefile.nhc98 2006-10-09 14:52:36.000000000 +0200
@@ -3,7 +3,7 @@
OBJDIR = $(BUILDDIR)/$(OBJ)/cpphs
CPPHS = $(DST)/cpphs$(EXE)
TARGET = $(CPPHS)
-VERSION = 1.2
+VERSION = 1.3
SRCS = Language/Preprocessor/Cpphs.hs \
Language/Preprocessor/Cpphs/CppIfdef.hs \
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/hmake/Config.hs /tmp/9JeFm9DgiE/hmake-3.13/src/hmake/Config.hs
--- hmake-3.12/src/hmake/Config.hs 2006-07-07 18:01:16.000000000 +0200
+++ hmake-3.13/src/hmake/Config.hs 2008-02-17 00:44:46.000000000 +0100
@@ -267,7 +267,7 @@
else do -- 5.00 and above
pkgcfg <- runAndReadStdout (escape ghcpath++" --print-libdir")
let libdir = escape pkgcfg
- incdir1 = libdir++"/imports"
+ incdir1 = if ghcsym < 608 then libdir++"/imports" else libdir++"/lib"
ok <- doesDirectoryExist incdir1
if ok
then do
diff -Nru /tmp/rYlbx7Ovhj/hmake-3.12/src/hmake/PackageConfig.hs /tmp/9JeFm9DgiE/hmake-3.13/src/hmake/PackageConfig.hs
--- hmake-3.12/src/hmake/PackageConfig.hs 2006-08-21 17:30:46.000000000 +0200
+++ hmake-3.13/src/hmake/PackageConfig.hs 2008-02-17 00:44:46.000000000 +0100
@@ -51,7 +51,7 @@
else unsafePerformIO $ do
pkgcfg <- runAndReadStdout (ghc++" --print-libdir")
let libdir = escape pkgcfg
- incdir1 = libdir++"/imports"
+ incdir1 = if ghcsym < 608 then libdir++"/imports" else libdir++"/lib"
ok <- doesDirectoryExist incdir1
if ok
then do
signature.asc
Description: Dit berichtdeel is digitaal ondertekend
