[Pkg-haskell-commits] [SCM] HDBC ODBC support branch, master, updated. debian/2.2.0.0-1-4-g1716606

Sun Dec 6 20:18:48 UTC 2009

The following commit has been merged in the master branch:
commit 0f366c4c249eb2457365e93120a3f6fbe50b662f
Author: Joachim Breitner <nomeata at debian.org>
Date:   Sun Dec 6 21:08:33 2009 +0100

    Use hlibrary.mk (Closes: 559653)

diff --git a/debian/changelog b/debian/changelog
index 61fa96b..fea5417 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hdbc-odbc (2.2.0.0-2) unstable; urgency=low
+
+  * Use hlibrary.mk (Closes: 559653)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 06 Dec 2009 21:04:56 +0100
+
 hdbc-odbc (2.2.0.0-1) unstable; urgency=low
 
   * New upstream release with better support for binary fields.
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 4b16d0a..f657597 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,30 @@
 Source: hdbc-odbc
-Priority: optional
+Priority: extra
+Section: haskell
 Uploaders: John Goerzen <jgoerzen at complete.org>
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.8.2dfsg1), haskell-devscripts (>= 0.6.15), cpphs, haddock, hugs (>= 98.200503.08), libghc6-hdbc-dev (>= 2.1.0-2), unixodbc-dev (>= 2.2.11), libghc6-mtl-dev, libghc6-utf8-string-dev, libghc6-utf8-string-prof, libghc6-hunit-dev, libghc6-quickcheck-dev, libghc6-time-dev, libghc6-convertible-dev
-Standards-Version: 3.6.2
-Section: libs
+Build-Depends:
+ debhelper (>= 7),
+ ghc6 (>= 6.10),
+ haskell-devscripts (>= 0.6.18),
+ cdbs,
+ cpphs,
+ haddock,
+ libghc6-hdbc-dev (>= 2.2.0-2),
+ unixodbc-dev (>= 2.2.11),
+ libghc6-mtl-dev,
+ libghc6-utf8-string-dev,
+ libghc6-hunit-dev,
+ libghc6-quickcheck-dev,
+ libghc6-time-dev,
+ libghc6-convertible-dev
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-haskell/hdbc-odbc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-haskell/hdbc-odbc.git;a=summary
 
 Package: libghc6-hdbc-odbc-dev
-Section: libdevel
 Architecture: any
-Depends: libghc6-hdbc-dev (>= 2.1.0), ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}, unixodbc-dev (>= 2.2.11), libghc6-mtl-dev
+Depends: libghc6-hdbc-dev (>= 2.1.0), ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}, unixodbc-dev (>= 2.2.11)
 Description: unixODBC 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
@@ -35,7 +48,9 @@ Description: unixODBC HDBC (Haskell Database Connectivity) Driver for GHC
 Package: haskell-hdbc-odbc-doc
 Section: doc
 Architecture: all
-Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${haskell:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
 Description: Sqlite v3 HDBC (Haskell Database Connectivity) ODBC 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 ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/rules b/debian/rules
index 5103f0c..0e3080d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,112 +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_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
-# Nothing to do by default.
-
-# 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

-- 
HDBC ODBC support

