[Pkg-haskell-commits] darcs: alex: New upstream (UNRELEASED).

[Erik de Castro Lopo]

Wed Nov 24 09:27:28 UTC 2010  Erik de Castro Lopo <erikd at mega-nerd.com>
  * New upstream (UNRELEASED).
  Ignore-this: a5301cb38be5cb2984123fef97e852d7

    M ./changelog -2 +9
    R ./patches/
    R ./patches/00-fix-warnings-on-big-endian.diff
    R ./patches/series

Wed Nov 24 09:27:28 UTC 2010  Erik de Castro Lopo <erikd at mega-nerd.com>
  * New upstream (UNRELEASED).
  Ignore-this: a5301cb38be5cb2984123fef97e852d7
diff -rN -u old-alex/changelog new-alex/changelog
--- old-alex/changelog	2010-11-24 09:27:47.931993001 +0000
+++ new-alex/changelog	2010-11-24 09:27:47.931993001 +0000
@@ -1,3 +1,10 @@
+alex (2.3.4-1) UNRELEASED; urgency=low
+
+  * New upstream.
+  * Remove patches/00-fix-warnings-on-big-endian.diff (fixed upstream).
+
+ -- Erik de Castro Lopo <erikd at mega-nerd.com>  Wed, 24 Nov 2010 20:23:08 +1100
+
 alex (2.3.3-2) experimental; urgency=low
 
   * Fix warnings in alex generated code on big endian systems (Closes: #594181).
@@ -45,7 +52,7 @@
 alex (2.3.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #530313)
-  * Let watchfile point to hackage 
+  * Let watchfile point to hackage
   * Adopt for the Debian Haskell Group and adjust packaging.
 
  -- Joachim Breitner <nomeata at debian.org>  Mon, 05 Oct 2009 17:22:19 +0200
@@ -75,7 +82,7 @@
       warning.
     - Update debian/copyright file with info from upstream LICENSE file.
   * debian/get_version.hs: Updated for Cabal 1.2
-  * debian/rules: 
+  * debian/rules:
     - Fix debian-rules-ignores-make-clean-error lintian warning.
     - Remove the LICENSE installed by ./setup copy
   * Add debian/watch file.
diff -rN -u old-alex/patches/00-fix-warnings-on-big-endian.diff new-alex/patches/00-fix-warnings-on-big-endian.diff
--- old-alex/patches/00-fix-warnings-on-big-endian.diff	2010-11-24 09:27:47.931993001 +0000
+++ new-alex/patches/00-fix-warnings-on-big-endian.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-#Author: Erik de Castro Lopo <erikd at mega-nerd.com>
-#Description :
-# Before this patch alex we generating code that produced warnings when
-# compiled with GHC. This patch was submitted to the alex bug tracker:
-#
-#    http://trac.haskell.org/haskell-platform/ticket/141
-#
-# and the patch has been applied to the alex darcs repo, but there has been
-# no new release yet.
-
-Index: alex-2.3.3/templates/GenericTemplate.hs
-===================================================================
---- alex-2.3.3.orig/templates/GenericTemplate.hs
-+++ alex-2.3.3/templates/GenericTemplate.hs
-@@ -57,10 +57,10 @@
- ALEX_IF_BIGENDIAN
-   narrow16Int# i
-   where
--	i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
--	high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
--	low  = int2Word# (ord# (indexCharOffAddr# arr off'))
--	off' = off *# 2#
-+	!i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
-+	!high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
-+	!low  = int2Word# (ord# (indexCharOffAddr# arr off'))
-+	!off' = off *# 2#
- ALEX_ELSE
-   indexInt16OffAddr# arr off
- ALEX_ENDIF
-@@ -74,14 +74,14 @@
- ALEX_IF_BIGENDIAN
-   narrow32Int# i
-   where
--   i    = word2Int# ((b3 `uncheckedShiftL#` 24#) `or#`
-+   !i    = word2Int# ((b3 `uncheckedShiftL#` 24#) `or#`
- 		     (b2 `uncheckedShiftL#` 16#) `or#`
- 		     (b1 `uncheckedShiftL#` 8#) `or#` b0)
--   b3   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 3#)))
--   b2   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 2#)))
--   b1   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
--   b0   = int2Word# (ord# (indexCharOffAddr# arr off'))
--   off' = off *# 4#
-+   !b3   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 3#)))
-+   !b2   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 2#)))
-+   !b1   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
-+   !b0   = int2Word# (ord# (indexCharOffAddr# arr off'))
-+   !off' = off *# 4#
- ALEX_ELSE
-   indexInt32OffAddr# arr off
- ALEX_ENDIF
diff -rN -u old-alex/patches/series new-alex/patches/series
--- old-alex/patches/series	2010-11-24 09:27:47.931993001 +0000
+++ new-alex/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-00-fix-warnings-on-big-endian.diff