[Pkg-haskell-commits] [SCM] Haskell Database Connectivity branch, master, updated. debian/2.2.0-1-2-g471ab30
Joachim Breitner
nomeata at debian.org
Sat Dec 5 17:34:21 UTC 2009
The following commit has been merged in the master branch:
commit 471ab3072e28d32a4684c0cf97e2668950e0ebeb
Author: Joachim Breitner <nomeata at debian.org>
Date: Sat Dec 5 18:22:55 2009 +0100
Convert to using hlibrary.mk (Closes: #556815)
diff --git a/debian/changelog b/debian/changelog
index 20f91b4..4293118 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hdbc (2.2.0-2) unstable; urgency=low
+
+ * Convert to using hlibrary.mk (Closes: #556815)
+
+ -- Joachim Breitner <nomeata at debian.org> Sat, 05 Dec 2009 18:22:51 +0100
+
hdbc (2.2.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 1ceb5be..0e5c51a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,41 @@
Source: hdbc
-Priority: optional
+Priority: extra
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
Uploaders: John Goerzen <jgoerzen at complete.org>
-Maintainer: Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.10), haskell-devscripts (>= 0.6.15), cpphs, haddock, libghc6-mtl-dev, libghc6-time-dev, libghc6-time-prof, libghc6-convertible-dev (>= 1.0.1-2), libghc6-convertible-prof (>= 1.0.1-2), libghc6-mtl-prof, libghc6-utf8-string-prof, libghc6-testpack-dev
-Build-Depends-Indep: debhelper (>= 4.0.0), haddock, hugs (>= 98.200503.08), haskell-devscripts (>= 0.6.15), ghc6 (>= 6.10), cpphs, libghc6-mtl-doc, libghc6-time-doc, ghc6-doc, haskell-convertible-doc, libhugs-convertible (>= 1.0.1-2), libhugs-time-bundled, libghc6-utf8-string-doc, libghc6-testpack-dev
-Standards-Version: 3.6.2
-Section: libs
+Build-Depends:
+ cdbs,
+ debhelper (>= 7),
+ ghc6 (>= 6.10),
+ haskell-devscripts (>= 0.6.18),
+ cpphs,
+ haddock,
+ libghc6-mtl-dev,
+ libghc6-mtl-prof,
+ libghc6-time-dev,
+ libghc6-time-prof,
+ libghc6-convertible-dev (>= 1.0.1-2),
+ libghc6-convertible-prof,
+ libghc6-utf8-string-dev,
+ libghc6-utf8-string-prof,
+ libghc6-testpack-dev,
+ ghc6-doc,
+ haddock,
+ hscolour,
+ libghc6-mtl-doc,
+ libghc6-time-doc,
+ haskell-convertible-doc,
+ libghc6-utf8-string-doc
+Standards-Version: 3.8.3
+Section: haskell
Homepage: http://software.complete.org/hdbc
Vcs-Git: git://git.debian.org/git/pkg-haskell/hdbc.git
Vcs-Browser: http://git.debian.org/?p=pkg-haskell/hdbc.git;a=summary
Package: libghc6-hdbc-dev
-Section: libdevel
Architecture: any
-Depends: ${haskell:Depends}, libghc6-mtl-dev
-Suggests: libghc6-hdbc-postgresql-dev | libghc6-hdbc-sqlite3-dev, libghc6-hdbc-missingh-dev
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${haskell:Depends}
+Suggests: libghc6-hdbc-postgresql-dev | libghc6-hdbc-sqlite3-dev, libghc6-hdbc-missingh-dev, ${haskell:Suggests}
+Recommends: ${haskell:Recommends}
Description: Haskell Database Connectivity, GHC6 package
HDBC provides an abstraction layer between Haskell programs and SQL
relational databases. This lets you write database code once, in
@@ -28,9 +49,8 @@ Description: Haskell Database Connectivity, GHC6 package
as libghc6-hdbc-postgresql-dev.
Package: libghc6-hdbc-prof
-Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libghc6-hdbc-dev, ghc6-prof (>= 6.10)
+Depends: ${haskell:Depends}, ${misc:Depends}
Description: Haskell Database Connectivity, GHC6 profiling data
HDBC provides an abstraction layer between Haskell programs and SQL
relational databases. This package provides profiling information for using
@@ -55,7 +75,9 @@ Description: Haskell Database Connectivity, GHC6 profiling data
Package: haskell-hdbc-doc
Section: doc
Architecture: all
-Depends: ${haskell:Depends}
+Depends: ${haskell:Depends}, ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
Description: 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/hdbc.doc-base.EX b/debian/hdbc.doc-base.EX
deleted file mode 100644
index 96f6a14..0000000
--- a/debian/hdbc.doc-base.EX
+++ /dev/null
@@ -1,22 +0,0 @@
-Document: hdbc
-Title: Debian hdbc Manual
-Author: <insert document author here>
-Abstract: This manual describes what hdbc is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/hdbc/hdbc.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/hdbc/hdbc.ps.gz
-
-Format: text
-Files: /usr/share/doc/hdbc/hdbc.text.gz
-
-Format: HTML
-Index: /usr/share/doc/hdbc/html/index.html
-Files: /usr/share/doc/hdbc/html/*.html
-
-
diff --git a/debian/rules b/debian/rules
index 4760186..0e3080d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,152 +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)
- #$(MAKE) doc
-
- $(MAKE) test-ghc
-
- 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
- -rm -rf doc
-
- dh_clean
-
-install-a: 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
-
-install-i: 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 -i
-
-
-
-
-# Build architecture-independent files here.
-binary-indep: build install-i
- 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 -X.haddock
- 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-a
- 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 -X.haddock
- 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
--
Haskell Database Connectivity
More information about the Pkg-haskell-commits
mailing list