[Pkg-haskell-commits] r922 - in /packages/haskelldb/trunk/debian: changelog control haskelldb-doc.docs mk-haskell-depends rules
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Wed Jan 9 23:58:32 UTC 2008
Author: arjan
Date: Wed Jan 9 23:58:32 2008
New Revision: 922
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=922
Log:
r2370 at nebula: arjan | 2008-01-10 00:57:35 +0100
- Bump build dependency on haskell-devscripts to 0.6.0 which ships
dh_haskell_depends.
- Bump Standards-Version to 3.7.3. No changes needed.
- Make doc-base a Suggest instead of a Recommends.
- Add ghc6-doc and libghc6-mtl-doc to the Recommends.
* debian/rules:
- dh_haskell_install does not install empty directories anymore so no
need to cleanup after it. It also adjusts the path to the
documentation generated by haddock so stop adjusting it here.
- dh_haskell now handles the generating and installation of the
haddock documentation so remove this code as well.
* debian/mk-haskell-depends: Removed. Replaced by dh_haskell_depends.
Removed:
packages/haskelldb/trunk/debian/mk-haskell-depends
Modified:
packages/haskelldb/trunk/debian/changelog
packages/haskelldb/trunk/debian/control
packages/haskelldb/trunk/debian/haskelldb-doc.docs
packages/haskelldb/trunk/debian/rules
Modified: packages/haskelldb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/changelog?rev=922&op=diff
==============================================================================
--- packages/haskelldb/trunk/debian/changelog (original)
+++ packages/haskelldb/trunk/debian/changelog Wed Jan 9 23:58:32 2008
@@ -1,12 +1,4 @@
-haskelldb (0.10-1~pre2) experimental; urgency=low
-
- * debian/control:
- - Make doc-base a Suggest instead of a Recommends.
- - Add ghc6-doc and libghc6-mtl-doc to the Recommends.
-
- -- Arjan Oosting <arjan at debian.org> Sun, 11 Nov 2007 17:18:21 +0100
-
-haskelldb (0.10-1~pre1) experimental; urgency=low
+haskelldb (0.10-1~pre3) experimental; urgency=low
* New upstream release. (Closes: #446568)
* Because the Haskell library has been divided into a couple of Haskell
@@ -17,10 +9,22 @@
- Remove the haskelldb-bin binary package, which will now be build
from haskelldb-dynamic source package.
- Add Homepage field and use the official Vcs-* fields.
+ - Bump build dependency on haskell-devscripts to 0.6.0 which ships
+ dh_haskell_depends.
+ - Bump Standards-Version to 3.7.3. No changes needed.
+ - Make doc-base a Suggest instead of a Recommends.
+ - Add ghc6-doc and libghc6-mtl-doc to the Recommends.
+ * debian/rules:
+ - dh_haskell_install does not install empty directories anymore so no
+ need to cleanup after it. It also adjusts the path to the
+ documentation generated by haddock so stop adjusting it here.
+ - dh_haskell now handles the generating and installation of the
+ haddock documentation so remove this code as well.
+ * debian/mk-haskell-depends: Removed. Replaced by dh_haskell_depends.
* debian/watch: Update the uscan file to new upstream location.
(Closes: #450071)
-
- -- Arjan Oosting <arjan at debian.org> Sun, 11 Nov 2007 16:27:26 +0100
+
+ -- Arjan Oosting <arjan at debian.org> Thu, 10 Jan 2008 00:55:23 +0100
haskelldb (0.9.cvs.601-18) unstable; urgency=low
Modified: packages/haskelldb/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/control?rev=922&op=diff
==============================================================================
--- packages/haskelldb/trunk/debian/control (original)
+++ packages/haskelldb/trunk/debian/control Wed Jan 9 23:58:32 2008
@@ -4,9 +4,9 @@
Maintainer: Arjan Oosting <arjan at debian.org>
Build-Depends: autotools-dev, dctrl-tools, debhelper (>= 5),
dpatch, dpkg-dev (>= 0.13.19), ghc6 (>= 6.4.2),
- haskell-devscripts (>= 0.5.6), libghc6-mtl-dev, libghc6-mtl-prof
+ haskell-devscripts (>= 0.6.0), libghc6-mtl-dev, libghc6-mtl-prof
Build-Depends-Indep: haddock, ghc6-doc, libghc6-mtl-doc
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://haskelldb.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskelldb
Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb
Modified: packages/haskelldb/trunk/debian/haskelldb-doc.docs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/haskelldb-doc.docs?rev=922&op=diff
==============================================================================
--- packages/haskelldb/trunk/debian/haskelldb-doc.docs (original)
+++ packages/haskelldb/trunk/debian/haskelldb-doc.docs Wed Jan 9 23:58:32 2008
@@ -1,3 +1,3 @@
-dist/doc/html
+
Modified: packages/haskelldb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb/trunk/debian/rules?rev=922&op=diff
==============================================================================
--- packages/haskelldb/trunk/debian/rules (original)
+++ packages/haskelldb/trunk/debian/rules Wed Jan 9 23:58:32 2008
@@ -13,11 +13,6 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
-
-INCLUDE_DIRS=""
-HADDOCK_INTERFACES="/usr/share/doc/haskelldb-doc/html/haskelldb.haddock"
-HADDOCK_HTML="/usr/share/doc/haskelldb-doc/html"
-
setup: patch-stamp
dh_testdir
@@ -42,12 +37,6 @@
dh_clean -k -s
dh_installdirs -s
dh_haskell -s
- # remove empty directories installed by dh_haskell
- find debian/libghc6-*-dev/usr/lib/haskell-packages/ -empty -type d -delete
- sed -i -e "s%haddock-interfaces:.*%haddock-interfaces: $(HADDOCK_INTERFACES)%" \
- -e "s%haddock-html: .*%haddock-html: $(HADDOCK_HTML)%" \
- -e "s%include-dirs: .*%include-dirs: $(INCLUDE_DIRS)%" \
- debian/libghc6-*-dev/usr/lib/haskell-packages/ghc6/lib/*/installed-pkg-config
dh_install -s
install-indep: build-stamp
@@ -56,7 +45,6 @@
dh_clean -k -i
dh_installdirs -i
dh_haskell -i
- ./setup haddock
dh_install -i
# Must not depend on anything. This is to be called by
@@ -71,7 +59,7 @@
dh_fixperms
dh_installdeb
dh_shlibdeps
- sh -e debian/mk-haskell-depends
+ dh_haskell_depends
dh_gencontrol
dh_md5sums
dh_builddeb
More information about the Pkg-haskell-commits
mailing list