diff --git a/debian/changelog b/debian/changelog index fdd02ee..d969e0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hdbc-postgresql (2.2.0.0-2) unstable; urgency=low + + * Switch to hlibrary.mk (Closes: 559654) + + -- Joachim Breitner Sun, 06 Dec 2009 21:20:20 +0100 + hdbc-postgresql (2.2.0.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index 219c121..f2bbf03 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,30 @@ Source: hdbc-postgresql -Priority: optional +Priority: extra +Section: haskell Uploaders: John Goerzen Maintainer: Debian Haskell Group -Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.10), haskell-devscripts (>= 0.6.15), cpphs, haddock, libghc6-hdbc-dev (>= 2.2.0), libpq-dev (>= 8.1.1), libghc6-mtl-dev, libghc6-parsec-dev -Build-Depends-Indep: haskell-hdbc-doc, ghc6-doc -Standards-Version: 3.8.0 -Section: libs +Build-Depends: + debhelper (>= 7), + ghc6 (>= 6.10), + haskell-devscripts (>= 0.6.18), + cdbs, + cpphs, + haddock, + hscolour, + libghc6-hdbc-dev (>= 2.2.0), + libpq-dev (>= 8.1.1), + libghc6-mtl-dev, + libghc6-parsec-dev, + ghc6-doc, + haskell-hdbc-doc +Standards-Version: 3.8.3 Homepage: http://software.complete.org/hdbc-postgresql Vcs-Git: git://git.debian.org/git/pkg-haskell/hdbc-postgresql.git Vcs-Browser: http://git.debian.org/?p=pkg-haskell/hdbc-postgresql.git;a=summary Package: libghc6-hdbc-postgresql-dev -Section: libdevel Architecture: any -Depends: libghc6-hdbc-dev (>= 2.2.0), ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}, libpq-dev (>= 8.1.1), libghc6-mtl-dev, libghc6-parsec-dev +Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}, libpq-dev (>= 8.1.1), libghc6-mtl-dev Description: PostgreSQL HDBC (Haskell Database Connectivity) Driver for GHC HDBC provides an abstraction layer between Haskell programs and SQL relational databases. This lets you write database code once, in @@ -24,7 +35,9 @@ Description: PostgreSQL HDBC (Haskell Database Connectivity) Driver for GHC Package: haskell-hdbc-postgresql-doc Section: doc Architecture: all -Depends: haskell-hdbc-doc (>= 2.2.0), ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends} +Depends: ${haskell:Depends}, ${misc:Depends} +Recommends: ${haskell:Recommends} +Suggests: ${haskell:Suggests} Description: PostgreSQL HDBC (Haskell Database Connectivity) documentation HDBC provides an abstraction layer between Haskell programs and SQL relational databases. This lets you write database code once, in diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index e69de29..0000000 diff --git a/debian/docs b/debian/docs index d1bd355..0389f2c 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,2 @@ README.txt -README.txt TODO diff --git a/debian/rules b/debian/rules index c4a65de..0e3080d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,140 +1,5 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - #$(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - -./setup clean - -rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp - #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - dh_haskell -a - dh_haskell -i - dh_haskell_depends -a -# $(MAKE) clean -# We can't test PostgreSQL because the server may not be available for -# the build user. -#$(MAKE) test - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs -i - dh_installdocs -i README.txt - dh_installexamples -i -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman -i - dh_link -i - dh_strip -i - dh_compress -i - dh_fixperms -i -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb -i - dh_shlibdeps -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs -a - dh_installdocs -a README.txt - dh_installexamples -a -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman -a - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +# Standard way of building Haskell libraries . +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/hlibrary.mk