[Pkg-haskell-commits] r1056 - in /packages/haskell-hsql-mysql/trunk/debian: ./ README.Debian changelog compat control copyright patches/ patches/00list patches/01_update-setup-for-Cabal-1.2.dpatch patches/02_update-cabal-file.dpatch rules watch
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Sun Feb 3 21:33:37 UTC 2008
Author: arjan
Date: Sun Feb 3 21:33:37 2008
New Revision: 1056
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1056
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
packages/haskell-hsql-mysql/trunk/debian/
packages/haskell-hsql-mysql/trunk/debian/README.Debian
packages/haskell-hsql-mysql/trunk/debian/changelog
packages/haskell-hsql-mysql/trunk/debian/compat
packages/haskell-hsql-mysql/trunk/debian/control
packages/haskell-hsql-mysql/trunk/debian/copyright
packages/haskell-hsql-mysql/trunk/debian/patches/
packages/haskell-hsql-mysql/trunk/debian/patches/00list
packages/haskell-hsql-mysql/trunk/debian/patches/01_update-setup-for-Cabal-1.2.dpatch (with props)
packages/haskell-hsql-mysql/trunk/debian/patches/02_update-cabal-file.dpatch (with props)
packages/haskell-hsql-mysql/trunk/debian/rules (with props)
packages/haskell-hsql-mysql/trunk/debian/watch
Added: packages/haskell-hsql-mysql/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/README.Debian?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/README.Debian (added)
+++ packages/haskell-hsql-mysql/trunk/debian/README.Debian Sun Feb 3 21:33:37 2008
@@ -1,0 +1,7 @@
+To gain access to this package's functions, use:
+
+-package hsql-mysql
+
+on your ghc command line.
+
+ -- Arjan Oosting <arjan at debian.org>, Mon, 21 Jan 2008 07:15:47 +0100
Added: packages/haskell-hsql-mysql/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/changelog?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/changelog (added)
+++ packages/haskell-hsql-mysql/trunk/debian/changelog Sun Feb 3 21:33:37 2008
@@ -1,0 +1,7 @@
+haskell-hsql-mysql (1.7-1~pre1) unstable; urgency=low
+
+ * New upstream release. The source tarball of haskell-hsql has been
+ split up and every Haskell library has it's own source source tarball
+ now.
+
+ -- Arjan Oosting <arjan at debian.org> Sun, 03 Feb 2008 19:37:37 +0100
Added: packages/haskell-hsql-mysql/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/compat?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/compat (added)
+++ packages/haskell-hsql-mysql/trunk/debian/compat Sun Feb 3 21:33:37 2008
@@ -1,0 +1,1 @@
+4
Added: packages/haskell-hsql-mysql/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/control?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/control (added)
+++ packages/haskell-hsql-mysql/trunk/debian/control Sun Feb 3 21:33:37 2008
@@ -1,0 +1,51 @@
+Source: haskell-hsql-mysql
+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),
+ libmysqlclient15-dev
+Build-Depends-Indep: ghc6-doc, haddock
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-hsql-mysql/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk
+
+Package: libghc6-hsql-mysql-dev
+Architecture: any
+Section: libdevel
+Suggests: haskell-hsql-mysql-doc
+Depends: ${haskell:Depends}, libmysqlclient15-dev, ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL 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-mysql-prof
+Architecture: any
+Section: libdevel
+Suggests: haskell-hsql-mysql-doc
+Depends: libghc6-hsql-mysql-dev (= ${binary:Version}), ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: MySQL 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-mysql-doc
+Section: doc
+Architecture: all
+Suggests: libghc6-hsql-mysql-dev
+Recommends: ghc6-doc, haskell-hsql-mysql-doc
+Description: Multi-Database Interface System 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 MySQL driver of HSQL.
Added: packages/haskell-hsql-mysql/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/copyright?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/copyright (added)
+++ packages/haskell-hsql-mysql/trunk/debian/copyright Sun Feb 3 21:33:37 2008
@@ -1,0 +1,44 @@
+This package was debianized by Arjan Oosting <arjan at debian.org> on
+Mon, 21 Jan 2008 07:11:00 +0100.
+
+It was downloaded from
+http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hsql-mysql-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-mysql/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/patches/00list?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/patches/00list (added)
+++ packages/haskell-hsql-mysql/trunk/debian/patches/00list Sun Feb 3 21:33:37 2008
@@ -1,0 +1,2 @@
+01_update-setup-for-Cabal-1.2
+02_update-cabal-file
Added: packages/haskell-hsql-mysql/trunk/debian/patches/01_update-setup-for-Cabal-1.2.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/patches/01_update-setup-for-Cabal-1.2.dpatch?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/patches/01_update-setup-for-Cabal-1.2.dpatch (added)
+++ packages/haskell-hsql-mysql/trunk/debian/patches/01_update-setup-for-Cabal-1.2.dpatch Sun Feb 3 21:33:37 2008
@@ -1,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_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-mysql-1.7~/Setup.lhs haskell-hsql-mysql-1.7/Setup.lhs
+--- haskell-hsql-mysql-1.7~/Setup.lhs 2007-04-09 21:48:02.000000000 +0200
++++ haskell-hsql-mysql-1.7/Setup.lhs 2008-02-03 21:05:15.000000000 +0100
+@@ -3,10 +3,11 @@
+ \begin{code}
+ import Data.Maybe(fromMaybe)
+ 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
+@@ -21,13 +22,12 @@
+ preConf args flags = do
+ try (removeFile "MySQL.buildinfo")
+ return emptyHookedBuildInfo
+- postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ExitCode
++ postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
+ postConf args flags _ localbuildinfo = do
+ mb_bi <- mysqlConfigBuildInfo (configVerbose flags)
+ let default_binfo | os == "mingw32" = emptyBuildInfo{extraLibs=["libmySQL"], ccOptions=["-Dmingw32_HOST_OS"]}
+ | otherwise = emptyBuildInfo{extraLibs=["mysqlclient"]}
+ writeHookedBuildInfo "MySQL.buildinfo" (Just (fromMaybe default_binfo mb_bi),[])
+- return ExitSuccess
+ \end{code}
+
+ The following code is derived from Distribution.Simple.Configure
+@@ -46,36 +46,21 @@
+ 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}
+-mysqlConfigBuildInfo :: Int -> IO (Maybe BuildInfo)
++mysqlConfigBuildInfo :: Verbosity -> IO (Maybe BuildInfo)
+ mysqlConfigBuildInfo verbose = do
+ mb_mysql_config_path <- findProgram "mysql_config" Nothing
+ case mb_mysql_config_path of
+ Just mysql_config_path -> do
+ message ("configuring mysqlclient library")
+- res <- rawSystemGrabOutput verbose mysql_config_path ["--libs"]
++ res <- rawSystemStdout verbose mysql_config_path ["--libs"]
+ let (lib_dirs,libs,ld_opts) = splitLibsFlags (words res)
+- res <- rawSystemGrabOutput verbose mysql_config_path ["--include"]
++ res <- rawSystemStdout verbose mysql_config_path ["--include"]
+ let (inc_dirs,cc_opts) = splitCFlags (words res)
+ let bi = emptyBuildInfo{extraLibDirs=lib_dirs, extraLibs=libs, ldOptions=ld_opts, includeDirs=inc_dirs, ccOptions=cc_opts}
+ return (Just bi)
Propchange: packages/haskell-hsql-mysql/trunk/debian/patches/01_update-setup-for-Cabal-1.2.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/haskell-hsql-mysql/trunk/debian/patches/02_update-cabal-file.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/patches/02_update-cabal-file.dpatch?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/patches/02_update-cabal-file.dpatch (added)
+++ packages/haskell-hsql-mysql/trunk/debian/patches/02_update-cabal-file.dpatch Sun Feb 3 21:33:37 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_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-mysql-1.7~/hsql-mysql.cabal haskell-hsql-mysql-1.7/hsql-mysql.cabal
+--- haskell-hsql-mysql-1.7~/hsql-mysql.cabal 2007-04-09 21:48:02.000000000 +0200
++++ haskell-hsql-mysql-1.7/hsql-mysql.cabal 2008-02-03 21:09:07.000000000 +0100
+@@ -5,7 +5,7 @@
+ category: Database
+ description: MySQL driver for HSQL.
+ exposed-modules: Database.HSQL.MySQL
+-build-depends: base, hsql
++build-depends: base, hsql, old-time
+ extensions: ForeignFunctionInterface, CPP
+ cc-options: -IDatabase/HSQL
+ extra-source-files: Database/HSQL/HsMySQL.h
Propchange: packages/haskell-hsql-mysql/trunk/debian/patches/02_update-cabal-file.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/haskell-hsql-mysql/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/rules?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/rules (added)
+++ packages/haskell-hsql-mysql/trunk/debian/rules Sun Feb 3 21:33:37 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-mysql/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: packages/haskell-hsql-mysql/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-hsql-mysql/trunk/debian/watch?rev=1056&op=file
==============================================================================
--- packages/haskell-hsql-mysql/trunk/debian/watch (added)
+++ packages/haskell-hsql-mysql/trunk/debian/watch Sun Feb 3 21:33:37 2008
@@ -1,0 +1,4 @@
+# See uscan(1) for format
+
+version=3
+http://hackage.haskell.org/packages/archive/hsql-mysql/([\d.]+)/hsql-mysql-([\d.]+).tar.gz
More information about the Pkg-haskell-commits
mailing list