Bump frown

5 files changed, 13 insertions, 246 deletions

diff --git a/p/frown/debian/changelog b/p/frown/debian/changelog
index c1cb0e9df..86b6255a4 100644
--- a/p/frown/debian/changelog
+++ b/p/frown/debian/changelog
@@ -1,3 +1,9 @@
+frown (0.6.2.3-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Joachim Breitner <nomeata@debian.org>  Wed, 16 Mar 2016 10:52:50 +0100
+
 frown (0.6.2.2-1) experimental; urgency=medium
 
   * Upgrade to hackage release of frown.
diff --git a/p/frown/debian/patches/01_imagen-creates-png-files b/p/frown/debian/patches/01_imagen-creates-png-files
deleted file mode 100755
index f5a04dbf1..000000000
--- a/p/frown/debian/patches/01_imagen-creates-png-files
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description: imagen create png files
-#  imagen generates png files instead of gif files on a Debian system.
-# Author: Arjan Oosting <arjanoosting@home.nl>
-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
--	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
diff --git a/p/frown/debian/patches/04_manual-typos b/p/frown/debian/patches/04_manual-typos
index 9139f22a4..94ef4958d 100644
--- a/p/frown/debian/patches/04_manual-typos
+++ b/p/frown/debian/patches/04_manual-typos
@@ -3,9 +3,9 @@
 # Author: Arjan Oosting <arjanoosting@home.nl>
 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 @@
+--- frown.orig/Manual/Manual.lhs	2016-03-16 10:53:09.063338333 +0100
++++ frown/Manual/Manual.lhs	2016-03-16 10:53:09.059338339 +0100
+@@ -524,7 +524,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
@@ -14,7 +14,7 @@ Index: frown/Manual/Manual.lhs
  contains Haskell source code, that is, a module header and a function
  declaration.
  %
-@@ -542,7 +542,7 @@
+@@ -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}).
  
@@ -23,7 +23,7 @@ Index: 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
-@@ -816,7 +816,7 @@
+@@ -817,7 +817,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 `|{%
@@ -32,7 +32,7 @@ Index: frown/Manual/Manual.lhs
  underlying monad and |t| is the type of attributes.
  
  As an example, the following variant of the desktop calculator
-@@ -1380,7 +1380,7 @@
+@@ -1381,7 +1381,7 @@
  <                               |  Ident "then"  as "then"
  <                               |  Ident "else"  as "else"
  <                               |  Ident {String};
@@ -41,7 +41,7 @@ Index: frown/Manual/Manual.lhs
  
  Note that keywords are declared just by listing them before the
  general pattern for identifiers.
-@@ -1391,7 +1391,7 @@
+@@ -1392,7 +1392,7 @@
  following example.
  
  < Terminal                      =  guard { isAlpha } as "alpha"
diff --git a/p/frown/debian/patches/06_utf8 b/p/frown/debian/patches/06_utf8
deleted file mode 100644
index 788ca8eca..000000000
--- a/p/frown/debian/patches/06_utf8
+++ /dev/null
@@ -1,222 +0,0 @@
-# Description: Use UTF-8 encoding
-#  GHC 6.12.1 can't read a file with iso-8859-1 encoding.
-# Bug-Debian: 570868
-# Author: Marco Túlio Gontijo e Silva <marcot@debian.org>
-# Last-Update: 2010-03-05
-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/                      #
- #   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                                           #
- #                                                                             #
- ###############################################################################
-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/                      %
- %   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                                           %
- %                                                                             %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-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/                      %
- %   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                                           %
- %                                                                             %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-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/                      %
- %   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                                           %
- %                                                                             %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-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/                      %
- %   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                                           %
- %                                                                             %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-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/                      %
- %   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                                           %
- %                                                                             %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-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/                      %
- %   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                                           %
- %                                                                             %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-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 @@
- }
- 
- @inproceedings{AlP01Gen,
--    address   = {Älvsjö, Sweden},
-+    address   = {Älvsjö, Sweden},
-     author    = {Artem Alimarine and Rinus Plasmeijer},
-     booktitle = {Proceedings of the 13th International workshop on the Implementation of Functional Languages, IFL'01},
-     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},
-     institution = {World Wide Web Consortium},
-     month     = apr,
-     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},
-     institution = {Universiteit Utrecht},
-     month     = nov,
-     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},
-     booktitle = {Proceedings of the IFIP TC2 Working Conference on Generic Programming, Schloss Dagstuhl},
-     editor    = {Gibbons, Jeremy and Jeuring, Johan},
-     month     = jul,
-@@ -5619,7 +5619,7 @@
- }
- 
- @techreport{LoJ05Gen,
--    author    = {Löh, Andres and Jeuring, Johan},
-+    author    = {Löh, Andres and Jeuring, Johan},
-     institution = {Universiteit Utrecht},
-     month     = jan,
-     number    = {UU-CS-2005-004},
-@@ -5628,7 +5628,7 @@
- }
- 
- @phdthesis{Loe04Gen,
--    author    = {Löh, Andres},
-+    author    = {Löh, Andres},
-     school    = {Utrecht University},
-     title     = {Exploring Generic Haskell},
-     year      = {2004}
-@@ -6524,7 +6524,7 @@
- @inproceedings{NoJ03Pol,
-     author    = {Norell, Ulf and Jansson, Patrik},
-     booktitle = {Implementation of Functional Languages: 15th International Workshop, IFL 2003, Edinburgh, UK, September 8-11, 2003},
--    editor    = {Trinder, Phil and Michaelson, Greg and Peña, Ricardo},
-+    editor    = {Trinder, Phil and Michaelson, Greg and Peña, Ricardo},
-     month     = sep,
-     pages     = {168--184},
-     title     = {Polytypic Programming in {Haskell}},
-@@ -6888,9 +6888,9 @@
- }
- 
- @inproceedings{PR:99,
--    author    = {Pfeifer, Holger and Rueß, Harald},
-+    author    = {Pfeifer, Holger and Rueß, Harald},
-     booktitle = {Proc. 12th Intl. Conf. on Theorem Proving in Higher Order Logics},
--    editor    = {Bertot, Y. and Dowek, G. and Hirschowitz, A. and Paulin, C. and Théry, L.},
-+    editor    = {Bertot, Y. and Dowek, G. and Hirschowitz, A. and Paulin, C. and Théry, L.},
-     month     = sep,
-     number    = 1690,
-     pages     = {55--72},
-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[utf8]{inputenc}
- \usepackage{a4wide}
- \usepackage{graphicx}
- \usepackage{calc}
-@@ -1781,4 +1782,4 @@
- \includegraphics{Pics/tuberling.ps}
- \end{center}
- 
--\end{document}
-\ No newline at end of file
-+\end{document}
diff --git a/p/frown/debian/patches/series b/p/frown/debian/patches/series
index 20a067d26..1942992e6 100644
--- a/p/frown/debian/patches/series
+++ b/p/frown/debian/patches/series
@@ -1,4 +1,2 @@
-01_imagen-creates-png-files
 04_manual-typos
 05_only-build-pdf
-06_utf8