Tags 379264 + patch pending
Thanks
Hi!
I have reviewed Arjan's patch, and I have prepared an NMU that applies it.
The diff is exactly the same, only the changelog entry changes. I'm
attaching it anyway.
--
Love,
Marga.
diff -u haskell-hsql-1.6/PostgreSQL/Setup.lhs
haskell-hsql-1.6/PostgreSQL/Setup.lhs
--- haskell-hsql-1.6/PostgreSQL/Setup.lhs
+++ haskell-hsql-1.6/PostgreSQL/Setup.lhs
@@ -21,8 +21,8 @@
preConf args flags = do
try (removeFile "PostgreSQL.buildinfo")
return emptyHookedBuildInfo
- postConf :: [String] -> ConfigFlags -> LocalBuildInfo -> IO ExitCode
- postConf args flags localbuildinfo = do
+ postConf :: [String] -> ConfigFlags -> PackageDescription ->
LocalBuildInfo -> IO ExitCode
+ postConf args flags _ localbuildinfo = do
mb_bi <- pqConfigBuildInfo (configVerbose flags)
writeHookedBuildInfo "PostgreSQL.buildinfo" (Just (fromMaybe
emptyBuildInfo mb_bi),[])
return ExitSuccess
diff -u haskell-hsql-1.6/debian/control haskell-hsql-1.6/debian/control
--- haskell-hsql-1.6/debian/control
+++ haskell-hsql-1.6/debian/control
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: VÃctor Pérez Pereira <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libpq-dev (>= 8.0), libmysqlclient15-dev,
unixodbc-dev, libsqlite-dev, libsqlite3-dev, haskell-devscripts (>= 0.5.8),
ghc6 (>= 6.4.1), ghc6 (<< 6.4.1-999), cpphs, haddock
+Build-Depends: debhelper (>= 4.0.0), libpq-dev (>= 8.0), libmysqlclient15-dev,
unixodbc-dev, libsqlite-dev, libsqlite3-dev, haskell-devscripts (>= 0.5.8),
ghc6 (>= 6.4.2), cpphs, haddock
Standards-Version: 3.7.2
Package: libghc6-hsql-dev
diff -u haskell-hsql-1.6/debian/changelog haskell-hsql-1.6/debian/changelog
--- haskell-hsql-1.6/debian/changelog
+++ haskell-hsql-1.6/debian/changelog
@@ -1,3 +1,19 @@
+haskell-hsql (1.6-8.1) unstable; urgency=low
+
+ * Non-maintainer upload, to fix Failure To Build From Source, applying patch
+ by Arjan Oosting.
+ * Fixes FTBFS: needs to update for new ghc6 (Closes: #379264)
+ - update MySQL/Setup.lhs, PostgresSQL/Setup.lhs, SQLite/Setup.lhs and
+ SQLite3/Setup.lhs for the new Cabal version shipped with ghc 6.4.2.
+ - debian/control: Build-Depends on the ghc6 (>= 6.4.2) which ships the
+ new Cabal version. Drop the build dependency on ghc6 (6.4.1-999) to
+ make (binary) non-maintainer uploads easier.
+ - debian/ghc-pkg: replace the call to /usr/lib/ghc-6.4.1/bin/ghc-pkg
+ with a call to /usr/bin/ghc-pkg6 to make independant of the ghc6
+ version.
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Thu, 10 Aug 2006 15:27:19 -0300
+
haskell-hsql (1.6-8) unstable; urgency=medium
* New maintainer (closes: #358873)
diff -u haskell-hsql-1.6/debian/ghc-pkg haskell-hsql-1.6/debian/ghc-pkg
--- haskell-hsql-1.6/debian/ghc-pkg
+++ haskell-hsql-1.6/debian/ghc-pkg
@@ -6 +6 @@
-exec /usr/lib/ghc-6.4.1/bin/ghc-pkg -f $PKGCFG "$@"
+exec /usr/bin/ghc-pkg6 -f $PKGCFG "$@"
only in patch2:
unchanged:
--- haskell-hsql-1.6.orig/MySQL/Setup.lhs
+++ haskell-hsql-1.6/MySQL/Setup.lhs
@@ -21,8 +21,8 @@
preConf args flags = do
try (removeFile "MySQL.buildinfo")
return emptyHookedBuildInfo
- postConf :: [String] -> ConfigFlags -> LocalBuildInfo -> IO ExitCode
- postConf args flags localbuildinfo = do
+ postConf :: [String] -> ConfigFlags -> PackageDescription ->
LocalBuildInfo -> IO ExitCode
+ postConf args flags _ localbuildinfo = do
mb_bi <- mysqlConfigBuildInfo (configVerbose flags)
writeHookedBuildInfo "MySQL.buildinfo" (Just (fromMaybe
emptyBuildInfo{extraLibs=["mysqlclient"]} mb_bi),[])
return ExitSuccess
only in patch2:
unchanged:
--- haskell-hsql-1.6.orig/SQLite/Setup.lhs
+++ haskell-hsql-1.6/SQLite/Setup.lhs
@@ -20,8 +20,8 @@
preConf args flags = do
try (removeFile "SQLite.buildinfo")
return emptyHookedBuildInfo
- postConf :: [String] -> ConfigFlags -> LocalBuildInfo -> IO ExitCode
- postConf args flags localbuildinfo = do
+ postConf :: [String] -> ConfigFlags -> PackageDescription ->
LocalBuildInfo -> IO ExitCode
+ postConf args flags _ localbuildinfo = do
mb_bi <- pkgConfigBuildInfo (configVerbose flags) "sqlite"
let bi = case mb_bi of
Just bi -> bi
only in patch2:
unchanged:
--- haskell-hsql-1.6.orig/SQLite3/Setup.lhs
+++ haskell-hsql-1.6/SQLite3/Setup.lhs
@@ -20,8 +20,8 @@
preConf args flags = do
try (removeFile "SQLite3.buildinfo")
return emptyHookedBuildInfo
- postConf :: [String] -> ConfigFlags -> LocalBuildInfo -> IO ExitCode
- postConf args flags localbuildinfo = do
+ postConf :: [String] -> ConfigFlags -> PackageDescription ->
LocalBuildInfo -> IO ExitCode
+ postConf args flags _ localbuildinfo = do
mb_bi <- pkgConfigBuildInfo (configVerbose flags) "sqlite3"
let bi = case mb_bi of
Just bi -> bi
