[Pkg-haskell-commits] r1178 - in /packages/haskelldb-dynamic/trunk/debian: changelog control rules

Wed Apr 30 17:21:41 UTC 2008

Author: arjan
Date: Wed Apr 30 17:21:40 2008
New Revision: 1178

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1178
Log:
 r110 at reddwarf:  arjan | 2008-04-30 19:16:14 +0200
 releasing version 0.10-1

Modified:
    packages/haskelldb-dynamic/trunk/debian/changelog
    packages/haskelldb-dynamic/trunk/debian/control
    packages/haskelldb-dynamic/trunk/debian/rules

Modified: packages/haskelldb-dynamic/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-dynamic/trunk/debian/changelog?rev=1178&op=diff
==============================================================================

--- packages/haskelldb-dynamic/trunk/debian/changelog (original)
+++ packages/haskelldb-dynamic/trunk/debian/changelog Wed Apr 30 17:21:40 2008
@@ -1,8 +1,8 @@
-haskelldb-dynamic (0.10-1~pre1) experimental; urgency=low
+haskelldb-dynamic (0.10-1) unstable; urgency=low
 
   * Initial Debian release.
   * New Debian packages due to the divinding of Haskell haskelldb library
     into a couple of Haskell libraries.
   * debian/DBDirect.1: Updated for new version of DBDirect.
 
- -- Arjan Oosting <arjan at debian.org>  Wed, 07 Nov 2007 18:31:09 +0100
+ -- Arjan Oosting <arjan at debian.org>  Wed, 30 Apr 2008 19:16:08 +0200

Modified: packages/haskelldb-dynamic/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-dynamic/trunk/debian/control?rev=1178&op=diff
==============================================================================
--- packages/haskelldb-dynamic/trunk/debian/control (original)
+++ packages/haskelldb-dynamic/trunk/debian/control Wed Apr 30 17:21:40 2008
@@ -3,12 +3,12 @@
 Priority: optional
 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-haskelldb-dev,
- libghc6-haskelldb-prof, libghc6-mtl-dev, libghc6-mtl-prof,
- libghc6-plugins-dev
-Build-Depends-Indep: haddock, ghc6-doc, haskelldb-doc, libghc6-mtl-doc
-Standards-Version: 3.7.2
+ dpkg-dev (>= 0.13.19), ghc6 (>= 6.4.2), haskell-devscripts (>=
+ 0.5.6), libghc6-haskelldb-dev, libghc6-mtl-dev, 
+ libghc6-plugins-dev (>= 1.2) 
+Build-Depends-Indep: haddock, ghc6-doc, haskelldb-doc, hs-plugins-doc, 
+ libghc6-mtl-doc
+Standards-Version: 3.7.3
 Homepage: http://haskelldb.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskelldb-dynamic
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-dynamic
@@ -36,7 +36,7 @@
  This package provides the DBDirect program that is used to generate
  HaskellDB interfaces automatically based on what is in a database.
 
-Package: haskelldb-dynamic-doc
+Package: haskell-haskelldb-dynamic-doc
 Architecture: all
 Section: doc
 Recommends: ghc6-doc, haskelldb-doc, libghc6-mtl-doc

Modified: packages/haskelldb-dynamic/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskelldb-dynamic/trunk/debian/rules?rev=1178&op=diff
==============================================================================
--- packages/haskelldb-dynamic/trunk/debian/rules (original)
+++ packages/haskelldb-dynamic/trunk/debian/rules Wed Apr 30 17:21:40 2008
@@ -6,7 +6,7 @@
 #
 
 # Include dpatch
-include /usr/share/dpatch/dpatch.make
+#include /usr/share/dpatch/dpatch.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -14,12 +14,7 @@
 # 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
+setup:
 	dh_testdir
 	ghc --make Setup -o setup -package Cabal 
 
@@ -27,10 +22,11 @@
 build-stamp: setup
 	touch $@
 
-clean: clean-patched unpatch
+clean: clean-patched
 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,13 +38,10 @@
 	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
+	mv debian/libghc6-haskelldb-dynamic-dev/usr/lib/haskell-packages/ghc6/bin \
+	  debian/haskelldb-bin/usr
 	dh_install -s
+
 
 install-indep: build-stamp
 	dh_testdir 
@@ -56,7 +49,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
@@ -67,11 +59,13 @@
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
+	dh_installman
+	dh_strip
 	dh_compress -X.haddock 
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	sh -e debian/mk-haskell-depends
+	dh_haskell_depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb


