Commit 79f1ca57 authored by Joachim Breitner's avatar Joachim Breitner

Merge branch 'master' of alioth.debian.org:/git/pkg-haskell/DHG_packages

parents c967a0b4 a64a2bc0
frown (0.6.2.3-2) UNRELEASED; urgency=medium
frown (0.6.2.3-2) unstable; urgency=medium
[ Dmitry Bogatov ]
* Use secure (https) uri in Vcs-Git field in 'debian/control'
* Bump standards version to 3.9.8 (no changes needed)
* Convert `debian/copyright' to dep5 format
-- Dmitry Bogatov <KAction@gnu.org> Tue, 10 May 2016 09:34:42 +0300
[ Ilias Tsitsimpis ]
* Propagate the changes from experimental (0.6.2.3-1) to unstable
* Drop the 04_manual-typos patch.
The above patch produces the wrong output by trying to add
backslashes where they are not needed.
* Disable dbgsym generation.
GHC cannot produce debugging symbols, so the dbgsym package ends
up being empty.
* Add patch 'fix-pdf-generation'.
Due to an error in the way Makefile produces the doc files, the
Manual.pdf file was not generated correctly. This has been fixed
by patching the Makefile.
* Update d/copyright file with missing copyright notices.
Some files under 'Examples/Haskell' directory are distributed under
the Glasgow Haskell Compiler License.
-- Ilias Tsitsimpis <i.tsitsimpis@gmail.com> Sun, 22 May 2016 14:40:46 +0300
frown (0.6.2.3-1) experimental; urgency=medium
......
......@@ -7,6 +7,14 @@ Files: *
Copyright: 2001-2005 Ralf Hinze
License: GPL-2+
Files: Examples/Haskell/HsLexer.lhs
Examples/Haskell/HsParseMonad.lhs
Examples/Haskell/HsPretty.lhs
Examples/Haskell/HsParseUtils.lhs
Examples/Haskell/HsSyn.lhs
Copyright: 1997-2000 The GHC Team
License: GHC-License
Files: debian/*
Copyright: held by the contributors mentioned in debian/changelog
License: GPL-2+
......@@ -27,3 +35,34 @@ License: GPL-2+
.
On Debian system, copy of GNU Lesser General Public License version 2
is also located at `/usr/share/common-licenses/GPL-2'
License: GHC-License
The Glasgow Haskell Compiler License
.
Copyright 2004, The University Court of the University of Glasgow.
.
All rights reserved.
.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. Neither name of the University nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW
AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY COURT OF
THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Description: Manual typos
# add missing backslashes before LaTeX ldots command.
# Author: Arjan Oosting <arjanoosting@home.nl>
Index: frown/Manual/Manual.lhs
===================================================================
--- 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
-enclosed in special curly braces `|%{ ldots }%|'. The remainder
+enclosed in special curly braces `|%{ \ldots }%|'. The remainder
contains Haskell source code, that is, a module header and a function
declaration.
%
@@ -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
symbols are separated by commas and terminated by a semicolon. The
mandatory trailing semicolon helps to identify so-called
@@ -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 `|{%
-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"
< | Ident "else" as "else"
< | 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
File mode changed from 100755 to 100644
Description: Do not override the Manual.dvi file
When generating the html pages, the Manual.dvi file gets overwritten
meaning that the next time make will be run, the Manual.pdf file will
be generated again. In addition, since this dvi file has now been
produced using different flags for the lhs2Tex program, the result
is different from the expected one. Fix that by making the html
target depend on the Manual.dvi one and not rebuilting that file.
Author: Ilias Tsitsimpis <i.tsitsimpis@gmail.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: b/Manual/Makefile
===================================================================
--- a/Manual/Makefile
+++ b/Manual/Makefile
@@ -102,14 +102,7 @@ gv : $(file).ps
acro : $(file).pdf
/opt/Acrobat7/acroread $(file).pdf &
-html: $(file).lhs $(file).fmt $(sessions)
- lhs2TeX --math $(file).lhs > $(file).tex
- latex $(file)
- bibtex $(file)
- latex $(file)
- latex $(file)
- latex $(file)
-# the above commands are only used to produce a `.bbl' file
+html: $(file).lhs $(file).fmt $(file).dvi $(sessions)
lhs2TeX --tt -lhtml=True $(file).lhs > $(file).tex
hevea -fix $(file).tex
hevea -fix $(file).tex
04_manual-typos
05_only-build-pdf
fix-pdf-generation
......@@ -3,6 +3,10 @@
DEB_CABAL_PACKAGE = frown
DEB_DEFAULT_COMPILER = ghc
# GHC cannot produce debugging symbols so the dbgsym package
# ends up being empty, so disable generating it.
DEB_DH_STRIP_ARGS := --no-automatic-dbgsym
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
......@@ -18,5 +22,3 @@ build/frown-doc::
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment