[Pkg-haskell-commits] r780 - in /packages/haskell-http/trunk/debian: changelog control rules

Mon Oct 8 22:32:10 UTC 2007

Author: arjan
Date: Mon Oct  8 22:32:10 2007
New Revision: 780

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=780
Log:
 r2081 at nebula:  arjan | 2007-10-09 00:21:58 +0200
 * Rebuild with haddock 0.8-2 to make sure the links work.
 * debian/control:
   - Use new Homepage field.
 * debian/rules:
   - Move package specific parts in variables at the top of the
     makefile.

Modified:
    packages/haskell-http/trunk/debian/changelog
    packages/haskell-http/trunk/debian/control
    packages/haskell-http/trunk/debian/rules

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

--- packages/haskell-http/trunk/debian/changelog (original)
+++ packages/haskell-http/trunk/debian/changelog Mon Oct  8 22:32:10 2007
@@ -1,3 +1,14 @@
+haskell-http (30000000-2~pre1) unstable; urgency=low
+
+  * Rebuild with haddock 0.8-2 to make sure the links work.
+  * debian/control:
+    - Use new Homepage field.
+  * debian/rules:
+    - Move package specific parts in variables at the top of the
+      makefile.
+
+ -- Arjan Oosting <arjan at debian.org>  Tue, 09 Oct 2007 00:12:08 +0200
+
 haskell-http (30000000-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/haskell-http/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http/trunk/debian/control?rev=780&op=diff
==============================================================================
--- packages/haskell-http/trunk/debian/control (original)
+++ packages/haskell-http/trunk/debian/control Mon Oct  8 22:32:10 2007
@@ -10,6 +10,7 @@
  libhugs-parsec  | hugs (<< 98.200609.21),
  libghc6-base-doc, libghc6-network-doc, libghc6-parsec-doc
 Standards-Version: 3.7.2
+Homepage: http://www.haskell.org/http/
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-http
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http
 
@@ -22,8 +23,6 @@
  HTTP is a set of Haskell client libraries for HTTP/1.0 and HTTP/1.1.
  .
  This package contains the libraries compiled for GHC 6.
- .
-  Homepage: http://www.haskell.org/http/
 
 Package: libhugs-http
 Section: devel
@@ -35,8 +34,6 @@
  HTTP is a set of Haskell client libraries for HTTP/1.0 and HTTP/1.1.
  .
  This package contains the libraries for use by the Hugs interpreter.
- .
-  Homepage: http://www.haskell.org/http/
 
 Package: haskell-http-doc
 Section: doc
@@ -47,5 +44,3 @@
  HTTP is a set of Haskell client libraries for HTTP/1.0 and HTTP/1.1.
  .
  This package contains the library documentation.
- .
-  Homepage: http://www.haskell.org/http/

Modified: packages/haskell-http/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http/trunk/debian/rules?rev=780&op=diff
==============================================================================
--- packages/haskell-http/trunk/debian/rules (original)
+++ packages/haskell-http/trunk/debian/rules Mon Oct  8 22:32:10 2007
@@ -1,12 +1,31 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+#
+# Based on dh-make template containing work of Joey Hess, Craig Small
+# and Bill Allombert. 
+#
 
-# include dpatch
+# Include dpatch
 include /usr/share/dpatch/dpatch.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: patch-stamp
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+INCLUDE_DIRS=""
+HADDOCK_INTERFACES="/usr/share/doc/haskell-http-doc/html/HTTP.haddock"
+HADDOCK_HTML="/usr/share/doc/haskell-http-doc/html"
+
+
+setup: patch-stamp
+	dh_testdir
+	ghc --make Setup -o setup -package Cabal 
+
+build: build-stamp
+build-stamp: setup
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
@@ -17,21 +36,22 @@
 	dh_clean 
 
 install: install-arch install-indep
-install-arch: patch-stamp
-	dh_testdir
+install-arch: build-stamp
+	dh_testdir 
 	dh_testroot
 	dh_clean -k -s
 	dh_installdirs -s
 	dh_haskell -s
-	find "$(CURDIR)/debian/libghc6-http-dev/usr/lib/haskell-packages/" -empty -type d -delete
-	sed -i -e "s%haddock-interfaces:.*%haddock-interfaces: /usr/share/doc/haskell-http-doc/html/HTTP.haddock%" \
-	    -e "s%haddock-html: .*%haddock-html: /usr/share/doc/haskell-http-doc/html%" \
-	    -e "s%include-dirs: .*%include-dirs:%" \
-	    debian/libghc6-http-dev/usr/lib/haskell-packages/ghc6/lib/*/installed-pkg-config
+	# 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: patch-stamp
-	dh_testdir
+install-indep: build-stamp
+	dh_testdir 
 	dh_testroot
 	dh_clean -k -i
 	dh_installdirs -i
@@ -42,13 +62,15 @@
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
-binary-common: 
+binary-common:
+	dh_testdir
+	dh_testroot
 	dh_installchangelogs 
-	dh_installdocs 
+	dh_installdocs
 	dh_compress -X.haddock 
-	dh_fixperms 
-	dh_installdeb 
-	dh_shlibdeps 
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
 	sh -e debian/mk-haskell-depends
 	dh_gencontrol
 	dh_md5sums
@@ -62,5 +84,5 @@
 binary-arch: install-arch
 	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
-binary: binary-arch  binary-indep
-.PHONY: build clean clean-patched binary-arch binary-indep binary install-indep install-arch install
+binary: binary-arch binary-indep
+.PHONY: binary binary-arch binary-indep build clean clean-patched install install-arch install-indep 


