[Pkg-haskell-commits] r1023 - in /packages/haskelldb-hsql/trunk/debian: changelog rules

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Jan 27 13:36:23 2008
New Revision: 1023

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1023
Log:
 r2548 at nebula:  arjan | 2008-01-21 06:56:40 +0100
 * Replace debian/rules with 'standard' debian/rules

Modified:
    packages/haskelldb-hsql/trunk/debian/changelog
    packages/haskelldb-hsql/trunk/debian/rules

Modified: packages/haskelldb-hsql/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-hsql/trunk/debian/changelog?rev=1023&op=diff
==============================================================================
--- packages/haskelldb-hsql/trunk/debian/changelog (original)
+++ packages/haskelldb-hsql/trunk/debian/changelog Sun Jan 27 13:36:23 2008
@@ -1,7 +1,9 @@
-haskelldb-hsql (0.10-1~pre1) experimental; urgency=low
+haskelldb-hsql (0.10-1~pre1) unstable; urgency=low
 
-  * Initial Debian release. 
+  * Initial Debian release.
   * New Debian packages due to the divinding of Haskell haskelldb library
     into a couple of Haskell libraries.
+  * debian/patches/02_update-cabal-file.dpatch: add old-time to build-
+    depends.
 
- -- Arjan Oosting <arjan at debian.org>  Sun, 11 Nov 2007 18:40:35 +0100
+ -- Arjan Oosting <arjan at debian.org>  Mon, 21 Jan 2008 01:47:40 +0100

Modified: packages/haskelldb-hsql/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-hsql/trunk/debian/rules?rev=1023&op=diff
==============================================================================
--- packages/haskelldb-hsql/trunk/debian/rules (original)
+++ packages/haskelldb-hsql/trunk/debian/rules Sun Jan 27 13:36:23 2008
@@ -14,11 +14,6 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-INCLUDE_DIRS=""
-HADDOCK_INTERFACES="/usr/share/doc/haskelldb-hdbc/html/haskelldb.haddock"
-HADDOCK_HTML="/usr/share/doc/haskelldb-hdbc/html"
-
-
 setup: patch-stamp
 	dh_testdir
 	ghc --make Setup -o setup -package Cabal 
@@ -31,6 +26,7 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
+	rm -f build-stamp
 	if [ -x setup ] && [ -e .setup-config ]; then ./setup clean ; fi
 	rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist html
 	dh_clean 
@@ -42,12 +38,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 +46,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 +60,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	sh -e debian/mk-haskell-depends
+	dh_haskell_depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb