[Pkg-haskell-commits] r1225 - in /packages/haskell-uulib/trunk: configure debian/changelog debian/control debian/haskell-uulib-doc.doc-base debian/rules

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Wed May 7 15:15:16 UTC 2008 

Author: arjan
Date: Wed May  7 15:15:15 2008
New Revision: 1225

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1225
Log:
 r189 at reddwarf:  arjan | 2008-05-01 14:45:24 +0200
 * configure: removed this cruft.
 * debian/control:
   - Bump build dependency on haskell-devscripts to 0.6.12 which enables
     us to passing through disable-optimization to ./setup configure.
   - Let the Vcs-* fields point to the trunk
 * debian/haskell-uulib-doc.doc-base:
   - Change the section from Apps/Programming to Programming/Haskell.
 * debian/rules:
   - Build the library without optimization on arm.
   - Enable split-objs on i386 and amd64.

Removed:
    packages/haskell-uulib/trunk/configure
Modified:
    packages/haskell-uulib/trunk/debian/changelog
    packages/haskell-uulib/trunk/debian/control
    packages/haskell-uulib/trunk/debian/haskell-uulib-doc.doc-base
    packages/haskell-uulib/trunk/debian/rules

Modified: packages/haskell-uulib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/debian/changelog?rev=1225&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/debian/changelog (original)
+++ packages/haskell-uulib/trunk/debian/changelog Wed May  7 15:15:15 2008
@@ -1,3 +1,18 @@
+haskell-uulib (0.9.5-2~pre1) unstable; urgency=low
+
+  * configure: removed this cruft.
+  * debian/control:
+    - Bump build dependency on haskell-devscripts to 0.6.12 which enables
+      us to passing through disable-optimization to ./setup configure.
+    - Let the Vcs-* fields point to the trunk
+  * debian/haskell-uulib-doc.doc-base:
+    - Change the section from Apps/Programming to Programming/Haskell.
+  * debian/rules:
+    - Build the library without optimization on arm.
+    - Enable split-objs on i386 and amd64.
+
+ -- Arjan Oosting <arjan at debian.org>  Thu, 01 May 2008 14:08:45 +0200
+
 haskell-uulib (0.9.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/haskell-uulib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/debian/control?rev=1225&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/debian/control (original)
+++ packages/haskell-uulib/trunk/debian/control Wed May  7 15:15:15 2008
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Arjan Oosting <arjan at debian.org>
 Build-Depends: debhelper (>= 5), dpatch, dpkg-dev (>= 1.13.19), 
-  ghc6 (>= 6.8.2), ghc6-prof (>= 6.4.2), haskell-devscripts (>= 0.6.0)
+  ghc6 (>= 6.8.2), ghc6-prof (>= 6.4.2), haskell-devscripts (>= 0.6.12)
 Build-Depends-Indep: cpphs, haddock, hugs, libghc6-base-doc,
  libghc6-haskell98-doc 
 Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-uulib
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib
+Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-uulib/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk
 Homepage: http://www.cs.uu.nl/wiki/HUT/WebHome
 
 Package: libghc6-uulib-dev

Modified: packages/haskell-uulib/trunk/debian/haskell-uulib-doc.doc-base
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/debian/haskell-uulib-doc.doc-base?rev=1225&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/debian/haskell-uulib-doc.doc-base (original)
+++ packages/haskell-uulib/trunk/debian/haskell-uulib-doc.doc-base Wed May  7 15:15:15 2008
@@ -2,7 +2,7 @@
 Title: The uulib API documentation
 Author: Doaitse Swierstra, Daan Leijen
 Abstract: The API documentation of the uulib Haskell library.
-Section: Apps/Programming
+Section: Programming/Haskell
 
 Format: HTML
 Index: /usr/share/doc/haskell-uulib-doc/html/uulib/index.html

Modified: packages/haskell-uulib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/debian/rules?rev=1225&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/debian/rules (original)
+++ packages/haskell-uulib/trunk/debian/rules Wed May  7 15:15:15 2008
@@ -14,42 +14,69 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+# These are used for cross-compiling and for saving the configure
+# script
+# from having to guess our platform (since we know it already)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# ghc -split-objs only works on i386 and amd64
+# but seems to break the profiling build
+ifneq (,$(findstring $(DEB_HOST_ARCH),"i386 amd64"))
+#  CONFIGURE_FLAGS += enable-split-objs
+endif
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CONFIGURE_FLAGS += disable-optimization
+else
+  ifneq (,$(findstring $(DEB_HOST_ARCH),"arm"))
+    CONFIGURE_FLAGS += disable-optimization
+  endif
+endif
+
 setup: patch-stamp
 	dh_testdir
 #	chmod a+x configure
 #	./configure --prefix=/usr
 	ghc --make Setup -o setup -package Cabal 
 
+configure: configure-stamp
+configure-stamp: setup
+	dh_haskell_prep
+	dh_haskell_configure $(CONFIGURE_FLAGS)
+	touch $@
+
 build: build-stamp
-build-stamp: setup
+build-stamp: configure-stamp
+	dh_haskell_build
 	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f configure-stamp build-stamp
 	if [ -x setup ] && [ -e .setup-config ]; then ./setup clean ; fi
-	rm -rf setup Setup.hi Setup.ho Setup.o .*config* dist html
-	rm -f config.log config.status 
+	rm -rf dist html
 # 	rm -f Makefile uulib.cabal
-	dh_clean 
+	dh_clean setup Setup.hi Setup.o .*config* config.log config.status
 
 install: install-arch install-indep
 install-arch: build-stamp
 	dh_testdir 
 	dh_testroot
-	dh_clean -k -s
+	dh_clean -k -s -Xdebian/tmp
 	dh_installdirs -s
-	dh_haskell -s
+	dh_haskell_install -s
 	dh_install -s
 
 install-indep: build-stamp
 	dh_testdir 
 	dh_testroot
-	dh_clean -k -i
+	dh_clean -k -i -Xdebian/tmp
 	dh_installdirs -i
-	dh_haskell -i
+	dh_haskell_install -i
 	dh_install -i
 
 # Must not depend on anything. This is to be called by
@@ -78,4 +105,4 @@
 	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 binary: binary-arch binary-indep
-.PHONY: binary binary-arch binary-indep build clean clean-patched install install-arch install-indep 
+.PHONY: binary binary-arch binary-indep build clean clean-patched configure install install-arch install-indep

More information about the Pkg-haskell-commits mailing list