[DHG_packages] 01/01: Fix whitespace in frown patches
Joachim Breitner
nomeata at moszumanska.debian.org
Tue Aug 11 13:21:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch master
in repository DHG_packages.
commit c4962aac56a7479ff747249c02464b3b6774c91a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Tue Aug 11 15:06:33 2015 +0200
Fix whitespace in frown patches
---
p/frown/debian/patches/01_imagen-creates-png-files | 10 ++--
.../patches/02_ignore-hugs-version-in-test-frown | 2 +-
p/frown/debian/patches/03_update-empty.out | 4 +-
p/frown/debian/patches/04_manual-typos | 10 ++--
p/frown/debian/patches/05_only-build-pdf | 13 ++---
p/frown/debian/patches/06_utf8 | 40 +++++++--------
p/frown/debian/patches/07_no-n-plus-k-pattern | 20 ++++----
p/frown/debian/patches/ghc-7.4.1-compat | 60 +++++++++++-----------
8 files changed, 80 insertions(+), 79 deletions(-)
diff --git a/p/frown/debian/patches/01_imagen-creates-png-files b/p/frown/debian/patches/01_imagen-creates-png-files
index fbff1ca..f5a04db 100755
--- a/p/frown/debian/patches/01_imagen-creates-png-files
+++ b/p/frown/debian/patches/01_imagen-creates-png-files
@@ -5,11 +5,11 @@ diff -urNad frown~/Manual/Makefile frown/Manual/Makefile
--- frown~/Manual/Makefile 2006-01-13 00:09:44.000000000 +0100
+++ frown/Manual/Makefile 2006-09-28 02:05:29.000000000 +0200
@@ -117,7 +117,7 @@
- hacha $(file).html
- imagen $(file)
- mkdir -p html
+ hacha $(file).html
+ imagen $(file)
+ mkdir -p html
- mv index.html $(file).html $(file).css $(file)[0-9]*.html $(file)[0-9]*.gif *motif.gif html
+ mv index.html $(file).html $(file).css $(file)[0-9]*.html $(file)[0-9]*.png *motif.gif html
-
+
spell: $(file).tex
- egrep -v '$\%' $(file).tex | $(spell) $(file).spell | sort | uniq
+ egrep -v '$\%' $(file).tex | $(spell) $(file).spell | sort | uniq
diff --git a/p/frown/debian/patches/02_ignore-hugs-version-in-test-frown b/p/frown/debian/patches/02_ignore-hugs-version-in-test-frown
index 7fd702b..4f455da 100755
--- a/p/frown/debian/patches/02_ignore-hugs-version-in-test-frown
+++ b/p/frown/debian/patches/02_ignore-hugs-version-in-test-frown
@@ -11,5 +11,5 @@ diff -urNad frown~/Examples/TestFrown.lhs frown/Examples/TestFrown.lhs
-> diff | flag = "| diff -q - "
+> diff | flag = "| diff -I\"|| Version: .* _\" -q - "
> | otherwise = "> "
-
+
NB. The `|-98|' is only needed for `|LexTerm|'.
diff --git a/p/frown/debian/patches/03_update-empty.out b/p/frown/debian/patches/03_update-empty.out
index 92c6df8..c4c872e 100755
--- a/p/frown/debian/patches/03_update-empty.out
+++ b/p/frown/debian/patches/03_update-empty.out
@@ -11,9 +11,9 @@ diff -urNad frown~/Examples/Empty.out frown/Examples/Empty.out
|| || Report bugs to: hugs-bugs at haskell.org
-|| || Version: March 2005 _________________________________________
+|| || Version: 20050308 _________________________________________
-
+
Hugs mode: Restart with command line option +98 for Haskell 98 mode
-
+
-ERROR "Empty.hs":33 - Undefined variable "parse_1__"
-Hugs.Base> ERROR - Undefined variable "s"
-Hugs.Base> [Leaving Hugs]
diff --git a/p/frown/debian/patches/04_manual-typos b/p/frown/debian/patches/04_manual-typos
index 17eae78..3fe2edd 100755
--- a/p/frown/debian/patches/04_manual-typos
+++ b/p/frown/debian/patches/04_manual-typos
@@ -16,7 +16,7 @@ diff -urNad frown~/Manual/Manual.lhs frown/Manual/Manual.lhs
@@ -543,7 +543,7 @@
By convention, the first nonterminal is also the start symbol of
the grammar (this default can be overwritten, see~Sec.~\ref{sec:multiple}).
-
+
-Productions have the general form |n : v_1, ldots, v_k;| where |n| is
+Productions have the general form |n : v_1, \ldots, v_k;| where |n| is
a nonterminal and |v_1|, \ldots, |v_k| are symbols. Note that the
@@ -29,7 +29,7 @@ diff -urNad frown~/Manual/Manual.lhs frown/Manual/Manual.lhs
-ldots }|' braces and have type |m t| where |m| is the type of the
+\ldots }|' braces and have type |m t| where |m| is the type of the
underlying monad and |t| is the type of attributes.
-
+
As an example, the following variant of the desktop calculator
@@ -1381,7 +1381,7 @@
< | Ident "then" as "then"
@@ -37,15 +37,15 @@ diff -urNad frown~/Manual/Manual.lhs frown/Manual/Manual.lhs
< | Ident {String};
-< | ldots
+< | \ldots
-
+
Note that keywords are declared just by listing them before the
general pattern for identifiers.
@@ -1392,7 +1392,7 @@
following example.
-
+
< Terminal = guard { isAlpha } as "alpha"
-< | ldots
+< | \ldots
-
+
A guard is introduced by the keyword |guard|, followed by its Haskell
definition, followed by the mandatory shortcut. The shortcut can then
diff --git a/p/frown/debian/patches/05_only-build-pdf b/p/frown/debian/patches/05_only-build-pdf
index d06949d..684802e 100755
--- a/p/frown/debian/patches/05_only-build-pdf
+++ b/p/frown/debian/patches/05_only-build-pdf
@@ -5,14 +5,15 @@ diff -urNad frown~/Manual/Makefile frown/Manual/Makefile
--- frown~/Manual/Makefile 2006-09-28 02:07:12.000000000 +0200
+++ frown/Manual/Makefile 2006-09-28 02:07:12.000000000 +0200
@@ -69,11 +69,10 @@
-
+
.PHONY : man examples edit xdvi gv acro print spell spellupdate links clean distclean
-
+
-man: $(file).ps $(file).pdf html
+man: $(file).pdf html
-
+
install: man
- mkdir -p $(doc)
+ mkdir -p $(doc)
- cp $(file).ps $(doc)
- cp $(file).pdf $(doc)
- cp -r html $(doc)
+ cp $(file).pdf $(doc)
+ cp -r html $(doc)
+
diff --git a/p/frown/debian/patches/06_utf8 b/p/frown/debian/patches/06_utf8
index 8480511..497eae3 100644
--- a/p/frown/debian/patches/06_utf8
+++ b/p/frown/debian/patches/06_utf8
@@ -68,12 +68,12 @@ diff -Nudar frown~/Compact.lhs frown/Compact.lhs
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -65,7 +65,7 @@
-
+
> {-
-
+
-NEU: f�r die optimierten Reduktionen.
+NEU: für die optimierten Reduktionen.
-
+
> ntArgsOf v ctx = args (pattern v)
> where
diff -Nudar frown~/Convert.lhs frown/Convert.lhs
@@ -413,13 +413,13 @@ diff -Nudar frown~/Main.lhs frown/Main.lhs
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -666,7 +666,7 @@
-
+
ODER
-
+
- So viele Informationen �bergeben, da� der Stack rekonstruiert werden
+ So viele Informationen übergeben, daß der Stack rekonstruiert werden
kann.
-
+
Experimental
diff -Nudar frown~/Makefile frown/Makefile
--- frown~/Makefile 2005-12-15 07:09:25.000000000 -0200
@@ -489,7 +489,7 @@ diff -Nudar frown~/Manual/Manual.bib frown/Manual/Manual.bib
+++ frown/Manual/Manual.bib 2010-03-05 21:14:33.000000000 -0300
@@ -188,7 +188,7 @@
}
-
+
@inproceedings{AlP01Gen,
- address = {�lvsj�, Sweden},
+ address = {Älvsjö, Sweden},
@@ -498,7 +498,7 @@ diff -Nudar frown~/Manual/Manual.bib frown/Manual/Manual.bib
editor = {Arts, Th. and Mohnen, M.},
@@ -505,7 +505,7 @@
}
-
+
@techreport{BPS04XML,
- author = {Bray, Tim and Paoli, Jean and Sperberg-McQueen, C.M. and Maler, Eve and Yergeau, Fran�ois and Cowan, John},
+ author = {Bray, Tim and Paoli, Jean and Sperberg-McQueen, C.M. and Maler, Eve and Yergeau, François and Cowan, John},
@@ -507,7 +507,7 @@ diff -Nudar frown~/Manual/Manual.bib frown/Manual/Manual.bib
number = {\texttt{http://www.w3.org/TR/xml11}},
@@ -1422,7 +1422,7 @@
}
-
+
@techreport{CHJLW01Gen,
- author = {Clarke, Dave and Hinze, Ralf and Jeuring, Johan and L�h, Andres and {de Wit}, Jan},
+ author = {Clarke, Dave and Hinze, Ralf and Jeuring, Johan and Löh, Andres and {de Wit}, Jan},
@@ -516,7 +516,7 @@ diff -Nudar frown~/Manual/Manual.bib frown/Manual/Manual.bib
number = {UU-CS-2001-26},
@@ -1782,7 +1782,7 @@
}
-
+
@inproceedings{ClL02Gen,
- author = {Clarke, Dave and L�h, Andres},
+ author = {Clarke, Dave and Löh, Andres},
@@ -525,7 +525,7 @@ diff -Nudar frown~/Manual/Manual.bib frown/Manual/Manual.bib
month = jul,
@@ -5619,7 +5619,7 @@
}
-
+
@techreport{LoJ05Gen,
- author = {L�h, Andres and Jeuring, Johan},
+ author = {Löh, Andres and Jeuring, Johan},
@@ -534,7 +534,7 @@ diff -Nudar frown~/Manual/Manual.bib frown/Manual/Manual.bib
number = {UU-CS-2005-004},
@@ -5628,7 +5628,7 @@
}
-
+
@phdthesis{Loe04Gen,
- author = {L�h, Andres},
+ author = {Löh, Andres},
@@ -552,7 +552,7 @@ diff -Nudar frown~/Manual/Manual.bib frown/Manual/Manual.bib
title = {Polytypic Programming in {Haskell}},
@@ -6888,9 +6888,9 @@
}
-
+
@inproceedings{PR:99,
- author = {Pfeifer, Holger and Rue�, Harald},
+ author = {Pfeifer, Holger and Rueß, Harald},
@@ -596,7 +596,7 @@ diff -Nudar frown~/Manual/Manual.lhs frown/Manual/Manual.lhs
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -33,7 +33,7 @@
\documentclass[a4paper,fleqn]{report}
-
+
\usepackage{a4wide}
-\usepackage[latin1]{inputenc}
+\usepackage[utf8]{inputenc}
@@ -604,7 +604,7 @@ diff -Nudar frown~/Manual/Manual.lhs frown/Manual/Manual.lhs
\usepackage{calc}
\usepackage{ulem}\normalem
@@ -103,9 +103,9 @@
-
+
\author
{RALF HINZE
-\\Institut f�r Informatik III
@@ -619,11 +619,11 @@ diff -Nudar frown~/Manual/Manual.lhs frown/Manual/Manual.lhs
@@ -338,7 +338,7 @@
formats. Doaitse invented the @--code=standard@ format, which was
historically the first format \Frown\ supported.
-
+
-A big thank you goes to Andres L�h and Ross Paterson for various bug
+A big thank you goes to Andres Löh and Ross Paterson for various bug
reports and suggestions for improvement.
-
+
%================================ ============================================
diff -Nudar frown~/Optimize.lhs frown/Optimize.lhs
--- frown~/Optimize.lhs 2005-12-15 07:09:24.000000000 -0200
@@ -722,12 +722,12 @@ diff -Nudar frown~/Standard.lhs frown/Standard.lhs
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -68,7 +68,7 @@
-
+
> {-
-
+
-NEU: f�r die optimierten Reduktionen.
+NEU: für die optimierten Reduktionen.
-
+
> ntArgsOf v ctx = args (pattern v)
> where
diff -Nudar frown~/Stdenv.lg frown/Stdenv.lg
diff --git a/p/frown/debian/patches/07_no-n-plus-k-pattern b/p/frown/debian/patches/07_no-n-plus-k-pattern
index 6c4b051..d41ac05 100644
--- a/p/frown/debian/patches/07_no-n-plus-k-pattern
+++ b/p/frown/debian/patches/07_no-n-plus-k-pattern
@@ -13,12 +13,12 @@ Index: frown-0.6.1/SearchTree.lhs
> (l, (a, v) : y) = build m x
-> (r, z) = build (n - m) y
+> (r, z) = build (n - 1 - m) y
-
+
> fromList_C :: (Ord a) => (v -> v -> v) -> [(a, v)] -> FM a v
> fromList_C combine = fromOrdList . group . mergeSortBy (\ (a1, _) (a2, _) -> a1 <= a2)
@@ -99,4 +99,4 @@
-
-
+
+
> unsafeLookup :: (Ord a, Show a) => FM a v -> a -> v
-> unsafeLookup fm a = fromMaybe (error ("unsafeLookup: key not found: " ++ show a)) (lookup fm a)
\ No newline at end of file
@@ -28,21 +28,21 @@ Index: frown-0.6.1/Base.lhs
--- frown-0.6.1.orig/Base.lhs 2011-06-02 20:29:02.000000000 +0200
+++ frown-0.6.1/Base.lhs 2011-06-02 20:30:17.000000000 +0200
@@ -166,13 +166,13 @@
-
+
> revTake :: Int -> RevList a -> RevList a
> revTake 0 _ = Nil
-> revTake (_n + 1) Nil = Nil
-> revTake (n + 1) (as :> a) = revTake n as :> a
+> revTake _n Nil = Nil
+> revTake n (as :> a) = revTake (n-1) as :> a
-
+
> revDrop :: Int -> RevList a -> RevList a
> revDrop 0 as = as
-> revDrop (_n + 1) Nil = Nil
-> revDrop (n + 1) (as :> _a) = revDrop n as
+> revDrop _n Nil = Nil
+> revDrop n (as :> _a) = revDrop (n-1) as
-
+
%-------------------------------------------------------------------------------
\subsection{Formatting text}
Index: frown-0.6.1/Lexer2.lhs
@@ -57,9 +57,9 @@ Index: frown-0.6.1/Lexer2.lhs
+> nested n ('-' : '}' : s) = '-' <| '}' <| nested (n - 1) s
> nested n ('{' : '-' : s) = '{' <| '-' <| nested (n + 1) s
> nested n (c : s) = c <| nested n s
-
+
@@ -156,4 +156,4 @@
-
+
> isSymbol, isIdChar :: Char -> Bool
> isSymbol c = c `elem` "!@#$%&*+./<=>?\\^|:-~"
-> isIdChar c = isAlphaNum c || c `elem` "_'"
@@ -70,11 +70,11 @@ Index: frown-0.6.1/Future.lhs
--- frown-0.6.1.orig/Future.lhs 2011-06-02 20:31:44.000000000 +0200
+++ frown-0.6.1/Future.lhs 2011-06-02 20:32:01.000000000 +0200
@@ -60,7 +60,7 @@
-
+
> prune :: Int -> Future -> Future
> prune 0 (Future _ts) = fromList []
-> prune (n + 1) (Future ts) = fromList [ (a, prune n us) | (a, us) <- FM.toList ts ]
+> prune n (Future ts) = fromList [ (a, prune (n-1) us) | (a, us) <- FM.toList ts ]
-
+
> domain :: Future -> Set Symbol
> domain (Future f) = Set.fromList (map fst (FM.toList f))
diff --git a/p/frown/debian/patches/ghc-7.4.1-compat b/p/frown/debian/patches/ghc-7.4.1-compat
index 2e61195..94b6540 100644
--- a/p/frown/debian/patches/ghc-7.4.1-compat
+++ b/p/frown/debian/patches/ghc-7.4.1-compat
@@ -16,13 +16,13 @@ Index: frown-0.6.1/Main.lhs
> import System.Console.GetOpt
+> import System.Exit
+> import System.Environment
-
+
%-------------------------------= --------------------------------------------
\section{The main program}
@@ -689,4 +690,4 @@
| let add op = ADDOP (op :: Addop)
| let id s = IDENT (s :: String);
-
+
- |add op| serves as an abbreviation for |ADDOP op|.
\ No newline at end of file
+ |add op| serves as an abbreviation for |ADDOP op|.
@@ -40,7 +40,7 @@ Index: frown-0.6.1/Base.lhs
+> import Control.Monad ( MonadPlus(..) )
+> import System.Exit
+> import System.IO
-
+
%-------------------------------------------------------------------------------
\subsection{List utilities}
Index: frown-0.6.1/Case.lhs
@@ -60,7 +60,7 @@ Index: frown-0.6.1/Case.lhs
+> import Control.Monad
+> import Data.List ( partition )
> import Prelude hiding ( lookup )
-
+
%-------------------------------= --------------------------------------------
@@ -347,4 +347,4 @@
> actions' :: Symbol -> Past -> Past
@@ -84,10 +84,10 @@ Index: frown-0.6.1/Compact.lhs
+> import System.IO
+> import Data.Maybe
> import Prelude hiding ( lookup )
-
+
%-------------------------------= --------------------------------------------
@@ -444,4 +444,4 @@
-
+
> wrap s = prefix opts ++ s ++ suffix opts
> wrap_var s = var (wrap s)
-> wrap_con s = con (wrap s)
@@ -113,7 +113,7 @@ Index: frown-0.6.1/Convert.lhs
+> import Control.Monad
+> import System.IO hiding ( isEOF )
> import Options
-
+
> newEOF :: Ident
@@ -361,4 +361,4 @@
> | terminal w = w
@@ -136,12 +136,12 @@ Index: frown-0.6.1/GParser2.hs
+ import Data.Char hiding ( isSymbol )
+ import Data.List
+ import System.IO
-
-
-
+
+
+
@@ -2258,4 +2258,4 @@
where verb = verbose opts
-
+
run :: (Monad m) => Lex m Answer -> (String -> m Answer)
- run parser inp = unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp))
\ No newline at end of file
@@ -160,7 +160,7 @@ Index: frown-0.6.1/GParser2.lg
+> import Data.Char
+> import Data.List
+> import System.IO
-
+
% - - - - - - - - - - - - - - - = - - - - - - - - - - - - - - - - - - - - - - -
\subsection{Abstract syntax}
@@ -481,4 +481,4 @@
@@ -187,7 +187,7 @@ Index: frown-0.6.1/GVStack.lhs
+> import Data.Char
+> import Data.List ( maximumBy )
> import Prelude hiding ( lookup )
-
+
%-------------------------------= --------------------------------------------
Index: frown-0.6.1/Generate.lhs
===================================================================
@@ -199,9 +199,9 @@ Index: frown-0.6.1/Generate.lhs
> --import Char ( toLower, toUpper )
-> import List ( intersperse )
+> import Data.List ( intersperse )
-
+
Symbols.
-
+
Index: frown-0.6.1/Haskell.lhs
===================================================================
--- frown-0.6.1.orig/Haskell.lhs 2012-03-15 13:09:04.000000000 +0100
@@ -213,7 +213,7 @@ Index: frown-0.6.1/Haskell.lhs
-> import Char
+> import Data.Char
> import Prelude hiding ( concat )
-
+
%-------------------------------= --------------------------------------------
Index: frown-0.6.1/LR0.lhs
===================================================================
@@ -226,11 +226,11 @@ Index: frown-0.6.1/LR0.lhs
-> import IO
+> import System.IO
> import Options
-
+
%-------------------------------= --------------------------------------------
@@ -269,4 +269,4 @@
productions such as |Start# : Start, EOF;|.
-
+
> errorState :: State
-> errorState = State 0 (Set.empty :\/ Set.empty)
\ No newline at end of file
@@ -251,7 +251,7 @@ Index: frown-0.6.1/Lexer2.lhs
+> import Control.Monad
> import Base
> import Options
-
+
Index: frown-0.6.1/Lib/OrdUniqListFM.lhs
===================================================================
--- frown-0.6.1.orig/Lib/OrdUniqListFM.lhs 2012-03-15 13:09:04.000000000 +0100
@@ -264,12 +264,12 @@ Index: frown-0.6.1/Lib/OrdUniqListFM.lhs
-> import Maybe ( fromMaybe )
+> import qualified Data.List as List
+> import Data.Maybe ( fromMaybe )
-
+
> infixl 9 !
> infixl 9 //
@@ -292,4 +292,4 @@
@prefixLookup@ returns the list of all completions of the given list.
-
+
prefixLookup :: Ord a => FM [a] b -> [a] -> [([a], b)]
- prefixLookup (FM f) s = [ b | Assoc b@(a, _)<-f, s `isPrefixOf` a ]
\ No newline at end of file
@@ -286,7 +286,7 @@ Index: frown-0.6.1/Lib/OrdUniqListSet.lhs
-> import Monad
+> import qualified Data.List as List
+> import Control.Monad
-
+
%-------------------------------------------------------------------------------
\subsection{Type definitions and instance declarations}
Index: frown-0.6.1/Lookahead.lhs
@@ -303,7 +303,7 @@ Index: frown-0.6.1/Lookahead.lhs
+> import System.IO
+> import Data.Maybe
+> import Control.Monad ( when )
-
+
%-------------------------------= --------------------------------------------
\section{Grouping of actions}
Index: frown-0.6.1/Options.lhs
@@ -318,12 +318,12 @@ Index: frown-0.6.1/Options.lhs
-> import IO
+> import Data.Char
+> import System.IO
-
+
%-------------------------------= --------------------------------------------
\section{Command line options}
@@ -149,4 +149,4 @@
> | otherwise = Signature False
-
+
> (<<) :: String -> String -> Bool
-> s << t = map toLower s `isPrefix` map toLower t
\ No newline at end of file
@@ -340,7 +340,7 @@ Index: frown-0.6.1/SearchTree.lhs
+> import Data.Maybe ( fromMaybe )
> import Prelude hiding ( length, lookup )
> import qualified Prelude
-
+
Index: frown-0.6.1/Stackless.lhs
===================================================================
--- frown-0.6.1.orig/Stackless.lhs 2012-03-15 13:09:04.000000000 +0100
@@ -358,10 +358,10 @@ Index: frown-0.6.1/Stackless.lhs
+> import System.IO
+> import Control.Monad
> import Prelude hiding ( lookup )
-
+
Characteristics.
@@ -311,4 +311,4 @@
-
+
> wrap s = prefix opts ++ s ++ suffix opts
> wrap_var s = var (wrap s)
-> wrap_con s = con (wrap s)
@@ -382,10 +382,10 @@ Index: frown-0.6.1/Standard.lhs
+> import System.IO
+> import Data.Maybe
> import Prelude hiding ( lookup )
-
+
Characteristics.
@@ -293,4 +293,4 @@
-
+
> wrap s = prefix opts ++ s ++ suffix opts
> wrap_var s = var (wrap s)
-> wrap_con s = con (wrap s)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list