[Pkg-haskell-commits] r918 - in /packages/haskell-src-exts/trunk: debian/changelog debian/control debian/rules src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Wed Jan 9 23:25:38 UTC 2008
Author: arjan
Date: Wed Jan 9 23:25:38 2008
New Revision: 918
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=918
Log:
r2362 at nebula: arjan | 2008-01-10 00:24:32 +0100
* New upstream darcs snapshot release which compiles with GHC 6.8.2.
- Bump the build dependency on ghc6 to 6.8.2 so we are sure we get the
Cabal version 1.2 which is needed to build this package.
dh_haskell_depends from haskell-devscripts.
- Adjust the path to the .installed-pkg-config file which is now
created by the new Cabal version as dist/installed-pkg-config
- Adjust the regular expressions so the only match the Version and
Name fields in the .cabal files.
* Stop patching src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs as
upstream fixed the compilation issue by renaming isSymbol to
isHSymbol.
Modified:
packages/haskell-src-exts/trunk/debian/changelog
packages/haskell-src-exts/trunk/debian/control
packages/haskell-src-exts/trunk/debian/rules
packages/haskell-src-exts/trunk/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
Modified: packages/haskell-src-exts/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/changelog?rev=918&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/debian/changelog (original)
+++ packages/haskell-src-exts/trunk/debian/changelog Wed Jan 9 23:25:38 2008
@@ -1,6 +1,6 @@
haskell-src-exts (0.2.1~darcs20071212-1~pre1) unstable; urgency=low
- * New upstream darcs snapshot release which compiles with GHC 6.8.2.
+ * New upstream darcs snapshot release which compiles with GHC 6.8.2.
* debian/control:
- Use the official Vcs-* fields.
- Add Homepage field.
@@ -11,13 +11,22 @@
- Bump Standard-Version to 3.7.3. No changes needed.
- Add some commented out binary stanzas for API documentation packages
we might want to build in the future.
+ - Bump the build dependency on ghc6 to 6.8.2 so we are sure we get the
+ Cabal version 1.2 which is needed to build this package.
* debian/{haskell-harp-doc,haskell-src-exts-doc}.docs: Added.
* debian/rules:
- Add some commented out code to generate API documentation. This does
not work yet, due some parse error haddock is having.
- Replace the call to debian/mk-haskell-depends with a call to
- dh_haskell_depends from haskell-devscripts.
-
+ dh_haskell_depends from haskell-devscripts.
+ - Adjust the path to the .installed-pkg-config file which is now
+ created by the new Cabal version as dist/installed-pkg-config
+ - Adjust the regular expressions so the only match the Version and
+ Name fields in the .cabal files.
+ * Stop patching src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs as
+ upstream fixed the compilation issue by renaming isSymbol to
+ isHSymbol.
+
-- Arjan Oosting <arjan at debian.org> Tue, 08 Jan 2008 21:49:23 +0100
haskell-src-exts (0.2.1~darcs20070622-1) unstable; urgency=low
Modified: packages/haskell-src-exts/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/control?rev=918&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/debian/control (original)
+++ packages/haskell-src-exts/trunk/debian/control Wed Jan 9 23:25:38 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Florian Ragwitz <rafl at debian.org>
Uploaders: Arjan Oosting <arjan at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.4.2), happy,
+Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.8.2), happy,
haskell-devscripts (>= 0.6.0)
# Build-Depends-Indep: haddock, ghc6-doc
Standards-Version: 3.7.3
Modified: packages/haskell-src-exts/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/rules?rev=918&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/debian/rules (original)
+++ packages/haskell-src-exts/trunk/debian/rules Wed Jan 9 23:25:38 2008
@@ -53,8 +53,8 @@
for d in $(MODULES) ; do \
cd "$(CURDIR)/src/$$d" && \
"$(CURDIR)/debian/ghc6" --make Setup.hs -o setup -package Cabal && \
- name=`grep "Name:" *.cabal | sed "s|Name:[ \t]*\(.*\)|\1|"` && \
- vers=`grep "Version:" *.cabal | sed "s|Version:[ \t]*\(.*\)|\1|"` && \
+ name=`grep "^Name:" *.cabal | sed "s|^Name:[ \t]*\(.*\)|\1|"` && \
+ vers=`grep "^Version:" *.cabal | sed "s|^Version:[ \t]*\(.*\)|\1|"` && \
sed -e "s|@LIBRARY@|$$name|g" -e "s|@VERSION@|$$vers|g" \
"$(CURDIR)/debian/postinst.in" > \
"$(CURDIR)/debian/libghc6-$$d-dev.postinst" && \
@@ -130,7 +130,7 @@
sed -e "s%haddock-interfaces:.*%haddock-interfaces: /usr/share/doc/$$-doc/html/$$d.haddock%" \
-e "s%haddock-html: .*%haddock-html: /usr/share/doc/$$d-doc/html%" \
-e "s%include-dirs: .*%include-dirs:%" \
- "$(CURDIR)/src/$$d/.installed-pkg-config" > "$$libdir/installed-pkg-config" ; \
+ "$(CURDIR)/src/$$d/dist/installed-pkg-config" > "$$libdir/installed-pkg-config" ; \
done && \
find "$(CURDIR)/debian/libghc6-$$d-dev/usr/" -empty -type d -delete ; \
done
@@ -166,8 +166,9 @@
dh_md5sums
dh_builddeb
# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
+#binary-indep: build-indep install-indep
# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+binary-indep:
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
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=918&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 Wed Jan 9 23:25:38 2008
@@ -23,11 +23,7 @@
import Language.Haskell.Hsx.ParseMonad
-#if __GLASGOW_HASKELL__ >= 604
-import Data.Char hiding (isSymbol)
-#else
import Data.Char
-#endif
import Data.Ratio
data Token
More information about the Pkg-haskell-commits
mailing list