[Pkg-haskell-commits] darcs: haskell-hsql-sqlite3: releasing version 1.8.1-2
Joachim Breitner
mail at joachim-breitner.de
Sat May 19 20:40:20 UTC 2012
Sat May 19 20:40:10 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* releasing version 1.8.1-2
Ignore-this: aeaf4c103ab67b27a5fb9a0aab7ba664
M ./changelog -2 +2
R ./patches/
R ./patches/00list
R ./patches/01_update-cabal-file.dpatch
R ./patches/02_update-setup-for-Cabal-1.2.dpatch
A ./source/
A ./source/format
Sat May 19 20:40:10 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* releasing version 1.8.1-2
Ignore-this: aeaf4c103ab67b27a5fb9a0aab7ba664
diff -rN -u old-haskell-hsql-sqlite3//changelog new-haskell-hsql-sqlite3//changelog
--- old-haskell-hsql-sqlite3//changelog 2012-05-19 20:40:19.893327449 +0000
+++ new-haskell-hsql-sqlite3//changelog 2012-05-19 20:40:19.913332587 +0000
@@ -1,8 +1,8 @@
-haskell-hsql-sqlite3 (1.8.1-2) UNRELEASED; urgency=low
+haskell-hsql-sqlite3 (1.8.1-2) unstable; urgency=low
* Use standard docs directory, avoids upgrade problems.
- -- Joachim Breitner <nomeata at debian.org> Sat, 19 May 2012 22:37:08 +0200
+ -- Joachim Breitner <nomeata at debian.org> Sat, 19 May 2012 22:37:14 +0200
haskell-hsql-sqlite3 (1.8.1-1) unstable; urgency=low
diff -rN -u old-haskell-hsql-sqlite3//patches/00list new-haskell-hsql-sqlite3//patches/00list
--- old-haskell-hsql-sqlite3//patches/00list 2012-05-19 20:40:19.905327430 +0000
+++ new-haskell-hsql-sqlite3//patches/00list 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-01_update-cabal-file
-02_update-setup-for-Cabal-1.2
diff -rN -u old-haskell-hsql-sqlite3//patches/01_update-cabal-file.dpatch new-haskell-hsql-sqlite3//patches/01_update-cabal-file.dpatch
--- old-haskell-hsql-sqlite3//patches/01_update-cabal-file.dpatch 2012-05-19 20:40:19.901333152 +0000
+++ new-haskell-hsql-sqlite3//patches/01_update-cabal-file.dpatch 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_update-cabal-file.dpatch by Arjan Oosting <arjan at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad haskell-hsql-sqlite3-1.7~/hsql-sqlite3.cabal haskell-hsql-sqlite3-1.7/hsql-sqlite3.cabal
---- haskell-hsql-sqlite3-1.7~/hsql-sqlite3.cabal 2007-04-09 20:53:41.000000000 +0200
-+++ haskell-hsql-sqlite3-1.7/hsql-sqlite3.cabal 2008-02-04 07:12:37.000000000 +0100
-@@ -5,5 +5,5 @@
- category: Database
- description: SQLite3 driver for HSQL.
- exposed-modules: Database.HSQL.SQLite3
--build-depends: base, hsql
-+build-depends: base, hsql, old-time
- extensions: ForeignFunctionInterface, CPP
diff -rN -u old-haskell-hsql-sqlite3//patches/02_update-setup-for-Cabal-1.2.dpatch new-haskell-hsql-sqlite3//patches/02_update-setup-for-Cabal-1.2.dpatch
--- old-haskell-hsql-sqlite3//patches/02_update-setup-for-Cabal-1.2.dpatch 2012-05-19 20:40:19.901333152 +0000
+++ new-haskell-hsql-sqlite3//patches/02_update-setup-for-Cabal-1.2.dpatch 1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_update-setup-for-Cabal-1.2.dpatch by Arjan Oosting <arjan at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad haskell-hsql-sqlite3-1.7~/Setup.lhs haskell-hsql-sqlite3-1.7/Setup.lhs
---- haskell-hsql-sqlite3-1.7~/Setup.lhs 2007-04-09 20:53:41.000000000 +0200
-+++ haskell-hsql-sqlite3-1.7/Setup.lhs 2008-02-04 07:21:52.000000000 +0100
-@@ -2,10 +2,11 @@
-
- \begin{code}
- import Distribution.PackageDescription
--import Distribution.Setup
- import Distribution.Simple
-+import Distribution.Simple.Setup
- import Distribution.Simple.LocalBuildInfo
--import Distribution.Simple.Utils(rawSystemVerbose)
-+import Distribution.Simple.Utils(rawSystemStdout)
-+import Distribution.Verbosity
- import System.Info
- import System.Exit
- import System.Directory
-@@ -20,14 +21,13 @@
- preConf args flags = do
- try (removeFile "SQLite3.buildinfo")
- return emptyHookedBuildInfo
-- postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ExitCode
-+ postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
- postConf args flags _ localbuildinfo = do
- mb_bi <- pkgConfigBuildInfo (configVerbose flags) "sqlite3"
- let bi = case mb_bi of
- Just bi -> bi
- Nothing -> emptyBuildInfo{extraLibs=["sqlite3"]}
-- writeHookedBuildInfo "SQLite3.buildinfo" (Just bi,[])
-- return ExitSuccess
-+ writeHookedBuildInfo "SQLite3.buildinfo" (Just bi,[])
- \end{code}
-
- The following code is derived from Distribution.Simple.Configure
-@@ -46,42 +46,27 @@
- message ("Using " ++ name ++ ": " ++ path)
- return (Just path)
-
--rawSystemGrabOutput :: Int -> FilePath -> [String] -> IO String
--rawSystemGrabOutput verbose path args = do
-- when (verbose > 0) $
-- putStrLn (path ++ concatMap (' ':) args)
-- (inp,out,err,pid) <- runInteractiveProcess path args Nothing Nothing
-- exitCode <- waitForProcess pid
-- if exitCode /= ExitSuccess
-- then do errMsg <- hGetContents err
-- hPutStr stderr errMsg
-- exitWith exitCode
-- else return ()
-- hClose inp
-- hClose err
-- hGetContents out
--
- message :: String -> IO ()
- message s = putStrLn $ "configure: " ++ s
- \end{code}
-
- Populate BuildInfo using pkg-config tool.
- \begin{code}
--pkgConfigBuildInfo :: Int -> String -> IO (Maybe BuildInfo)
-+pkgConfigBuildInfo :: Verbosity -> String -> IO (Maybe BuildInfo)
- pkgConfigBuildInfo verbose pkgName = do
- mb_pkg_config_path <- findProgram "pkg-config" Nothing
- case mb_pkg_config_path of
- Just pkg_config_path -> do
- message ("configuring "++pkgName++" package using pkg-config")
-- res <- rawSystemGrabOutput verbose pkg_config_path [pkgName, "--libs-only-l"]
-+ res <- rawSystemStdout verbose pkg_config_path [pkgName, "--libs-only-l"]
- let libs = map (tail.tail) (words res)
-- res <- rawSystemGrabOutput verbose pkg_config_path [pkgName, "--libs-only-L"]
-+ res <- rawSystemStdout verbose pkg_config_path [pkgName, "--libs-only-L"]
- let lib_dirs = map (tail.tail) (words res)
-- res <- rawSystemGrabOutput verbose pkg_config_path [pkgName, "--libs-only-other"]
-+ res <- rawSystemStdout verbose pkg_config_path [pkgName, "--libs-only-other"]
- let ld_opts = words res
-- res <- rawSystemGrabOutput verbose pkg_config_path [pkgName, "--cflags-only-I"]
-+ res <- rawSystemStdout verbose pkg_config_path [pkgName, "--cflags-only-I"]
- let inc_dirs = map (tail.tail) (words res)
-- res <- rawSystemGrabOutput verbose pkg_config_path [pkgName, "--cflags-only-other"]
-+ res <- rawSystemStdout verbose pkg_config_path [pkgName, "--cflags-only-other"]
- let cc_opts = words res
- let bi = emptyBuildInfo{extraLibs=libs, extraLibDirs=lib_dirs, ldOptions=ld_opts, includeDirs=inc_dirs, ccOptions=cc_opts}
- return (Just bi)
diff -rN -u old-haskell-hsql-sqlite3//source/format new-haskell-hsql-sqlite3//source/format
--- old-haskell-hsql-sqlite3//source/format 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hsql-sqlite3//source/format 2012-05-19 20:40:19.929326655 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-haskell-commits
mailing list