[Pkg-haskell-commits] r996 - in /packages/haskell-uulib/trunk: ./ debian/ debian/patches/ src/ src/UU/ src/UU/DData/ src/UU/Parsing/ src/UU/Pretty/ src/UU/Scanner/ src/UU/Util/

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Sat Jan 19 16:49:21 UTC 2008 

Author: arjan
Date: Sat Jan 19 16:49:21 2008
New Revision: 996

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=996
Log:
* New upstream release.
* debian/watch: Use hackage.haskell.org as site for new upstream
  releases. (Closes: #456480)
* debian/patches/01_update-cabal-file.dpatch: Removed. The cabal file is
  fixed upstream for the new Cabal version.

Added:
    packages/haskell-uulib/trunk/uulib.cabal
      - copied unchanged from r995, packages/haskell-uulib/branches/upstream/current/uulib.cabal
Removed:
    packages/haskell-uulib/trunk/Makefile.in
    packages/haskell-uulib/trunk/VERSION
    packages/haskell-uulib/trunk/configure.in
    packages/haskell-uulib/trunk/debian/patches/01_update-cabal-file.dpatch
    packages/haskell-uulib/trunk/src/DDataProps.hs
    packages/haskell-uulib/trunk/src/UU/Parsing/Examples.hs
    packages/haskell-uulib/trunk/uulib.cabal.in
Modified:
    packages/haskell-uulib/trunk/debian/changelog
    packages/haskell-uulib/trunk/debian/patches/00list
    packages/haskell-uulib/trunk/debian/watch
    packages/haskell-uulib/trunk/src/UU/DData/IntSet.hs
    packages/haskell-uulib/trunk/src/UU/DData/Queue.hs
    packages/haskell-uulib/trunk/src/UU/DData/Scc.hs
    packages/haskell-uulib/trunk/src/UU/Parsing.hs
    packages/haskell-uulib/trunk/src/UU/Parsing/CharParser.hs
    packages/haskell-uulib/trunk/src/UU/Parsing/Interface.hs
    packages/haskell-uulib/trunk/src/UU/Pretty.hs
    packages/haskell-uulib/trunk/src/UU/Pretty/Ext.hs
    packages/haskell-uulib/trunk/src/UU/Scanner.hs
    packages/haskell-uulib/trunk/src/UU/Scanner/GenToken.hs
    packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenOrd.hs
    packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenParser.hs
    packages/haskell-uulib/trunk/src/UU/Util/Utils.hs

Modified: packages/haskell-uulib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/debian/changelog?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/debian/changelog (original)
+++ packages/haskell-uulib/trunk/debian/changelog Sat Jan 19 16:49:21 2008
@@ -1,3 +1,13 @@
+haskell-uulib (0.9.5-1~pre1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/watch: Use hackage.haskell.org as site for new upstream
+    releases. (Closes: #456480)
+  * debian/patches/01_update-cabal-file.dpatch: Removed. The cabal file is
+    fixed upstream for the new Cabal version.
+
+ -- Arjan Oosting <arjan at debian.org>  Sat, 19 Jan 2008 17:41:13 +0100
+
 haskell-uulib (0.9.3~snapshot20071230-3) unstable; urgency=low
 
   * debian/control:

Modified: packages/haskell-uulib/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/debian/patches/00list?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/debian/patches/00list (original)
+++ packages/haskell-uulib/trunk/debian/patches/00list Sat Jan 19 16:49:21 2008
@@ -1,1 +1,1 @@
-01_update-cabal-file
+

Modified: packages/haskell-uulib/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/debian/watch?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/debian/watch (original)
+++ packages/haskell-uulib/trunk/debian/watch Sat Jan 19 16:49:21 2008
@@ -1,4 +1,5 @@
 # See uscan(1) for format
 
 version=3
-http://www.cs.uu.nl/wiki/HUT/Download .*/uulib-(.*)-src\.tar\.gz
+http://hackage.haskell.org/packages/archive/uulib/([\d.]+)/uulib-([\d.]+).tar.gz
+# http://www.cs.uu.nl/wiki/HUT/Download .*/uulib-(.*)-src\.tar\.gz

Modified: packages/haskell-uulib/trunk/src/UU/DData/IntSet.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/DData/IntSet.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/DData/IntSet.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/DData/IntSet.hs Sat Jan 19 16:49:21 2008
@@ -848,4 +848,5 @@
 prop_List :: [Int] -> Bool
 prop_List xs
   = (sort (nub xs) == toAscList (fromList xs))
--}
+-}
+

Modified: packages/haskell-uulib/trunk/src/UU/DData/Queue.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/DData/Queue.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/DData/Queue.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/DData/Queue.hs Sat Jan 19 16:49:21 2008
@@ -277,4 +277,5 @@
 prop_TailValid :: [Int] -> Bool
 prop_TailValid xs
   = valid (tail (foldr insert empty (1:xs)))
--}
+-}
+

Modified: packages/haskell-uulib/trunk/src/UU/DData/Scc.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/DData/Scc.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/DData/Scc.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/DData/Scc.hs Sat Jan 19 16:49:21 2008
@@ -305,4 +305,5 @@
     paths xs x
       = all (\y -> path x y g) xs
 
--}
+-}
+

Modified: packages/haskell-uulib/trunk/src/UU/Parsing.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Parsing.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Parsing.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Parsing.hs Sat Jan 19 16:49:21 2008
@@ -16,4 +16,5 @@
                                 Delete t -> "at " ++ show t  
              in "\n?? Error      : " ++ pos ++
                 "\n?? Expecting  : " ++ show expecting ++
-                "\n?? Repaired by: " ++ show action ++ "\n"                
+                "\n?? Repaired by: " ++ show action ++ "\n"                
+

Modified: packages/haskell-uulib/trunk/src/UU/Parsing/CharParser.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Parsing/CharParser.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Parsing/CharParser.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Parsing/CharParser.hs Sat Jan 19 16:49:21 2008
@@ -20,7 +20,7 @@
                                 ('\LF' : _ ) -> Left' '\CR' (Input xs pos)
                                 _            -> Left' '\CR' (Input xs (newl pos))
           ('\LF':      xs) -> Left' '\LF' (Input xs (newl   pos))
-          ('\n' :      xs) -> Left' '\n'  (Input xs (newl pos))
+--          ('\n' :      xs) -> Left' '\n'  (Input xs (newl pos))  -- \n already captured above
           ('\t' :      xs) -> Left' '\t' (Input xs (tab    pos))
           (x    :      xs) -> Left' x    (Input xs (advc 1 pos))
           []               -> Right'     (Input [] pos)
@@ -31,7 +31,7 @@
                                 ('\LF' : _ ) -> ('\CR', Input xs pos)
                                 _            -> ('\CR', Input xs (newl pos))
           ('\LF':      xs) -> ( '\LF', Input xs (newl   pos))
-          ('\n' :      xs) -> ( '\n' , Input xs (newl   pos))
+--          ('\n' :      xs) -> ( '\n' , Input xs (newl   pos)) -- \n already captured above
           ('\t' :      xs) -> ( '\t' , Input xs (tab    pos))
           (x    :      xs) -> ( x    , Input xs (advc 1 pos))
 

Modified: packages/haskell-uulib/trunk/src/UU/Parsing/Interface.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Parsing/Interface.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Parsing/Interface.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Parsing/Interface.hs Sat Jan 19 16:49:21 2008
@@ -29,8 +29,7 @@
 -- | The 'IsParser' class contains the base combinators with which
 -- to write parsers. A minimal complete instance definition consists of
 -- definitions for '(<*>)', '(<|>)', 'pSucceed', 'pLow', 'pFail', 
--- 'pCostRange', 'pCostSym', 'getfirsts', 'setfirsts', 'getzerop' 
--- and 'setzerop'.
+-- 'pCostRange', 'pCostSym', 'getfirsts', 'setfirsts', and 'getzerop'.
 class  IsParser p s | p -> s where
   -- | Sequential composition. Often used in combination with <$>.
   -- The function returned by parsing the left-hand side is applied 

Modified: packages/haskell-uulib/trunk/src/UU/Pretty.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Pretty.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Pretty.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Pretty.hs Sat Jan 19 16:49:21 2008
@@ -1,4 +1,5 @@
 module UU.Pretty(module UU.Pretty.Basic, module UU.Pretty.Ext ) where
 
 import UU.Pretty.Basic
-import UU.Pretty.Ext
+import UU.Pretty.Ext
+

Modified: packages/haskell-uulib/trunk/src/UU/Pretty/Ext.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Pretty/Ext.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Pretty/Ext.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Pretty/Ext.hs Sat Jan 19 16:49:21 2008
@@ -186,4 +186,5 @@
 -- pp_parens_list: idem pp_list, with parenthesis and comma separator
 
 pp_parens_list :: Int -> [PP_Doc] -> PP_Doc
-pp_parens_list mpw = pp_list mpw "(" ")" ", "
+pp_parens_list mpw = pp_list mpw "(" ")" ", "
+

Modified: packages/haskell-uulib/trunk/src/UU/Scanner.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Scanner.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Scanner.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Scanner.hs Sat Jan 19 16:49:21 2008
@@ -14,4 +14,5 @@
 -- instances
 import UU.Scanner.TokenShow()
 import UU.Scanner.GenTokenOrd()
-import UU.Scanner.GenTokenSymbol()
+import UU.Scanner.GenTokenSymbol()
+

Modified: packages/haskell-uulib/trunk/src/UU/Scanner/GenToken.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Scanner/GenToken.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Scanner/GenToken.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Scanner/GenToken.hs Sat Jan 19 16:49:21 2008
@@ -8,4 +8,5 @@
 position :: GenToken k t v -> Pos
 position tok = case tok of
                    Reserved _ p   -> p
-                   ValToken _ _ p -> p
+                   ValToken _ _ p -> p
+

Modified: packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenOrd.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenOrd.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenOrd.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenOrd.hs Sat Jan 19 16:49:21 2008
@@ -11,4 +11,5 @@
   compare (Reserved x    _) (Reserved y    _) = compare x y
   compare (Reserved _    _) _                 = LT
   compare (ValToken tx _ _) (ValToken ty _ _) = compare tx ty
-  compare _              _                    = GT
+  compare _              _                    = GT
+

Modified: packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenParser.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenParser.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenParser.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Scanner/GenTokenParser.hs Sat Jan 19 16:49:21 2008
@@ -50,4 +50,5 @@
 
 pValTokenNoPos          :: IsParser p (GenToken key tp val) 
                         => tp -> val -> p val
-pValTokenNoPos tp val   =  fst <$> pValToken tp val                          
+pValTokenNoPos tp val   =  fst <$> pValToken tp val                          
+

Modified: packages/haskell-uulib/trunk/src/UU/Util/Utils.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/trunk/src/UU/Util/Utils.hs?rev=996&op=diff
==============================================================================
--- packages/haskell-uulib/trunk/src/UU/Util/Utils.hs (original)
+++ packages/haskell-uulib/trunk/src/UU/Util/Utils.hs Sat Jan 19 16:49:21 2008
@@ -15,4 +15,5 @@
 snd3 (_,b,_) = b
 
 thd3 :: (a,b,c) -> c
-thd3 (_,_,c) = c
+thd3 (_,_,c) = c
+

More information about the Pkg-haskell-commits mailing list