[Pkg-haskell-commits] r748 - in /packages/haskell-src-exts/trunk: debian/ src/haskell-src-exts/ src/haskell-src-exts/Language/Haskell/Hsx/ src/trhsx/
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Fri Jun 22 16:50:58 UTC 2007
Author: arjan
Date: Fri Jun 22 16:50:58 2007
New Revision: 748
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=748
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
packages/haskell-src-exts/trunk/debian/
packages/haskell-src-exts/trunk/debian/buildmod.sh
packages/haskell-src-exts/trunk/debian/changelog
packages/haskell-src-exts/trunk/debian/compat
packages/haskell-src-exts/trunk/debian/control
packages/haskell-src-exts/trunk/debian/copyright
packages/haskell-src-exts/trunk/debian/ghc-pkg
packages/haskell-src-exts/trunk/debian/rules (with props)
packages/haskell-src-exts/trunk/debian/runcompiler
packages/haskell-src-exts/trunk/debian/trhsx.pod
Modified:
packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Pretty.hs
packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs
packages/haskell-src-exts/trunk/src/haskell-src-exts/haskell-src-exts.cabal
packages/haskell-src-exts/trunk/src/trhsx/trhsx.cabal
Added: packages/haskell-src-exts/trunk/debian/buildmod.sh
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/buildmod.sh?rev=748&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/buildmod.sh (added)
+++ packages/haskell-src-exts/trunk/debian/buildmod.sh Fri Jun 22 16:50:58 2007
@@ -1,0 +1,17 @@
+#!/bin/sh
+
+set -e
+set -v
+
+MOD=$1
+COMPILER=`pwd`/debian/runcompiler
+
+chmod a+x $COMPILER `pwd`/debian/ghc-pkg
+
+cd $MOD
+ln -sf ../../debian
+ghc -package Cabal -o setup Setup.hs
+./setup clean || true
+./setup configure --prefix=/usr/lib/haskell-packages/ghc6/ \
+ --user --with-compiler $COMPILER
+./setup build -v
Added: packages/haskell-src-exts/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/changelog?rev=748&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/changelog (added)
+++ packages/haskell-src-exts/trunk/debian/changelog Fri Jun 22 16:50:58 2007
@@ -1,0 +1,62 @@
+haskell-src-exts (0.2-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with ghc6 6.6 (Closes: #393642)
+ - src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs: hide isSymbol
+ when compiling with GHC 6.6.
+ - src/haskell-src-exts/haskell-src-exts.cabal: add CPP extension which
+ is needed for the change above.
+ - /src/haskell-src-exts/Language/Haskell/Hsx/{Transform.hs,Pretty.hs}:
+ modify some strings to keep cpp remove an invalid UTF sequence which
+ upsets GHC 6.6
+ - debian/rules: call ghc-pkg with --force when the haskell-src-exts
+ library is registered during as some directories are missing.
+
+ -- Arjan Oosting <arjan at debian.org> Tue, 24 Oct 2006 23:21:37 +0200
+
+haskell-src-exts (0.2-5) unstable; urgency=low
+
+ * Removed bashism from debian/buildmod.sh (Closes: #376701).
+
+ -- Florian Ragwitz <rafl at debian.org> Tue, 4 Jul 2006 15:41:13 +0200
+
+haskell-src-exts (0.2-4) unstable; urgency=low
+
+ * Rebuild against ghc6 6.4.2.
+ * Remove build-dep to libghc6-cabal-dev (>= 1.1.1) as ghc6 6.4.2 comes with
+ Cabal-1.1.4.
+
+ -- Florian Ragwitz <rafl at debian.org> Mon, 3 Jul 2006 18:35:37 +0200
+
+haskell-src-exts (0.2-3) unstable; urgency=low
+
+ * Acknowledge previous NMU by Arjan Oosting <arjanoosting at home.nl>.
+ * Removed bashisms from debian/rules (Closes: #370690).
+ * Bump up Standards-Version to 3.7.2 (no changes).
+ * Use my new @debian.org maintainer address.
+
+ -- Florian Ragwitz <rafl at debian.org> Wed, 7 Jun 2006 16:24:15 +0200
+
+haskell-src-exts (0.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control: add versioned libghc6-cabal-dev and ghc6 to the
+ Build-Depends to use Cabal version 1.1.1 or later which introduces a
+ new installation prefix for libraries. (Closes: #352690)
+ * src/trhsx/trhsx.cabal: added base and haskell98 to the Build-
+ Depends.
+
+ -- Arjan Oosting <arjanoosting at home.nl> Tue, 18 Apr 2006 23:13:12 +0200
+
+haskell-src-exts (0.2-2) unstable; urgency=low
+
+ * Recompile against ghc 6.4.1.
+
+ -- Florian Ragwitz <rafl at debianforum.de> Sun, 16 Oct 2005 16:30:35 +0200
+
+haskell-src-exts (0.2-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Florian Ragwitz <rafl at debianforum.de> Wed, 20 Jul 2005 22:40:52 +0200
+
Added: packages/haskell-src-exts/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/compat?rev=748&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/compat (added)
+++ packages/haskell-src-exts/trunk/debian/compat Fri Jun 22 16:50:58 2007
@@ -1,0 +1,1 @@
+4
Added: packages/haskell-src-exts/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/control?rev=748&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/control (added)
+++ packages/haskell-src-exts/trunk/debian/control Fri Jun 22 16:50:58 2007
@@ -1,0 +1,33 @@
+Source: haskell-src-exts
+Section: devel
+Priority: optional
+Maintainer: Florian Ragwitz <rafl at debian.org>
+Build-Depends: debhelper (>= 4.0.0), haskell-devscripts (>= 0.5.9), ghc6 (>= 6.4.2), happy
+Standards-Version: 3.7.2
+
+Package: libghc6-src-exts-dev
+Architecture: any
+Depends: ${haskell:Depends}, ${shlibs:Depends}
+Description: Haskell-Source with eXtensions
+ haskell-src-exts (HSX, haskell-source with extensions) is an extension of the
+ standard haskell-src package, and handles most common syntactic extensions to
+ Haskell, including:
+ * Multi-parameter type classes with functional dependencies
+ * Empty data declarations
+ * GADTs
+ * Implicit parameters (ghc and hugs style)
+ * Template Haskell (broken for 6.4, needs redoing)
+
+Package: libghc6-harp-dev
+Architecture: any
+Depends: ${haskell:Depends}, ${shlibs:Depends}
+Description: Extends Haskell with the power of regular expressions
+ HaRP, or Haskell Regular Patterns, is a Haskell extension that extends the
+ normal pattern matching facility with the power of regular expressions. This
+ expressive power is highly useful in a wide range of areas, including text
+ parsing and XML processing. Regular expression patterns in HaRP work over
+ ordinary Haskell lists ([]) of arbitrary type. We have implemented HaRP as a
+ pre-processor to ordinary Haskell.
+ .
+ This package also contains trhsx, the desugaring pre-processor executable for
+ HaRP and HSP
Added: packages/haskell-src-exts/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/copyright?rev=748&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/copyright (added)
+++ packages/haskell-src-exts/trunk/debian/copyright Fri Jun 22 16:50:58 2007
@@ -1,0 +1,28 @@
+This package was debianized by Florian Ragwitz <rafl at debianforum.de> on
+Wed, 20 Jul 2005 22:40:52 +0200.
+
+It was downloaded from http://www.cs.chalmers.se/~d00nibro/haskell-src-exts/#download
+
+Copyright Holder: Copyright 2004, Niklas Broberg. All rights reserved.
+
+License:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+This software is provided by the copyright holders "as is" and any express or
+implied warranties, including, but not limited to, the implied warranties of
+merchantability and fitness for a particular purpose are disclaimed. In no
+event shall the copyright holders be liable for any direct, indirect,
+incidental, special, exemplary, or consequential damages (including, but not
+limited to, procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including negligence
+or otherwise) arising in any way out of the use of this software, even if
+advised of the possibility of such damage.
Added: packages/haskell-src-exts/trunk/debian/ghc-pkg
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/ghc-pkg?rev=748&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/ghc-pkg (added)
+++ packages/haskell-src-exts/trunk/debian/ghc-pkg Fri Jun 22 16:50:58 2007
@@ -1,0 +1,9 @@
+#!/bin/sh
+
+set -x
+set -v
+
+GHC_VERSION=`ghc6 --numeric-version`
+PKGCFG=`dirname $0`/tmp-package-conf
+
+/usr/lib/ghc-$GHC_VERSION/bin/ghc-pkg -f $PKGCFG "$@"
Added: packages/haskell-src-exts/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/rules?rev=748&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/rules (added)
+++ packages/haskell-src-exts/trunk/debian/rules Fri Jun 22 16:50:58 2007
@@ -1,0 +1,86 @@
+#!/usr/bin/make -f
+
+MODULES := src/harp src/trhsx
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+version=0.2
+
+ghc6_version := $(shell ghc6 --numeric-version)
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+
+ (cd src/haskell-src-exts; \
+ ln -s ../../debian; \
+ dh_haskell_prep -plibghc6-src-exts-dev; \
+ dh_haskell_build -plibghc6-src-exts-dev;)
+
+ sed "s,/usr/lib/haskell-packages/ghc6/lib/haskell-src-exts-$(version)/ghc-$(ghc6_version),`pwd`/src/haskell-src-exts/dist/build,g" < src/haskell-src-exts/.installed-pkg-config > debian/tmp-installed-pkg
+ echo '[]' > debian/tmp-package-conf
+ ghc-pkg --force -f debian/tmp-package-conf register debian/tmp-installed-pkg
+
+ for MOD in $(MODULES); do sh debian/buildmod.sh $$MOD; done
+
+ cd src/harp && dh_haskell_prep -plibghc6-harp-dev
+
+ pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" debian/trhsx.pod > debian/trhsx.1
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ for dir in $(MODULES); do cd $$dir; ./setup clean || true; cd ../..; done;
+ rm -rf src/*/setup src/*/Setup.hi src/*/Setup.ho src/*/Setup.o src/*/.*config* src/*/dist doc doctmp
+ rm -f debian/tmp-* src/*/debian
+ rm -f src/haskell-src-exts/Language/Haskell/Hsx/Parser.hs
+ rm -f debian/trhsx.1
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ cd src/haskell-src-exts && dh_haskell_install -plibghc6-src-exts-dev
+ cd src/harp && dh_haskell_install -plibghc6-harp-dev
+ rmdir debian/libghc6-harp-dev/usr/lib/haskell-packages/ghc6/bin/ \
+ debian/libghc6-src-exts-dev/usr/lib/haskell-packages/ghc6/bin/
+ cd src/trhsx && ./setup copy --copy-prefix debian/libghc6-harp-dev/usr
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs README
+ dh_installman -plibghc6-harp-dev debian/trhsx.1
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Propchange: packages/haskell-src-exts/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: packages/haskell-src-exts/trunk/debian/runcompiler
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/runcompiler?rev=748&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/runcompiler (added)
+++ packages/haskell-src-exts/trunk/debian/runcompiler Fri Jun 22 16:50:58 2007
@@ -1,0 +1,5 @@
+#!/bin/sh
+
+PKGCFG=`dirname $0`/tmp-package-conf
+
+exec /usr/bin/ghc6 -package-conf $PKGCFG "$@"
Added: packages/haskell-src-exts/trunk/debian/trhsx.pod
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/trhsx.pod?rev=748&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/trhsx.pod (added)
+++ packages/haskell-src-exts/trunk/debian/trhsx.pod Fri Jun 22 16:50:58 2007
@@ -1,0 +1,35 @@
+=head1 NAME
+
+trhsx - the desugaring pre-processor executable for HaRP and HSP
+
+=head1 SYNOPSYS
+
+B<trhsx> S<[ I<infile> I<outfile> ]> | S<[ I<infile> ]>
+
+=head1 DESCRIPTION
+
+trhsx is a commandline utility for transforming abstract Haskell code extended
+with regular patterns into semantically equivalent normal abstract Haskell
+code.In other words, it transforms away regular patterns.
+
+=head1 OPTIONS
+
+=over
+
+=item I<infile> I<outfile>
+
+Transforms I<infile> and prints the result to I<outfile>
+
+=item I<infile>
+
+Transforms I<infile> and prints the result to stdout.
+
+=back
+
+=head1 AUTHOR
+
+This manual page was written by Florian Ragwitz <rafl at debianforum.de>, for the
+Debian system (but may be used by others). It's licensed under the GNU General
+Public License.
+
+=cut
Modified: packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs?rev=748&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs (original)
+++ packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs Fri Jun 22 16:50:58 2007
@@ -23,7 +23,11 @@
import Language.Haskell.Hsx.ParseMonad
+#if __GLASGOW_HASKELL__ >= 604
+import Data.Char hiding (isSymbol)
+#else
import Data.Char
+#endif
import Data.Ratio
data Token
Modified: packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Pretty.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Pretty.hs?rev=748&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Pretty.hs (original)
+++ packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Pretty.hs Fri Jun 22 16:50:58 2007
@@ -703,8 +703,7 @@
prettyChildren p = case p of
HsPList ps -> map prettyChild ps
HsPRPat _ _ -> [pretty p]
- _ -> error "The pattern representing the children of an xml pattern\
- \ should always be a list."
+ _ -> error "The pattern representing the children of an xml pattern should always be a list."
prettyChild :: HsPat -> Doc
prettyChild p = case p of
Modified: packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs?rev=748&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs (original)
+++ packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs Fri Jun 22 16:50:58 2007
@@ -381,8 +381,7 @@
let gs' = case gs of
[] -> []
[g] -> [mkDeclGuard g ws]
- _ -> error "This should not happen since we \
- \ have called renameLetDecls already!"
+ _ -> error "This should not happen since we have called renameLetDecls already!"
-- Generated attribute guards should also be added as declarations,
-- but with no where clauses.
ags' = map (flip mkDeclGuard $ []) ags
@@ -1269,8 +1268,7 @@
| otherwise -> case v of
HsIdent n -> fail $ "Attempting to bind variable "++n++
" inside the context of a numerable regular pattern"
- _ -> fail $ "This should never ever ever happen...\
- \ how the ¤#% did you do it??!?"
+ _ -> fail $ "This should never ever ever happen... how the #### did you do it??!?"
where -- | Generate a declaration for a @ binding.
mkAsDecl :: SrcLoc -> MFunMetaInfo -> Tr HsName
Modified: packages/haskell-src-exts/trunk/src/haskell-src-exts/haskell-src-exts.cabal
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/src/haskell-src-exts/haskell-src-exts.cabal?rev=748&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/src/haskell-src-exts/haskell-src-exts.cabal (original)
+++ packages/haskell-src-exts/trunk/src/haskell-src-exts/haskell-src-exts.cabal Fri Jun 22 16:50:58 2007
@@ -13,3 +13,4 @@
Language.Haskell.Hsx.Lexer,
Language.Haskell.Hsx.ParseUtils
Build-Depends: base, haskell98
+Extensions: CPP
Modified: packages/haskell-src-exts/trunk/src/trhsx/trhsx.cabal
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/src/trhsx/trhsx.cabal?rev=748&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/src/trhsx/trhsx.cabal (original)
+++ packages/haskell-src-exts/trunk/src/trhsx/trhsx.cabal Fri Jun 22 16:50:58 2007
@@ -3,7 +3,7 @@
License: PublicDomain
Author: Niklas Broberg
Maintainer: nibro at cs.chalmers.se
-Build-Depends: haskell-src-exts
+Build-Depends: base, haskell98, haskell-src-exts
Executable: trhsx
Main-Is: Hsx.hs
More information about the Pkg-haskell-commits
mailing list