tag 381815 patch thanks Hi, I have prepared an update for haskelldb which fixes the RC bug and some related issues (see changelog below). After a new version of haskell-hsql is uploaded haskelldb can be uploaded with the attached changes.
As I am not a DD yet, I can not NMU haskell-hsql (I have supplied a
patch though) and can not upload haskelldb. So if someone is willing to
NMU haskell-hsql and upload haskelldb it would be nice.
Greetings Arjan
* QA upload.
* debian/control:
- Add a Section for the source package.
- Update build dependency on ghc6. (Closes: #381815)
- Add missing Depends on libghc6-hsql-mysql-dev,
libghc6-hsql-odbc-dev, libghc6-hsql-postgresql-dev and
libghc6-hsql-sqlite-dev needed to configure and use
libghc6-haskelldb-dev.
- Make sure libghc6-haskell-dev depends on the version of
libghc-hsql-dev it was build against by using the ${HSQL:Version}
substitution variable.
- Add dctrl-tools to Build-Depends because grep-dctrl is used to
determine the version of libghc6-hsql-dev.
- Bump Standards-Version. No changes needed.
* debian/haskelldb.cabal:
- Add hsql-odbc, hsql-mysql, hsql-sqlite and hsql-postgresql to the
Build-Depends as these modules are needed to build haskelldb and
ghc6 (>= 6.4.2) will not make them available by default anymore.
- Remove Allow prefix from the needed extensions declarations.
* debian/rules:
- Remove commented out dh_make template cruft.
- Touch configure-stamp at the end of the configure-stamp target.
- Do not ignore errors on clean.
- Generate the ${HSQL:Version} substitution variable.
diff -u haskelldb-0.9.cvs.601/debian/changelog haskelldb-0.9.cvs.601/debian/changelog
--- haskelldb-0.9.cvs.601/debian/changelog
+++ haskelldb-0.9.cvs.601/debian/changelog
@@ -1,3 +1,32 @@
+haskelldb (0.9.cvs.601-10) unstable; urgency=low
+
+ * QA upload.
+ * debian/control:
+ - Add a Section for the source package.
+ - Update build dependency on ghc6. (Closes: #381815)
+ - Add missing Depends on libghc6-hsql-mysql-dev,
+ libghc6-hsql-odbc-dev, libghc6-hsql-postgresql-dev and
+ libghc6-hsql-sqlite-dev needed to configure and use
+ libghc6-haskelldb-dev.
+ - Make sure libghc6-haskell-dev depends on the version of
+ libghc-hsql-dev it was build against by using the ${HSQL:Version}
+ substitution variable.
+ - Add dctrl-tools to Build-Depends because grep-dctrl is used to
+ determine the version of libghc6-hsql-dev.
+ - Bump Standards-Version. No changes needed.
+ * debian/haskelldb.cabal:
+ - Add hsql-odbc, hsql-mysql, hsql-sqlite and hsql-postgresql to the
+ Build-Depends as these modules are needed to build haskelldb and
+ ghc6 (>= 6.4.2) will not make them available by default anymore.
+ - Remove Allow prefix from the needed extensions declarations.
+ * debian/rules:
+ - Remove commented out dh_make template cruft.
+ - Touch configure-stamp at the end of the configure-stamp target.
+ - Do not ignore errors on clean.
+ - Generate the ${HSQL:Version} substitution variable.
+
+ -- Arjan Oosting <[EMAIL PROTECTED]> Mon, 7 Aug 2006 16:05:44 +0200
+
haskelldb (0.9.cvs.601-9) unstable; urgency=medium
* QA upload.
diff -u haskelldb-0.9.cvs.601/debian/control haskelldb-0.9.cvs.601/debian/control
--- haskelldb-0.9.cvs.601/debian/control
+++ haskelldb-0.9.cvs.601/debian/control
@@ -1,14 +1,15 @@
Source: haskelldb
+Section: devel
Priority: optional
Maintainer: Debian QA Group <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.4.1), ghc6 (<< 6.4.1-999), haskell-devscripts (>= 0.5.6), libghc6-hsql-dev (>= 1.6-4), libghc6-hsql-mysql-dev, libghc6-hsql-odbc-dev, libghc6-hsql-postgresql-dev, libghc6-hsql-sqlite-dev
-Standards-Version: 3.6.2
+Build-Depends: dctrl-tools, debhelper (>= 4.0.0), ghc6 (>= 6.4.2), haskell-devscripts (>= 0.5.6), libghc6-hsql-dev (>= 1.6-4), libghc6-hsql-mysql-dev, libghc6-hsql-odbc-dev, libghc6-hsql-postgresql-dev, libghc6-hsql-sqlite-dev
+Standards-Version: 3.7.2
Package: libghc6-haskelldb-dev
Section: libdevel
Architecture: any
Suggests: haskelldb-bin
-Depends: libghc6-hsql-dev (>= 1.4-5), ${shlibs:Depends}, ${haskell:Depends}
+Depends: libghc6-hsql-dev (>= ${HSQL:Version}), libghc6-hsql-dev (<< ${HSQL:VERSION}++), libghc6-hsql-mysql-dev, libghc6-hsql-odbc-dev, libghc6-hsql-postgresql-dev, libghc6-hsql-sqlite-dev, ${shlibs:Depends}, ${haskell:Depends}
Description: Haskell library for expressing database queries
HaskellDB is a Haskell library for expressing database queries and
operations in a type safe and declarative way. HaskellDB compiles a
diff -u haskelldb-0.9.cvs.601/debian/rules haskelldb-0.9.cvs.601/debian/rules
--- haskelldb-0.9.cvs.601/debian/rules
+++ haskelldb-0.9.cvs.601/debian/rules
@@ -9,9 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -19,62 +16,41 @@
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-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)}'`
+HSQL_VERSION := $(shell grep-dctrl -P libghc6-hsql-dev -s Version \
+ -n /var/lib/dpkg/status | sed "s|\(.*\)-[0-9.]\+|\1|" )
configure: configure-stamp
configure-stamp:
dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
./preprocess -DWITH_HSQL_ODBC -DWITH_HSQL_MYSQL -DWITH_HSQL_SQLITE \
-DWITH_HSQL_POSTGRESQL \
src/Database/HaskellDB/GenericConnect.pphs > \
src/Database/HaskellDB/GenericConnect.hs
+ 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 \
+ if [ -x setup ] && [ -e .setup-config ]; then ./setup clean ; fi
+ rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist \
src/Database/HaskellDB/GenericConnect.hs local-pkg \
DBDirect
-
dh_clean
+ echo $(HSQL_VERSION)
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs -a
-
- # Add here commands to install the package into debian/tmp
- #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
dh_haskell -a
#echo "[" > local-pkg
#cat .installed-pkg-config >> local-pkg
@@ -85,7 +61,7 @@
# -fallow-overlapping-instances -fglasgow-exts \
# -fallow-undecidable-instances \
# -package haskelldb --make src/DBDirect.hs
- cp dist/build/src/DBDirect debian/haskelldb-bin/usr/bin/
+ cp dist/build/DBDirect/DBDirect debian/haskelldb-bin/usr/bin/
# Build architecture-independent files here.
@@ -99,27 +75,14 @@
dh_installchangelogs -a ChangeLog
dh_installdocs -a
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_gencontrol -a -- -VHSQL:Version=$(HSQL_VERSION)
dh_md5sums -a
dh_builddeb -a
diff -u haskelldb-0.9.cvs.601/haskelldb.cabal haskelldb-0.9.cvs.601/haskelldb.cabal
--- haskelldb-0.9.cvs.601/haskelldb.cabal
+++ haskelldb-0.9.cvs.601/haskelldb.cabal
@@ -29,11 +29,11 @@
Database.HaskellDB.HSQL.SQLite,
Database.HaskellDB.HSQL.PostgreSQL
-Build-Depends: hsql>=1.4, base
-Extensions: AllowOverlappingInstances, AllowUndecidableInstances
+Build-Depends: base, hsql >= 1.4 , hsql-odbc, hsql-mysql, hsql-sqlite, hsql-postgresql
+Extensions: OverlappingInstances, UndecidableInstances
ghc-options: -fglasgow-exts -O2
Executable: DBDirect
Main-Is: DBDirect.hs
-Extensions: AllowOverlappingInstances, AllowUndecidableInstances
+Extensions: OverlappingInstances, UndecidableInstances
HS-Source-Dir: src
ghc-options: -fglasgow-exts -O2
signature.asc
Description: Dit berichtdeel is digitaal ondertekend
