diff options
author | Joachim Breitner <mail@joachim-breitner.de> | 2016-02-08 13:09:51 +0100 |
---|---|---|
committer | Joachim Breitner <mail@joachim-breitner.de> | 2016-02-08 13:09:51 +0100 |
commit | 8282b44456446b3c11a4883ed57b2e88d919267d (patch) | |
tree | ccc93772341232ba3bb5b086b95b092bd5d8909f /p/frown/debian | |
parent | 21fcb571ff24bc8d2b509fd29513eb64dab6b3ce (diff) | |
download | DHG_packages-8282b44456446b3c11a4883ed57b2e88d919267d.tar.gz |
frown: now on hackage and cabalized
Diffstat (limited to 'p/frown/debian')
-rw-r--r-- | p/frown/debian/changelog | 6 | ||||
-rw-r--r-- | p/frown/debian/clean | 2 | ||||
-rw-r--r-- | p/frown/debian/control | 138 | ||||
-rw-r--r-- | p/frown/debian/frown-doc.doc-base | 2 | ||||
-rw-r--r-- | p/frown/debian/frown-doc.install | 3 | ||||
-rw-r--r-- | p/frown/debian/frown.haskell-binaries | 1 | ||||
-rw-r--r-- | p/frown/debian/frown.install | 1 | ||||
-rw-r--r-- | p/frown/debian/frown.lintian-overrides | 1 | ||||
-rwxr-xr-x | p/frown/debian/patches/02_ignore-hugs-version-in-test-frown | 15 | ||||
-rwxr-xr-x | p/frown/debian/patches/03_update-empty.out | 22 | ||||
-rw-r--r--[-rwxr-xr-x] | p/frown/debian/patches/04_manual-typos | 17 | ||||
-rw-r--r-- | p/frown/debian/patches/06_utf8 | 632 | ||||
-rw-r--r-- | p/frown/debian/patches/07_no-n-plus-k-pattern | 80 | ||||
-rw-r--r-- | p/frown/debian/patches/ghc-7.4.1-compat | 393 | ||||
-rw-r--r-- | p/frown/debian/patches/series | 4 | ||||
-rwxr-xr-x | p/frown/debian/rules | 36 | ||||
-rw-r--r-- | p/frown/debian/watch | 3 |
17 files changed, 135 insertions, 1221 deletions
diff --git a/p/frown/debian/changelog b/p/frown/debian/changelog index e52692b00..c1cb0e9df 100644 --- a/p/frown/debian/changelog +++ b/p/frown/debian/changelog @@ -1,3 +1,9 @@ +frown (0.6.2.2-1) experimental; urgency=medium + + * Upgrade to hackage release of frown. + + -- Joachim Breitner <nomeata@debian.org> Sun, 07 Feb 2016 13:03:49 +0100 + frown (0.6.1-14.1) experimental; urgency=medium [ Helmut Grohne ] diff --git a/p/frown/debian/clean b/p/frown/debian/clean index 81d1f9cf6..7695e2d75 100644 --- a/p/frown/debian/clean +++ b/p/frown/debian/clean @@ -1,2 +1,4 @@ +Manual/Manual.pdf +Manual/Manual.dvi Manual/Manual.haux Manual/Manual.htoc diff --git a/p/frown/debian/control b/p/frown/debian/control index 893f7563e..285b7a624 100644 --- a/p/frown/debian/control +++ b/p/frown/debian/control @@ -1,97 +1,67 @@ Source: frown -Section: devel -Priority: optional Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org> -Uploaders: Marco Túlio Gontijo e Silva <marcot@debian.org> -Build-Depends: cdbs, debhelper (>= 9), ghc, - hevea, lhs2tex, texlive-latex-base, texlive-latex-recommended, - texlive-latex-extra, texlive-math-extra, texlive-generic-recommended +Uploaders: Joachim Breitner <nomeata@debian.org> +Priority: extra +Section: haskell +Build-Depends: debhelper (>= 9), + haskell-devscripts (>= 0.10), + cdbs, + ghc, + lhs2tex, + hevea, + texlive-generic-recommended, + texlive-latex-extra, Standards-Version: 3.9.6 -Vcs-Darcs: http://darcs.debian.org/pkg-haskell/frown -Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/frown +Homepage: http://hackage.haskell.org/package/frown +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/frown +Vcs-Git: git://git.debian.org/git/pkg-haskell/DHG_packages.git +X-Description: LALR(k) parser generator + Frown is an LALR(k) parser generator for Haskell 98 written in Haskell 98. + . + Its salient features are: + - The generated parsers are time and space efficient. On the downside, the + parsers are quite large. + - Frown generates four different types of parsers. as a common + characteristic, the parsers are genuinely functional (ie ‘table-free’); + the states of the underlying LR automaton are encoded as mutually + recursive functions. Three output formats use a typed stack + representation, and one format due to Ross Paterson (code=stackless) + works even without a stack. + - Encoding states as functions means that each state can be treated + individually as opposed to a table-driven approach, which necessitates a + uniform treatment of states. For instance, look-ahead is only used when + necessary to resolve conflicts. + - Frown comes with debugging and tracing facilities; the standard output + format due to Doaitse Swierstra (code=standard) may be useful for + teaching LR parsing. + - Common grammatical patterns such as repetition of symbols can be + captured using rule schemata. There are several predefined rule + schemata. + - Terminal symbols are arbitrary variable-free Haskell patterns or guards. + Both terminal and nonterminal symbols may have an arbitrary number of + synthesized attributes. + - Frown comes with extensive documentation; several example grammars are + included. Furthermore, Frown supports the use of monadic lexers, monadic + semantic actions, precedences, and associativity, the generation of + backtracking parsers, multiple start symbols, error reporting, and a + weak form of error correction. Package: frown Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: frown-doc (= ${source:Version}) +Section: misc +Depends: ${shlibs:Depends}, ${haskell:Depends}, ${misc:Depends}, +Recommends: ${haskell:Recommends}, frown-doc (= ${source:Version}) +Suggests: ${haskell:Suggests}, +Conflicts: ${haskell:Conflicts}, +Provides: ${haskell:Provides}, Multi-Arch: foreign -Description: LALR(k) parser generator for Haskell 98 - Frown is inspired by the parser generator Happy and uses a syntax - quite simular as the syntax used by Happy. Happy only handles LALR(1) - grammars while Frown can use more extensive LALR(k) grammars and the - parsers generated by Frown are also faster than the parsers generated - by Happy. - . - The salient features of Frown are: - - The generated parsers are time and space efficient. On the - downside, the parsers are quite large. - - Frown generates four different types of parsers. As a common - characteristic, the parsers are genuinely functional - (ie 'table-free'); the states of the underlying LR automaton are - encoded as mutually recursive functions. Three output formats use - a typed stack representation, one format due to Ross Paterson - (code=stackless) works even without a stack. - - Encoding states as functions means that each state can be treated - individually as opposed to a table driven-approach, which - necessitates a uniform treatment of states. For instance, - look-ahead is only used when necessary to resolve conflicts. - - Frown comes with debugging and tracing facilities; the standard - output format due to Doaitse Swierstra (code=standard) may be - useful for teaching LR parsing. - - Common grammatical patterns such as repetition of symbols can be - captured using rule schemata. There are several predefined rule - schemata. - - Terminal symbols are arbitrary variable-free Haskell patterns or - guards. Both terminal and nonterminal symbols may have an - arbitrary number of synthesized attributes. - - Frown comes with extensive documentation; several example grammars - are included. - . - Furthermore, Frown supports the use of monadic lexers, monadic - semantic actions, precedences and associativity, the generation of - backtracking parsers, multiple start symbols, error reporting and a - weak form of error correction. +Description: ${haskell:ShortDescription} + ${haskell:LongDescription} Package: frown-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: doc-base -Description: Manual of the frown parser generator for Haskell 98 - The manual and examples of the frown LALR(k) parser generator. - . - Frown is inspired by the parser generator Happy and uses a syntax - quite simular as the syntax used by Happy. Happy only handles LALR(1) - grammars while Frown can use more extensive LALR(k) grammars and the - parsers generated by Frown are also faster than the parsers generated - by Happy. - . - The salient features of Frown are: - - The generated parsers are time and space efficient. On the - downside, the parsers are quite large. - - Frown generates four different types of parsers. As a common - characteristic, the parsers are genuinely functional - (ie 'table-free'); the states of the underlying LR automaton are - encoded as mutually recursive functions. Three output formats use - a typed stack representation, one format due to Ross Paterson - (code=stackless) works even without a stack. - - Encoding states as functions means that each state can be treated - individually as opposed to a table driven-approach, which - necessitates a uniform treatment of states. For instance, - look-ahead is only used when necessary to resolve conflicts. - - Frown comes with debugging and tracing facilities; the standard - output format due to Doaitse Swierstra (code=standard) may be - useful for teaching LR parsing. - - Common grammatical patterns such as repetition of symbols can be - captured using rule schemata. There are several predefined rule - schemata. - - Terminal symbols are arbitrary variable-free Haskell patterns or - guards. Both terminal and nonterminal symbols may have an - arbitrary number of synthesized attributes. - - Frown comes with extensive documentation; several example grammars - are included. - . - Furthermore, Frown supports the use of monadic lexers, monadic - semantic actions, precedences and associativity, the generation of - backtracking parsers, multiple start symbols, error reporting and a - weak form of error correction. +Description: ${haskell:ShortDescription} -- documentation + ${haskell:LongDescription} diff --git a/p/frown/debian/frown-doc.doc-base b/p/frown/debian/frown-doc.doc-base index 0ad6987d8..22847c71e 100644 --- a/p/frown/debian/frown-doc.doc-base +++ b/p/frown/debian/frown-doc.doc-base @@ -10,4 +10,4 @@ Index: /usr/share/doc/frown-doc/html/index.html Files: /usr/share/doc/frown-doc/html/*.html Format: PDF -Files: /usr/share/doc/frown-doc/Manual.pdf +Files: /usr/share/doc/frown-doc/Manual.pdf.gz diff --git a/p/frown/debian/frown-doc.install b/p/frown/debian/frown-doc.install index 3c2a9d506..f895ad53b 100644 --- a/p/frown/debian/frown-doc.install +++ b/p/frown/debian/frown-doc.install @@ -1,4 +1,5 @@ -debian/tmp/usr/share/doc/frown-doc +Manual/Manual.pdf usr/share/doc/frown-doc/ +Manual/html usr/share/doc/frown-doc/ QuickStart usr/share/doc/frown-doc/examples Manual/Examples/*.lg usr/share/doc/frown-doc/examples/manual Manual/Examples/*.lhs usr/share/doc/frown-doc/examples/manual diff --git a/p/frown/debian/frown.haskell-binaries b/p/frown/debian/frown.haskell-binaries new file mode 100644 index 000000000..db02f2fae --- /dev/null +++ b/p/frown/debian/frown.haskell-binaries @@ -0,0 +1 @@ +frown diff --git a/p/frown/debian/frown.install b/p/frown/debian/frown.install deleted file mode 100644 index 451ddc0d8..000000000 --- a/p/frown/debian/frown.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/bin diff --git a/p/frown/debian/frown.lintian-overrides b/p/frown/debian/frown.lintian-overrides new file mode 100644 index 000000000..25d3d4c31 --- /dev/null +++ b/p/frown/debian/frown.lintian-overrides @@ -0,0 +1 @@ +binary-or-shlib-defines-rpath 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 deleted file mode 100755 index 4f455dafc..000000000 --- a/p/frown/debian/patches/02_ignore-hugs-version-in-test-frown +++ /dev/null @@ -1,15 +0,0 @@ -# Description: Ignore Hugs version in TestFrown -# ignore the version header of Hugs in the output of the test cases. -# Author: Arjan Oosting <arjanoosting@home.nl> -diff -urNad frown~/Examples/TestFrown.lhs frown/Examples/TestFrown.lhs ---- frown~/Examples/TestFrown.lhs 2006-01-13 00:09:44.000000000 +0100 -+++ frown/Examples/TestFrown.lhs 2006-09-28 02:06:03.000000000 +0200 -@@ -45,7 +45,7 @@ - > opts' = map ("--" ++) opts - > (s, _) = revBreak (== '.') g - > t = init s --> 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 deleted file mode 100755 index c4c872e59..000000000 --- a/p/frown/debian/patches/03_update-empty.out +++ /dev/null @@ -1,22 +0,0 @@ -# Description: Update Empty.out -# update the Empty example to match the output given by the version of Hugs in -# unstable -# Author: Arjan Oosting <arjanoosting@home.nl> -diff -urNad frown~/Examples/Empty.out frown/Examples/Empty.out ---- frown~/Examples/Empty.out 2005-12-30 00:45:09.000000000 +0100 -+++ frown/Examples/Empty.out 2006-09-28 02:06:39.000000000 +0200 -@@ -3,10 +3,10 @@ - ||___|| ||__|| ||__|| __|| Copyright (c) 1994-2005 - ||---|| ___|| World Wide Web: http://haskell.org/hugs - || || Report bugs to: hugs-bugs@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] -+Type :? for help -+Main> ERROR - Undefined variable "s" -+Main> [Leaving Hugs] diff --git a/p/frown/debian/patches/04_manual-typos b/p/frown/debian/patches/04_manual-typos index 3fe2edd41..9139f22a4 100755..100644 --- a/p/frown/debian/patches/04_manual-typos +++ b/p/frown/debian/patches/04_manual-typos @@ -1,10 +1,11 @@ # Description: Manual typos # add missing backslashes before LaTeX ldots command. # Author: Arjan Oosting <arjanoosting@home.nl> -diff -urNad frown~/Manual/Manual.lhs frown/Manual/Manual.lhs ---- frown~/Manual/Manual.lhs 2005-12-30 00:44:36.000000000 +0100 -+++ frown/Manual/Manual.lhs 2006-09-28 02:06:55.000000000 +0200 -@@ -524,7 +524,7 @@ +Index: frown/Manual/Manual.lhs +=================================================================== +--- frown.orig/Manual/Manual.lhs 2016-02-08 11:17:17.969450404 +0100 ++++ frown/Manual/Manual.lhs 2016-02-08 11:17:17.969450404 +0100 +@@ -523,7 +523,7 @@ source file (@Paren1.lg@\footnote{The source files of the examples are located in the directory @Manual/Examples@.}) defines the language of well-balanced parentheses. The specification of the grammar is @@ -13,7 +14,7 @@ diff -urNad frown~/Manual/Manual.lhs frown/Manual/Manual.lhs contains Haskell source code, that is, a module header and a function declaration. % -@@ -543,7 +543,7 @@ +@@ -542,7 +542,7 @@ By convention, the first nonterminal is also the start symbol of the grammar (this default can be overwritten, see~Sec.~\ref{sec:multiple}). @@ -22,7 +23,7 @@ diff -urNad frown~/Manual/Manual.lhs frown/Manual/Manual.lhs a nonterminal and |v_1|, \ldots, |v_k| are symbols. Note that the symbols are separated by commas and terminated by a semicolon. The mandatory trailing semicolon helps to identify so-called -@@ -817,7 +817,7 @@ +@@ -816,7 +816,7 @@ pure one. It is, however, also possible to provide a monadic action that \emph{computes} the value of the attribute. The computation lives in the underlying parsing monad. Monadic actions are enclosed in `|{% @@ -31,7 +32,7 @@ diff -urNad frown~/Manual/Manual.lhs frown/Manual/Manual.lhs underlying monad and |t| is the type of attributes. As an example, the following variant of the desktop calculator -@@ -1381,7 +1381,7 @@ +@@ -1380,7 +1380,7 @@ < | Ident "then" as "then" < | Ident "else" as "else" < | Ident {String}; @@ -40,7 +41,7 @@ diff -urNad frown~/Manual/Manual.lhs frown/Manual/Manual.lhs Note that keywords are declared just by listing them before the general pattern for identifiers. -@@ -1392,7 +1392,7 @@ +@@ -1391,7 +1391,7 @@ following example. < Terminal = guard { isAlpha } as "alpha" diff --git a/p/frown/debian/patches/06_utf8 b/p/frown/debian/patches/06_utf8 index 497eae3cf..788ca8eca 100644 --- a/p/frown/debian/patches/06_utf8 +++ b/p/frown/debian/patches/06_utf8 @@ -3,114 +3,10 @@ # Bug-Debian: 570868 # Author: Marco Túlio Gontijo e Silva <marcot@debian.org> # Last-Update: 2010-03-05 -diff -Nudar frown~/Atom.lhs frown/Atom.lhs ---- frown~/Atom.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Atom.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Base.lhs frown/Base.lhs ---- frown~/Base.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Base.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Case.lhs frown/Case.lhs ---- frown~/Case.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Case.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Compact.lhs frown/Compact.lhs ---- frown~/Compact.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Compact.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -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 ---- frown~/Convert.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Convert.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/COPYRIGHT frown/COPYRIGHT ---- frown~/COPYRIGHT 2005-12-15 07:09:24.000000000 -0200 -+++ frown/COPYRIGHT 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Examples/Makefile frown/Examples/Makefile ---- frown~/Examples/Makefile 2005-12-15 07:09:23.000000000 -0200 -+++ frown/Examples/Makefile 2010-03-05 21:14:33.000000000 -0300 +Index: frown/Examples/Makefile +=================================================================== +--- frown.orig/Examples/Makefile 2016-02-08 11:17:42.522075091 +0100 ++++ frown/Examples/Makefile 2016-02-08 11:17:42.510074787 +0100 @@ -21,9 +21,9 @@ # Email: Ralf Hinze <ralf@cs.uni-bonn.de> # # Homepage: http://www.informatik.uni-bonn.de/~ralf/ # @@ -124,217 +20,10 @@ diff -Nudar frown~/Examples/Makefile frown/Examples/Makefile # 53117 Bonn, Germany # # # ############################################################################### -diff -Nudar frown~/Future.lhs frown/Future.lhs ---- frown~/Future.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Future.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Generate.lhs frown/Generate.lhs ---- frown~/Generate.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Generate.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/GParser2.lg frown/GParser2.lg ---- frown~/GParser2.lg 2005-12-15 07:09:24.000000000 -0200 -+++ frown/GParser2.lg 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/GParser.lg frown/GParser.lg ---- frown~/GParser.lg 2005-12-15 07:09:24.000000000 -0200 -+++ frown/GParser.lg 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Grammar.lhs frown/Grammar.lhs ---- frown~/Grammar.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Grammar.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/GVStack.lhs frown/GVStack.lhs ---- frown~/GVStack.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/GVStack.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Haskell.lhs frown/Haskell.lhs ---- frown~/Haskell.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Haskell.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Lexer2.lhs frown/Lexer2.lhs ---- frown~/Lexer2.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Lexer2.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Lexer.lhs frown/Lexer.lhs ---- frown~/Lexer.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Lexer.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Lib/MergeSort.lhs frown/Lib/MergeSort.lhs ---- frown~/Lib/MergeSort.lhs 2005-12-15 07:09:23.000000000 -0200 -+++ frown/Lib/MergeSort.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Lib/OrdUniqListFM.lhs frown/Lib/OrdUniqListFM.lhs ---- frown~/Lib/OrdUniqListFM.lhs 2005-12-15 07:09:23.000000000 -0200 -+++ frown/Lib/OrdUniqListFM.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Lib/OrdUniqList.lhs frown/Lib/OrdUniqList.lhs ---- frown~/Lib/OrdUniqList.lhs 2005-12-15 07:09:23.000000000 -0200 -+++ frown/Lib/OrdUniqList.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Lib/OrdUniqListSet.lhs frown/Lib/OrdUniqListSet.lhs ---- frown~/Lib/OrdUniqListSet.lhs 2005-12-15 07:09:23.000000000 -0200 -+++ frown/Lib/OrdUniqListSet.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Lib/Prettier.lhs frown/Lib/Prettier.lhs ---- frown~/Lib/Prettier.lhs 2005-12-15 07:09:23.000000000 -0200 -+++ frown/Lib/Prettier.lhs 2010-03-05 21:14:33.000000000 -0300 +Index: frown/Lib/MergeSort.lhs +=================================================================== +--- frown.orig/Lib/MergeSort.lhs 2016-02-08 11:17:42.522075091 +0100 ++++ frown/Lib/MergeSort.lhs 2016-02-08 11:17:42.514074888 +0100 @@ -21,9 +21,9 @@ % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % @@ -348,9 +37,10 @@ diff -Nudar frown~/Lib/Prettier.lhs frown/Lib/Prettier.lhs % 53117 Bonn, Germany % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Lib/Uniq.lhs frown/Lib/Uniq.lhs ---- frown~/Lib/Uniq.lhs 2005-12-15 07:09:23.000000000 -0200 -+++ frown/Lib/Uniq.lhs 2010-03-05 21:14:33.000000000 -0300 +Index: frown/Lib/OrdUniqListFM.lhs +=================================================================== +--- frown.orig/Lib/OrdUniqListFM.lhs 2016-02-08 11:17:42.522075091 +0100 ++++ frown/Lib/OrdUniqListFM.lhs 2016-02-08 11:18:13.950869227 +0100 @@ -21,9 +21,9 @@ % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % @@ -364,9 +54,10 @@ diff -Nudar frown~/Lib/Uniq.lhs frown/Lib/Uniq.lhs % 53117 Bonn, Germany % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Lookahead.lhs frown/Lookahead.lhs ---- frown~/Lookahead.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Lookahead.lhs 2010-03-05 21:14:33.000000000 -0300 +Index: frown/Lib/OrdUniqList.lhs +=================================================================== +--- frown.orig/Lib/OrdUniqList.lhs 2016-02-08 11:17:42.522075091 +0100 ++++ frown/Lib/OrdUniqList.lhs 2016-02-08 11:17:42.514074888 +0100 @@ -21,9 +21,9 @@ % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % @@ -380,9 +71,10 @@ diff -Nudar frown~/Lookahead.lhs frown/Lookahead.lhs % 53117 Bonn, Germany % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/LR0.lhs frown/LR0.lhs ---- frown~/LR0.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/LR0.lhs 2010-03-05 21:14:33.000000000 -0300 +Index: frown/Lib/OrdUniqListSet.lhs +=================================================================== +--- frown.orig/Lib/OrdUniqListSet.lhs 2016-02-08 11:17:42.522075091 +0100 ++++ frown/Lib/OrdUniqListSet.lhs 2016-02-08 11:18:13.922868522 +0100 @@ -21,9 +21,9 @@ % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % @@ -396,9 +88,10 @@ diff -Nudar frown~/LR0.lhs frown/LR0.lhs % 53117 Bonn, Germany % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Main.lhs frown/Main.lhs ---- frown~/Main.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Main.lhs 2010-03-05 21:14:33.000000000 -0300 +Index: frown/Lib/Prettier.lhs +=================================================================== +--- frown.orig/Lib/Prettier.lhs 2016-02-08 11:17:42.522075091 +0100 ++++ frown/Lib/Prettier.lhs 2016-02-08 11:17:42.514074888 +0100 @@ -21,9 +21,9 @@ % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % @@ -412,50 +105,10 @@ diff -Nudar frown~/Main.lhs frown/Main.lhs % 53117 Bonn, Germany % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -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 -+++ frown/Makefile 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - # Email: Ralf Hinze <ralf@cs.uni-bonn.de> # - # Homepage: http://www.informatik.uni-bonn.de/~ralf/ # - # Paper mail: Dr. Ralf Hinze # --# Institut für Informatik III # --# Universität Bonn # --# Römerstraße 164 # -+# Institut für Informatik III # -+# Universität Bonn # -+# Römerstraße 164 # - # 53117 Bonn, Germany # - # # - ############################################################################### -diff -Nudar frown~/Makefile.dist frown/Makefile.dist ---- frown~/Makefile.dist 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Makefile.dist 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - # Email: Ralf Hinze <ralf@cs.uni-bonn.de> # - # Homepage: http://www.informatik.uni-bonn.de/~ralf/ # - # Paper mail: Dr. Ralf Hinze # --# Institut für Informatik III # --# Universität Bonn # --# Römerstraße 164 # -+# Institut für Informatik III # -+# Universität Bonn # -+# Römerstraße 164 # - # 53117 Bonn, Germany # - # # - ############################################################################### -diff -Nudar frown~/Manual/GParser2.lg frown/Manual/GParser2.lg ---- frown~/Manual/GParser2.lg 2005-12-15 07:09:22.000000000 -0200 -+++ frown/Manual/GParser2.lg 2010-03-05 21:14:33.000000000 -0300 +Index: frown/Lib/Uniq.lhs +=================================================================== +--- frown.orig/Lib/Uniq.lhs 2016-02-08 11:17:42.522075091 +0100 ++++ frown/Lib/Uniq.lhs 2016-02-08 11:17:42.514074888 +0100 @@ -21,9 +21,9 @@ % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % @@ -469,24 +122,10 @@ diff -Nudar frown~/Manual/GParser2.lg frown/Manual/GParser2.lg % 53117 Bonn, Germany % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ---- frown~/Manual/Makefile 2005-12-15 07:09:22.000000000 -0200 -+++ frown/Manual/Makefile 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - # Email: Ralf Hinze <ralf@cs.uni-bonn.de> # - # Homepage: http://www.informatik.uni-bonn.de/~ralf/ # - # Paper mail: Dr. Ralf Hinze # --# Institut für Informatik III # --# Universität Bonn # --# Römerstraße 164 # -+# Institut für Informatik III # -+# Universität Bonn # -+# Römerstraße 164 # - # 53117 Bonn, Germany # - # # - ############################################################################### -diff -Nudar frown~/Manual/Manual.bib frown/Manual/Manual.bib ---- frown~/Manual/Manual.bib 2005-12-15 07:09:22.000000000 -0200 -+++ frown/Manual/Manual.bib 2010-03-05 21:14:33.000000000 -0300 +Index: frown/Manual/Manual.bib +=================================================================== +--- frown.orig/Manual/Manual.bib 2016-02-08 11:17:42.522075091 +0100 ++++ frown/Manual/Manual.bib 2016-02-08 11:17:42.518074989 +0100 @@ -188,7 +188,7 @@ } @@ -562,203 +201,22 @@ diff -Nudar frown~/Manual/Manual.bib frown/Manual/Manual.bib month = sep, number = 1690, pages = {55--72}, -diff -Nudar frown~/Manual/Manual.fmt frown/Manual/Manual.fmt ---- frown~/Manual/Manual.fmt 2005-12-15 07:09:22.000000000 -0200 -+++ frown/Manual/Manual.fmt 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Manual/Manual.lhs frown/Manual/Manual.lhs ---- frown~/Manual/Manual.lhs 2005-12-15 07:09:22.000000000 -0200 -+++ frown/Manual/Manual.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -33,7 +33,7 @@ +Index: frown/Manual/Manual.lhs +=================================================================== +--- frown.orig/Manual/Manual.lhs 2016-02-08 11:17:29.697749287 +0100 ++++ frown/Manual/Manual.lhs 2016-02-08 11:18:58.895994838 +0100 +@@ -32,6 +32,7 @@ + \documentclass[a4paper,fleqn]{report} - \usepackage{a4wide} --\usepackage[latin1]{inputenc} +\usepackage[utf8]{inputenc} + \usepackage{a4wide} \usepackage{graphicx} \usepackage{calc} - \usepackage{ulem}\normalem -@@ -103,9 +103,9 @@ - - \author - {RALF HINZE --\\Institut für Informatik III --\\Universität Bonn --\\Römerstraße 164 -+\\Institut für Informatik III -+\\Universität Bonn -+\\Römerstraße 164 - \\53117 Bonn - \\Germany - \\\texttt{ralf\symbol{64}cs.uni-bonn.de} -@@ -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. +@@ -1781,4 +1782,4 @@ + \includegraphics{Pics/tuberling.ps} + \end{center} - %================================ ============================================ -diff -Nudar frown~/Optimize.lhs frown/Optimize.lhs ---- frown~/Optimize.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Optimize.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Options.lhs frown/Options.lhs ---- frown~/Options.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Options.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Quote.lhs frown/Quote.lhs ---- frown~/Quote.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Quote.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/SearchTree.lhs frown/SearchTree.lhs ---- frown~/SearchTree.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/SearchTree.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Stackless.lhs frown/Stackless.lhs ---- frown~/Stackless.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Stackless.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Standard.lhs frown/Standard.lhs ---- frown~/Standard.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Standard.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -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 ---- frown~/Stdenv.lg 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Stdenv.lg 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -Nudar frown~/Stdenv.lhs frown/Stdenv.lhs ---- frown~/Stdenv.lhs 2005-12-15 07:09:24.000000000 -0200 -+++ frown/Stdenv.lhs 2010-03-05 21:14:33.000000000 -0300 -@@ -21,9 +21,9 @@ - % Email: Ralf Hinze <ralf@cs.uni-bonn.de> % - % Homepage: http://www.informatik.uni-bonn.de/~ralf/ % - % Paper mail: Dr. Ralf Hinze % --% Institut für Informatik III % --% Universität Bonn % --% Römerstraße 164 % -+% Institut für Informatik III % -+% Universität Bonn % -+% Römerstraße 164 % - % 53117 Bonn, Germany % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +-\end{document} +\ No newline at end of file ++\end{document} diff --git a/p/frown/debian/patches/07_no-n-plus-k-pattern b/p/frown/debian/patches/07_no-n-plus-k-pattern deleted file mode 100644 index d41ac05ed..000000000 --- a/p/frown/debian/patches/07_no-n-plus-k-pattern +++ /dev/null @@ -1,80 +0,0 @@ -Index: frown-0.6.1/SearchTree.lhs -=================================================================== ---- frown-0.6.1.orig/SearchTree.lhs 2011-06-02 20:28:02.000000000 +0200 -+++ frown-0.6.1/SearchTree.lhs 2011-06-02 20:28:43.000000000 +0200 -@@ -60,10 +60,10 @@ - > fromOrdList avs = fst (build (Prelude.length avs) avs) - > where - > build 0 x = (Leaf, x) --> build (n + 1) x = (Node l a v r, z) --> where m = n `div` 2 -+> build n x = (Node l a v r, z) -+> where m = (n-1) `div` 2 - > (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 -+> unsafeLookup fm a = fromMaybe (error ("unsafeLookup: key not found: " ++ show a)) (lookup fm a) -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 -=================================================================== ---- frown-0.6.1.orig/Lexer2.lhs 2011-06-02 20:30:37.000000000 +0200 -+++ frown-0.6.1/Lexer2.lhs 2011-06-02 20:30:59.000000000 +0200 -@@ -139,7 +139,7 @@ - > nested :: Int -> String -> (String, String) - > nested _ [] = ([], []) - > nested 0 ('-' : '}' : s) = ([], '-':'}':s) --> nested (n+1) ('-' : '}' : s) = '-' <| '}' <| nested n s -+> 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` "_'" -\ No newline at end of file -+> isIdChar c = isAlphaNum c || c `elem` "_'" -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 deleted file mode 100644 index 94b654090..000000000 --- a/p/frown/debian/patches/ghc-7.4.1-compat +++ /dev/null @@ -1,393 +0,0 @@ -Index: frown-0.6.1/Main.lhs -=================================================================== ---- frown-0.6.1.orig/Main.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Main.lhs 2012-03-15 14:21:07.000000000 +0100 -@@ -53,11 +53,12 @@ - > import Prettier hiding ( string, concat ) - > import qualified Prettier as PP - > import qualified SearchTree as ST --> import Monad ( when ) --> import Directory --> import IO --> import System -+> import Control.Monad ( when ) -+> import System.Directory -+> import System.IO - > 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|. -Index: frown-0.6.1/Base.lhs -=================================================================== ---- frown-0.6.1.orig/Base.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Base.lhs 2012-03-15 14:20:13.000000000 +0100 -@@ -36,9 +36,9 @@ - > where - > - > import Prettier --> import Monad ( MonadPlus(..) ) --> import IO --> import System -+> import Control.Monad ( MonadPlus(..) ) -+> import System.Exit -+> import System.IO - - %------------------------------------------------------------------------------- - \subsection{List utilities} -Index: frown-0.6.1/Case.lhs -=================================================================== ---- frown-0.6.1.orig/Case.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Case.lhs 2012-03-15 14:16:03.000000000 +0100 -@@ -45,10 +45,10 @@ - > import MergeSort - > import Base - > import Options --> import Maybe --> import IO --> import Monad --> import List ( partition ) -+> import Data.Maybe -+> import System.IO -+> import Control.Monad -+> import Data.List ( partition ) - > import Prelude hiding ( lookup ) - - %-------------------------------= -------------------------------------------- -@@ -347,4 +347,4 @@ - > actions' :: Symbol -> Past -> Past - > actions' x (Node es ts) = Node [ a{ future = f } | a <- es - > , Just f <- [lookup (future a) x] ] --> [ (e, actions' x t) | (e, t) <- ts ] -\ No newline at end of file -+> [ (e, actions' x t) | (e, t) <- ts ] -Index: frown-0.6.1/Compact.lhs -=================================================================== ---- frown-0.6.1.orig/Compact.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Compact.lhs 2012-03-15 14:19:05.000000000 +0100 -@@ -49,9 +49,9 @@ - > import Base - > import Generate - > import MergeSort --> import Char --> import IO --> import Maybe -+> import Data.Char -+> 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) -\ No newline at end of file -+> wrap_con s = con (wrap s) -Index: frown-0.6.1/Convert.lhs -=================================================================== ---- frown-0.6.1.orig/Convert.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Convert.lhs 2012-03-15 14:16:45.000000000 +0100 -@@ -42,13 +42,13 @@ - > import OrdUniqListSet ( Set, MinView(Empty, Min) ) -- for nhc98 - > import Atom hiding ( string ) - > import Haskell hiding ( Empty, Decl, guard ) --> import Maybe --> import List -+> import Data.Maybe -+> import Data.List - > import Base - > import Prettier hiding ( concat, intersperse ) - > import qualified Prettier as PP --> import Monad --> import IO hiding ( isEOF ) -+> import Control.Monad -+> import System.IO hiding ( isEOF ) - > import Options - - > newEOF :: Ident -@@ -361,4 +361,4 @@ - > | terminal w = w - > | otherwise = case lookup w bindings of - > Just w' -> w' { attributes = attributes w } --> Nothing -> updateArgs w (map substitute (arguments w)) -\ No newline at end of file -+> Nothing -> updateArgs w (map substitute (arguments w)) -Index: frown-0.6.1/GParser2.hs -=================================================================== ---- frown-0.6.1.orig/GParser2.hs 2005-12-15 10:09:24.000000000 +0100 -+++ frown-0.6.1/GParser2.hs 2012-03-15 14:20:37.000000000 +0100 -@@ -47,9 +47,9 @@ - import qualified Base - import Prettier ( Pretty ) - import Options -- import Char -- import List -- import IO -+ 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 -+ run parser inp = unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp)) -Index: frown-0.6.1/GParser2.lg -=================================================================== ---- frown-0.6.1.orig/GParser2.lg 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/GParser2.lg 2012-03-15 14:18:08.000000000 +0100 -@@ -47,9 +47,9 @@ - > import qualified Base - > import Prettier ( Pretty ) - > import Options --> import Char --> import List --> import IO -+> import Data.Char -+> import Data.List -+> import System.IO - - % - - - - - - - - - - - - - - - = - - - - - - - - - - - - - - - - - - - - - - - - \subsection{Abstract syntax} -@@ -481,4 +481,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 -+> run parser inp = unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp)) -Index: frown-0.6.1/GVStack.lhs -=================================================================== ---- frown-0.6.1.orig/GVStack.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/GVStack.lhs 2012-03-15 14:18:51.000000000 +0100 -@@ -45,10 +45,10 @@ - > import Options - > import Base - > import Generate --> import IO --> import Monad --> import Char --> import List ( maximumBy ) -+> import System.IO -+> import Control.Monad -+> import Data.Char -+> import Data.List ( maximumBy ) - > import Prelude hiding ( lookup ) - - %-------------------------------= -------------------------------------------- -Index: frown-0.6.1/Generate.lhs -=================================================================== ---- frown-0.6.1.orig/Generate.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Generate.lhs 2012-03-15 14:12:58.000000000 +0100 -@@ -43,7 +43,7 @@ - > import OrdUniqListSet ( Set ) - > import Base - > --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 -+++ frown-0.6.1/Haskell.lhs 2012-03-15 14:14:23.000000000 +0100 -@@ -35,7 +35,7 @@ - > import Atom hiding ( string ) - > import qualified Atom - > import Prettier --> import Char -+> import Data.Char - > import Prelude hiding ( concat ) - - %-------------------------------= -------------------------------------------- -Index: frown-0.6.1/LR0.lhs -=================================================================== ---- frown-0.6.1.orig/LR0.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/LR0.lhs 2012-03-15 14:13:48.000000000 +0100 -@@ -45,7 +45,7 @@ - > import Base hiding ( list ) - > import qualified Base - > import Prelude hiding ( null ) --> 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 -+> errorState = State 0 (Set.empty :\/ Set.empty) -Index: frown-0.6.1/Lexer2.lhs -=================================================================== ---- frown-0.6.1.orig/Lexer2.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Lexer2.lhs 2012-03-15 14:14:43.000000000 +0100 -@@ -35,9 +35,9 @@ - > module Lexer2 - > where - > import Prelude --> import Char --> import IO --> import Monad -+> import Data.Char -+> import System.IO -+> 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 -+++ frown-0.6.1/Lib/OrdUniqListFM.lhs 2012-03-15 14:14:08.000000000 +0100 -@@ -64,8 +64,8 @@ - > import qualified OrdUniqList as OUL - > import MergeSort ( mergeSort ) - > import Prettier hiding ( empty ) --> import qualified List --> 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 -+ prefixLookup (FM f) s = [ b | Assoc b@(a, _)<-f, s `isPrefixOf` a ] -Index: frown-0.6.1/Lib/OrdUniqListSet.lhs -=================================================================== ---- frown-0.6.1.orig/Lib/OrdUniqListSet.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Lib/OrdUniqListSet.lhs 2012-03-15 14:19:55.000000000 +0100 -@@ -59,8 +59,8 @@ - > import qualified Prelude - > import qualified OrdUniqList as OUL - > import Prettier hiding ( empty ) --> import qualified List --> import Monad -+> import qualified Data.List as List -+> import Control.Monad - - %------------------------------------------------------------------------------- - \subsection{Type definitions and instance declarations} -Index: frown-0.6.1/Lookahead.lhs -=================================================================== ---- frown-0.6.1.orig/Lookahead.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Lookahead.lhs 2012-03-15 14:16:21.000000000 +0100 -@@ -42,9 +42,9 @@ - > import qualified Prettier as PP - > import Base - > import Options --> import IO --> import Maybe --> import Monad ( when ) -+> import System.IO -+> import Data.Maybe -+> import Control.Monad ( when ) - - %-------------------------------= -------------------------------------------- - \section{Grouping of actions} -Index: frown-0.6.1/Options.lhs -=================================================================== ---- frown-0.6.1.orig/Options.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Options.lhs 2012-03-15 14:12:01.000000000 +0100 -@@ -33,8 +33,8 @@ - > where - > import Base - > import System.Console.GetOpt --> import Char --> 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 -+> s << t = map toLower s `isPrefix` map toLower t -Index: frown-0.6.1/SearchTree.lhs -=================================================================== ---- frown-0.6.1.orig/SearchTree.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/SearchTree.lhs 2012-03-15 14:11:29.000000000 +0100 -@@ -32,7 +32,7 @@ - > , length, lookup, unsafeLookup ) - > where - > import MergeSort ( mergeSortBy ) --> import Maybe ( fromMaybe ) -+> 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 -+++ frown-0.6.1/Stackless.lhs 2012-03-15 14:12:44.000000000 +0100 -@@ -47,10 +47,10 @@ - > import Base - > import Generate - > import MergeSort --> import Char --> import Maybe --> import IO --> import Monad -+> import Data.Char -+> import Data.Maybe -+> 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) -\ No newline at end of file -+> wrap_con s = con (wrap s) -Index: frown-0.6.1/Standard.lhs -=================================================================== ---- frown-0.6.1.orig/Standard.lhs 2012-03-15 13:09:04.000000000 +0100 -+++ frown-0.6.1/Standard.lhs 2012-03-15 14:19:39.000000000 +0100 -@@ -47,9 +47,9 @@ - > import Options - > import Base - > import Generate --> import Char --> import IO --> import Maybe -+> import Data.Char -+> 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) -\ No newline at end of file -+> wrap_con s = con (wrap s) diff --git a/p/frown/debian/patches/series b/p/frown/debian/patches/series index 182244225..20a067d26 100644 --- a/p/frown/debian/patches/series +++ b/p/frown/debian/patches/series @@ -1,8 +1,4 @@ 01_imagen-creates-png-files -02_ignore-hugs-version-in-test-frown -03_update-empty.out 04_manual-typos 05_only-build-pdf 06_utf8 -07_no-n-plus-k-pattern -ghc-7.4.1-compat diff --git a/p/frown/debian/rules b/p/frown/debian/rules index 8c89f7248..2d7f8dd61 100755 --- a/p/frown/debian/rules +++ b/p/frown/debian/rules @@ -1,34 +1,22 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/makefile.mk +DEB_CABAL_PACKAGE = frown +DEB_DEFAULT_COMPILER = ghc + include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/hlibrary.mk -DEB_COMPRESS_EXCLUDE = .pdf -DEB_MAKE_BUILD_TARGET = frown man -DEB_MAKE_INSTALL_TARGET = install PREFIX="$(DEB_DESTDIR)usr" doc="$(DEB_DESTDIR)usr/share/doc/frown-doc" -DEB_MAKE_CLEAN_TARGET = distclean -# DEB_MAKE_CHECK_TARGET = test +build/frown:: build-ghc-stamp clean:: - dh_testdir - rm -f Manual/Manual.pdf Manual/Manual.ps Manual/Manual.dvi Manual/Manual.tex - rm -rf Manual/html Manual/Manual[0-9]*.png Manual/*_motif.gif - -common-install-prehook-arch:: - dh_testdir - mkdir -p debian/tmp/usr/bin + make -C Manual clean + rm -rf Manual/html -common-install-prehook-indep:: - dh_testdir - mkdir -p debian/tmp/usr/bin +build/frown-doc:: + make -C Manual -binary-post-install/frown:: - dh_testdir - rm debian/frown/usr/share/doc/frown/README +binary-fixup/frown-doc:: + chmod -R a-x debian/frown-doc/usr/share/doc/frown-doc/examples + chmod -R a+X debian/frown-doc/usr/share/doc/frown-doc/examples -binary-post-install/frown-doc:: - rm debian/frown-doc/usr/share/doc/frown-doc/README - rm debian/frown-doc/usr/share/doc/frown-doc/examples/manual/Sessions.lhs - rm debian/frown-doc/usr/share/doc/frown-doc/examples/manual/TestFrown.lhs -.PHONY: update-debian-control diff --git a/p/frown/debian/watch b/p/frown/debian/watch index 0b24c8f9a..43e97925d 100644 --- a/p/frown/debian/watch +++ b/p/frown/debian/watch @@ -1 +1,2 @@ -# IGNORE: dead upstream +version=3 +http://hackage.haskell.org/package/frown/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) |