[Pkg-haskell-commits] r1073 - in /packages/haskell-hsql-sqlite3/trunk/debian: ./ README.Debian changelog compat control copyright patches/ patches/00list patches/01_update-cabal-file.dpatch patches/02_update-setup-for-Cabal-1.2.dpatch rules watch

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Mon Feb 4 06:28:24 UTC 2008


Author: arjan
Date: Mon Feb  4 06:28:23 2008
New Revision: 1073

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1073
Log:
[svn-inject] Applying Debian modifications to trunk

Added:
    packages/haskell-hsql-sqlite3/trunk/debian/
    packages/haskell-hsql-sqlite3/trunk/debian/README.Debian
    packages/haskell-hsql-sqlite3/trunk/debian/changelog
    packages/haskell-hsql-sqlite3/trunk/debian/compat
    packages/haskell-hsql-sqlite3/trunk/debian/control
    packages/haskell-hsql-sqlite3/trunk/debian/copyright
    packages/haskell-hsql-sqlite3/trunk/debian/patches/
    packages/haskell-hsql-sqlite3/trunk/debian/patches/00list
    packages/haskell-hsql-sqlite3/trunk/debian/patches/01_update-cabal-file.dpatch   (with props)
    packages/haskell-hsql-sqlite3/trunk/debian/patches/02_update-setup-for-Cabal-1.2.dpatch   (with props)
    packages/haskell-hsql-sqlite3/trunk/debian/rules   (with props)
    packages/haskell-hsql-sqlite3/trunk/debian/watch

Added: packages/haskell-hsql-sqlite3/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/README.Debian?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/README.Debian (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/README.Debian Mon Feb  4 06:28:23 2008
@@ -1,0 +1,7 @@
+To gain access to this package's functions, use:
+
+-package hsql-sqlite3
+
+on your ghc command line.
+
+ -- Arjan Oosting <arjan at debian.org>, Mon,  4 Feb 2008 07:07:47 +0100

Added: packages/haskell-hsql-sqlite3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/changelog?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/changelog (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/changelog Mon Feb  4 06:28:23 2008
@@ -1,0 +1,7 @@
+haskell-hsql-sqlite3 (1.7-1~pre1) unstable; urgency=low
+
+  * New upstream release. The source tarball of haskell-hsql has been
+    split up and every HSQL Haskell library has its own source source
+    tarball now.
+
+ -- Arjan Oosting <arjan at debian.org>  Mon, 04 Feb 2008 07:10:53 +0100

Added: packages/haskell-hsql-sqlite3/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/compat?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/compat (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/compat Mon Feb  4 06:28:23 2008
@@ -1,0 +1,1 @@
+4

Added: packages/haskell-hsql-sqlite3/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/control?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/control (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/control Mon Feb  4 06:28:23 2008
@@ -1,0 +1,51 @@
+Source: haskell-hsql-sqlite3
+Section: devel
+Priority: optional
+Maintainer: Arjan Oosting <arjan at debian.org>
+Uploaders: Víctor Pérez Pereira <vperez at debianvenezuela.org>
+Build-Depends: cpphs, debhelper (>= 4.0.0), dpatch, 
+ haskell-devscripts (>= 0.6.0), ghc6 (>= 6.8.2), ghc6-prof,
+ libghc6-hsql-dev (>= 1.7), libghc6-hsql-prof (>= 1.7), 
+ libsqlite3-dev, pkg-config
+Build-Depends-Indep: ghc6-doc, haddock, haskell-hsql-doc
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-hsql-postgresql/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-postgresql/trunk
+
+Package: libghc6-hsql-sqlite3-dev
+Architecture: any
+Section: libdevel
+Suggests: haskell-hsql-sqlite3-doc
+Depends: ${haskell:Depends}, libsqlite3-dev, ${shlibs:Depends}, ${misc:Depends}
+Description: SQLite driver of the HSQL library for GHC6  
+ HSQL provides interfaces for Haskell programmers to the PostgreSQL,
+ MySQL, SQLite, and UnixODBC database systems.  There is a generic
+ abstract interface so that code can be used interchangeably with these
+ database systems.  In this sense, it is similar to Java's JDBC,
+ Python's DB-API, or Perl's DBI.
+
+Package: libghc6-hsql-sqlite3-prof
+Architecture: any
+Section: libdevel
+Suggests: haskell-hsql-sqlite3-doc
+Depends: libghc6-hsql-sqlite3-dev (= ${binary:Version}), ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: SQLite driver of the HSQL profiling library for GHC6
+ HSQL provides interfaces for Haskell programmers to the PostgreSQL,
+ MySQL, SQLite, and UnixODBC database systems.  There is a generic
+ abstract interface so that code can be used interchangeably with these
+ database systems.  In this sense, it is similar to Java's JDBC,
+ Python's DB-API, or Perl's DBI.
+
+Package: haskell-hsql-sqlite3-doc
+Section: doc
+Architecture: all
+Suggests: libghc6-hsql-sqlite3-dev
+Recommends: ghc6-doc, haskell-hsql-doc
+Description: API documentation of the hsql-sqlite3 library for Haskell
+ HSQL provides interfaces for Haskell programmers to the PostgreSQL,
+ MySQL, SQLite, and UnixODBC database systems.  There is a generic
+ abstract interface so that code can be used interchangeably with these
+ database systems.  In this sense, it is similar to Java's JDBC,
+ Python's DB-API, or Perl's DBI.
+ .
+ This package provides documentation for SQLite driver of HSQL.

Added: packages/haskell-hsql-sqlite3/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/copyright?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/copyright (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/copyright Mon Feb  4 06:28:23 2008
@@ -1,0 +1,44 @@
+This package was debianized by Arjan Oosting <arjan at debian.org> on
+Mon,  4 Feb 2008 00:25:00 +0100.
+
+It was downloaded from 
+http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hsql-sqlite3-1.7
+
+Copyright (c) 2003-2007, Krasimir Angelov
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+  this list of conditions and the following disclaimer. 
+
+  * Redistributions in binary form must reproduce the above copyright notice, 
+  this list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution. 
+
+  * Neither the name of the HToolkit nor the names of its contributors may be 
+  used to endorse or promote products derived from this software without 
+  specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Debian packaging copyright:
+
+  (C) 2007 Arjan Oosting <arjan at debian.org>
+
+The Debian packaging can be redistributed and/or modified under the
+same terms as HSQL itself.

Added: packages/haskell-hsql-sqlite3/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/patches/00list?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/patches/00list (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/patches/00list Mon Feb  4 06:28:23 2008
@@ -1,0 +1,2 @@
+01_update-cabal-file
+02_update-setup-for-Cabal-1.2

Added: packages/haskell-hsql-sqlite3/trunk/debian/patches/01_update-cabal-file.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/patches/01_update-cabal-file.dpatch?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/patches/01_update-cabal-file.dpatch (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/patches/01_update-cabal-file.dpatch Mon Feb  4 06:28:23 2008
@@ -1,0 +1,17 @@
+#! /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

Propchange: packages/haskell-hsql-sqlite3/trunk/debian/patches/01_update-cabal-file.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/haskell-hsql-sqlite3/trunk/debian/patches/02_update-setup-for-Cabal-1.2.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/patches/02_update-setup-for-Cabal-1.2.dpatch?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/patches/02_update-setup-for-Cabal-1.2.dpatch (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/patches/02_update-setup-for-Cabal-1.2.dpatch Mon Feb  4 06:28:23 2008
@@ -1,0 +1,90 @@
+#! /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)

Propchange: packages/haskell-hsql-sqlite3/trunk/debian/patches/02_update-setup-for-Cabal-1.2.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/haskell-hsql-sqlite3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/rules?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/rules (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/rules Mon Feb  4 06:28:23 2008
@@ -1,0 +1,77 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+#
+# Based on dh-make template containing work of Joey Hess, Craig Small
+# and Bill Allombert. 
+#
+
+# Include dpatch
+include /usr/share/dpatch/dpatch.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+setup: patch-stamp
+	dh_testdir
+	ghc --make Setup -o setup -package Cabal 
+
+build: build-stamp
+build-stamp: setup
+	touch $@
+
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	if [ -x setup ] && [ -e .setup-config ]; then ./setup clean ; fi
+	rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist html
+	dh_clean 
+
+install: install-arch install-indep
+install-arch: build-stamp
+	dh_testdir 
+	dh_testroot
+	dh_clean -k -s
+	dh_installdirs -s
+	dh_haskell -s
+	dh_install -s
+
+install-indep: build-stamp
+	dh_testdir 
+	dh_testroot
+	dh_clean -k -i
+	dh_installdirs -i
+	dh_haskell -i
+	dh_install -i
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_compress -X.haddock 
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_haskell_depends
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: binary binary-arch binary-indep build clean clean-patched install install-arch install-indep 

Propchange: packages/haskell-hsql-sqlite3/trunk/debian/rules
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/haskell-hsql-sqlite3/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-sqlite3/trunk/debian/watch?rev=1073&op=file
==============================================================================
--- packages/haskell-hsql-sqlite3/trunk/debian/watch (added)
+++ packages/haskell-hsql-sqlite3/trunk/debian/watch Mon Feb  4 06:28:23 2008
@@ -1,0 +1,5 @@
+
+# See uscan(1) for format
+
+version=3
+http://hackage.haskell.org/packages/archive/hsql-sqlite3/([\d.]+)/hsql-sqlite3-([\d.]+).tar.gz




More information about the Pkg-haskell-commits mailing list