[Pkg-haskell-commits] r1035 - in /packages/helium/trunk/debian: changelog control patches/04_fixes-for-ghc6.dpatch rules
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Mon Jan 28 00:00:56 UTC 2008
Author: arjan
Date: Mon Jan 28 00:00:54 2008
New Revision: 1035
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1035
Log:
r2576 at nebula: arjan | 2008-01-28 00:22:26 +0100
* Make helium compile with GHC 6.8.2:
- debian/patches/04_fixes-for-ghc6.dpatch: Add '-package containers'
to the GHC options as helium uses Data.Map which is in a separate
package now.
- debian/control:
+ Add libghc6-parsec-dev to the build dependencies as the parsec
module is in separate Debian package now.
+ Bump the build dependency on GHC to >= 6.8.2
* debian/control:
- Replace Xs-Vcs-* fields with Vcs-* fields.
- Add Homepage field.
* debian/rules:
- Export DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE as
/usr/share/doc/autotools-dev/README.Debian.gz suggests.
Modified:
packages/helium/trunk/debian/changelog
packages/helium/trunk/debian/control
packages/helium/trunk/debian/patches/04_fixes-for-ghc6.dpatch
packages/helium/trunk/debian/rules
Modified: packages/helium/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/helium/trunk/debian/changelog?rev=1035&op=diff
==============================================================================
--- packages/helium/trunk/debian/changelog (original)
+++ packages/helium/trunk/debian/changelog Mon Jan 28 00:00:54 2008
@@ -1,9 +1,23 @@
helium (1.6-4~pre1) unstable; urgency=low
-
+
+ * Make helium compile with GHC 6.8.2:
+ - debian/patches/04_fixes-for-ghc6.dpatch: Add '-package containers'
+ to the GHC options as helium uses Data.Map which is in a separate
+ package now.
+ - debian/control:
+ + Add libghc6-parsec-dev to the build dependencies as the parsec
+ module is in separate Debian package now.
+ + Bump the build dependency on GHC to >= 6.8.2
+ * debian/control:
+ - Replace Xs-Vcs-* fields with Vcs-* fields.
+ - Add Homepage field.
* debian/lvmrun.1:
- Fix some spelling errors. Thanks A. Costa. (Closes: #442167)
+ * debian/rules:
+ - Export DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE as
+ /usr/share/doc/autotools-dev/README.Debian.gz suggests.
- -- Arjan Oosting <arjan at debian.org> Sun, 16 Sep 2007 18:54:38 +0200
+ -- Arjan Oosting <arjan at debian.org> Sun, 16 Dec 2007 13:28:08 +0100
helium (1.6-3) unstable; urgency=low
Modified: packages/helium/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/helium/trunk/debian/control?rev=1035&op=diff
==============================================================================
--- packages/helium/trunk/debian/control (original)
+++ packages/helium/trunk/debian/control Mon Jan 28 00:00:54 2008
@@ -2,11 +2,12 @@
Section: devel
Priority: optional
Maintainer: Arjan Oosting <arjan at debian.org>
-Build-Depends: autotools-dev, debhelper (>= 5), dpatch, ghc6, haddock,
- libghc6-mtl-dev, uuagc
+Build-Depends: autotools-dev, debhelper (>= 5), dpatch,
+ ghc6 (>= 6.8.2), haddock, libghc6-mtl-dev, libghc6-parsec-dev, uuagc
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/helium
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/helium
+Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/helium
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/helium
+Homepage: http://www.cs.uu.nl/helium/index.html
Package: helium
Architecture: any
@@ -21,5 +22,3 @@
.
Note: Helium does not support type classes yet. For that reason it is
incompatible with Haskell text books.
- .
- Homepage: http://www.cs.uu.nl/helium/index.html
Modified: packages/helium/trunk/debian/patches/04_fixes-for-ghc6.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/helium/trunk/debian/patches/04_fixes-for-ghc6.dpatch?rev=1035&op=diff
==============================================================================
--- packages/helium/trunk/debian/patches/04_fixes-for-ghc6.dpatch (original)
+++ packages/helium/trunk/debian/patches/04_fixes-for-ghc6.dpatch Mon Jan 28 00:00:54 2008
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad helium~/Top/src/Top/Ordering/Tree.hs helium/Top/src/Top/Ordering/Tree.hs
---- helium~/Top/src/Top/Ordering/Tree.hs 2006-09-15 19:39:17.000000000 +0200
-+++ helium/Top/src/Top/Ordering/Tree.hs 2006-12-10 03:09:01.000000000 +0100
+--- helium~/Top/src/Top/Ordering/Tree.hs 2008-01-28 00:02:11.000000000 +0100
++++ helium/Top/src/Top/Ordering/Tree.hs 2008-01-28 00:02:29.000000000 +0100
@@ -36,13 +36,15 @@
infixr 8 .>. , .>>. , .<. , .<<.
@@ -31,8 +31,8 @@
------------------------------------------------------------------------
diff -urNad helium~/Top/src/makefile helium/Top/src/makefile
---- helium~/Top/src/makefile 2006-09-15 19:39:17.000000000 +0200
-+++ helium/Top/src/makefile 2006-12-10 03:09:01.000000000 +0100
+--- helium~/Top/src/makefile 2008-01-28 00:02:11.000000000 +0100
++++ helium/Top/src/makefile 2008-01-28 00:02:29.000000000 +0100
@@ -51,7 +51,7 @@
topsolver-prof:
@@ -43,20 +43,20 @@
#-----------------------------------------------------------------------
# Cobalt
diff -urNad helium~/helium/src/Makefile.in helium/helium/src/Makefile.in
---- helium~/helium/src/Makefile.in 2006-12-10 03:09:01.000000000 +0100
-+++ helium/helium/src/Makefile.in 2006-12-10 03:11:36.000000000 +0100
+--- helium~/helium/src/Makefile.in 2008-01-28 00:02:29.000000000 +0100
++++ helium/helium/src/Makefile.in 2008-01-28 00:03:59.000000000 +0100
@@ -48,7 +48,7 @@
PACKAGENET =
endif
HC_OPTS = -static -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances \
- $(PACKAGENET) -package lang -package text -package readline -i$(IFACES) $(EXTRA_HC_OPTS)
-+ $(PACKAGENET) -package mtl -package parsec -package readline -i$(IFACES) $(EXTRA_HC_OPTS)
++ $(PACKAGENET) -package containers -package mtl -package parsec -package readline -i$(IFACES) $(EXTRA_HC_OPTS)
AG = @WithAG@
AG_OPTS = -mscfr
diff -urNad helium~/lvm/src/lib/makefile helium/lvm/src/lib/makefile
---- helium~/lvm/src/lib/makefile 2006-09-15 19:39:27.000000000 +0200
-+++ helium/lvm/src/lib/makefile 2006-12-10 03:11:06.000000000 +0100
+--- helium~/lvm/src/lib/makefile 2008-01-28 00:02:11.000000000 +0100
++++ helium/lvm/src/lib/makefile 2008-01-28 00:02:29.000000000 +0100
@@ -20,7 +20,7 @@
#the haskell compiler
Modified: packages/helium/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/helium/trunk/debian/rules?rev=1035&op=diff
==============================================================================
--- packages/helium/trunk/debian/rules (original)
+++ packages/helium/trunk/debian/rules Mon Jan 28 00:00:54 2008
@@ -15,8 +15,8 @@
# 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_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# Autoconf 2,52 and higher goes into crosscompiling mode when --host
# is specified, so only pass --host when it is necessary.
More information about the Pkg-haskell-commits
mailing list