[Pkg-haskell-commits] r1044 - in /packages/haxml/branches/stable/debian: changelog rules

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Feb  3 19:41:46 2008
New Revision: 1044

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1044
Log:
 r2584 at nebula:  arjan | 2008-01-28 21:37:36 +0100
 * debian/rules: Split up the configure-stamp target in a
   configure-arch-stamp and a configure-indep-stamp target. This should
   fix FTBFS when building the architecture independent packages only.

Modified:
    packages/haxml/branches/stable/debian/changelog
    packages/haxml/branches/stable/debian/rules

Modified: packages/haxml/branches/stable/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/changelog?rev=1044&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/changelog (original)
+++ packages/haxml/branches/stable/debian/changelog Sun Feb  3 19:41:46 2008
@@ -1,3 +1,11 @@
+haxml (1.13.3-2~pre1) unstable; urgency=low
+
+  * debian/rules: Split up the configure-stamp target in a
+    configure-arch-stamp and a configure-indep-stamp target. This should
+    fix FTBFS when building the architecture independent packages only.
+
+ -- Arjan Oosting <arjan at debian.org>  Mon, 28 Jan 2008 07:21:27 +0100
+
 haxml (1.13.3-1) unstable; urgency=low
 
   * New upstream release:

Modified: packages/haxml/branches/stable/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/rules?rev=1044&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/rules (original)
+++ packages/haxml/branches/stable/debian/rules Sun Feb  3 19:41:46 2008
@@ -26,26 +26,31 @@
   OPT_FLAG := --enable-optimization
 endif
 
-configure: configure-stamp
-configure-stamp: patch-stamp
+configure: configure-arch-stamp configure-indep-stamp
+configure-arch-stamp: patch-stamp
 	dh_testdir
 	html2text -nobs docs/changelog.html > changelog
-	dh_haskell_configure
+	dh_haskell_configure -s
 	cd debian/tmp/build/libghc6-haxml-dev && \
 	  ./setup configure --prefix=/usr/lib/haskell-packages/ghc6 --bindir=/usr/bin \
 	    --with-compiler=/usr/bin/ghc6 --enable-library-profiling $(OPT_FLAG) 
 	touch $@
 
+configure-indep-stamp: patch-stamp
+	dh_testdir
+	html2text -nobs docs/changelog.html > changelog
+	dh_haskell_configure -i
+	touch $@
+
+
 build: build-arch
-
 build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-#	$(MAKE_ENVVARS) $(MAKE) 
+build-arch-stamp: configure-arch-stamp
 	dh_haskell_build -s
 	touch $@
 
 build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
+build-indep-stamp: configure-indep-stamp
 	dh_haskell_build -i
 	$(MAKE) haddock
 	touch $@
@@ -54,7 +59,7 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
+	rm -f build-arch-stamp build-indep-stamp configure-arch-stamp configure-indep-stamp
 	$(MAKE) realclean
 	rm -rf obj docs/HaXml
 	rm -f changelog Setup.hi Setup.o setup
@@ -109,11 +114,11 @@
 	dh_builddeb
 
 # Build architecture independant packages using the common target.
-binary-indep: build-indep-stamp install
+binary-indep: install-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
-binary-arch: build-arch-stamp install
+binary-arch: install-arch
 	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 binary: binary-arch binary-indep