[Pkg-ocaml-maint-commits] r1018 - in packages/hevea/experimental/debian: . patches
Ralf Treinen
treinen@costa.debian.org
Sun, 20 Mar 2005 20:55:35 +0100
Author: treinen
Date: 2005-03-20 20:55:34 +0100 (Sun, 20 Mar 2005)
New Revision: 1018
Removed:
packages/hevea/experimental/debian/patches/01_imagen_typo.dpatch
packages/hevea/experimental/debian/patches/04_rawtext.dpatch
packages/hevea/experimental/debian/patches/05_license.dpatch
Modified:
packages/hevea/experimental/debian/changelog
packages/hevea/experimental/debian/patches/00list
packages/hevea/experimental/debian/rules
Log:
changes for hevea 1.07.beta.2005.03.07
Modified: packages/hevea/experimental/debian/changelog
===================================================================
--- packages/hevea/experimental/debian/changelog 2005-03-20 19:51:23 UTC (rev 1017)
+++ packages/hevea/experimental/debian/changelog 2005-03-20 19:55:34 UTC (rev 1018)
@@ -1,10 +1,19 @@
-hevea (1.07-6) UNRELEASED; urgency=low
+hevea (1.07.beta.2005.03.07-2) UNRELEASED; urgency=low
- * debian/watch: new upstream url
- * Removed bogus file debian/watch
+ * Removed bogus file debian/files.
- -- Ralf Treinen <rt@club-internet.fr> Sun, 20 Mar 2005 20:34:21 +0100
+ -- Ralf Treinen <treinen@debian.org> Sun, 20 Mar 2005 20:38:14 +0100
+hevea (1.07.beta.2005.03.07-1) experimental; urgency=low
+
+ * New upstream beta release.
+ * Removed patches 01_imagen_typo, 04_rawtext, 05_licence since fixed by
+ upstream.
+ * Adapted patches 02_nogif, 03_charset to new source version
+ * debian/rules: use LATEXLIBDIR variable of Makefile to install hevea.sty
+
+ -- Ralf Treinen <treinen@debian.org> Wed, 9 Mar 2005 23:24:50 +0100
+
hevea (1.07-5) unstable; urgency=low
* New licence received from upstream author by email : Clause 6c of
Modified: packages/hevea/experimental/debian/patches/00list
===================================================================
--- packages/hevea/experimental/debian/patches/00list 2005-03-20 19:51:23 UTC (rev 1017)
+++ packages/hevea/experimental/debian/patches/00list 2005-03-20 19:55:34 UTC (rev 1018)
@@ -1,5 +1,2 @@
-01_imagen_typo
02_nogif
03_charset
-04_rawtext
-05_license
\ No newline at end of file
Deleted: packages/hevea/experimental/debian/patches/01_imagen_typo.dpatch
===================================================================
--- packages/hevea/experimental/debian/patches/01_imagen_typo.dpatch 2005-03-20 19:51:23 UTC (rev 1017)
+++ packages/hevea/experimental/debian/patches/01_imagen_typo.dpatch 2005-03-20 19:55:34 UTC (rev 1018)
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## 01_imagen_typo.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: spurious first line in imagen
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -E -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-@DPATCH@
---- hevea-1.07.orig/imagen
-+++ hevea-1.07/imagen
-@@ -1,4 +1,3 @@
--case
- #! /bin/sh
- LATEX=latex
- DVIPS=dvips
-
-
-
-
-
-
-
Deleted: packages/hevea/experimental/debian/patches/04_rawtext.dpatch
===================================================================
--- packages/hevea/experimental/debian/patches/04_rawtext.dpatch 2005-03-20 19:51:23 UTC (rev 1017)
+++ packages/hevea/experimental/debian/patches/04_rawtext.dpatch 2005-03-20 19:55:34 UTC (rev 1018)
@@ -1,117 +0,0 @@
-#! /bin/sh -e
-## 04_rawtext.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable rawtext environment. This patch should be obsolete in
-## DP: hevea vesion 1.08
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/hevea.sty hevea-1.07/hevea.sty
---- /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/hevea.sty 2002-09-17 14:17:21.000000000 +0200
-+++ hevea-1.07/hevea.sty 2004-05-10 21:21:43.000000000 +0200
-@@ -1,3 +1,4 @@
-+
- % hevea : hevea.sty
- % This is a very basic style file for latex document to be processed
- % with hevea. It contains definitions of LaTeX environment which are
-@@ -57,6 +58,10 @@
- \excludecomment{rawhtml}
- \newcommand{\rawhtmlinput}[1]{}
- \excludecomment{htmlonly}
-+%%%% Text and Info only
-+\excludecomment{rawtext}
-+\newcommand{\rawtextinput}[1]{}
-+\excludecomment{textonly}
- %%%% Latex only
- \newenvironment{latexonly}{}{}
- \newenvironment{verblatex}{}{}
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/latexcommon.hva hevea-1.07/latexcommon.hva
---- /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/latexcommon.hva 2004-05-10 20:48:09.000000000 +0200
-+++ hevea-1.07/latexcommon.hva 2004-05-10 21:24:31.000000000 +0200
-@@ -492,4 +492,8 @@
- poor}}{}
- %%%%% Extension des environnments hevea en lecture de fichier
- \newcommand{\rawhtmlinput}[1]
--{\@scaninput{\begin{rawhtml}}{#1}{\end{rawhtml}}}
-\ No newline at end of file
-+{\@scaninput{\begin{rawhtml}}{#1}{\end{rawhtml}}}
-+\newcommand{\rawtextinput}[1]
-+{\@scaninput{\begin{rawtext}}{#1}{\end{rawtext}}}
-+\newcommand{\rawinput}[1]
-+{\@scaninput{\begin{raw}}{#1}{\end{raw}}}
-\ No newline at end of file
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/verb.mll hevea-1.07/verb.mll
---- /home/rt/debian/pkg-ocaml-maint/packages/hevea/trunk/hevea-1.07/verb.mll 2003-09-29 10:54:54.000000000 +0200
-+++ hevea-1.07/verb.mll 2004-05-10 21:18:19.000000000 +0200
-@@ -735,24 +735,25 @@
- Out.reset line_buff
- ;;
-
--let open_rawhtml lexbuf =
-- begin match !Parse_opts.destination with
-- | Parse_opts.Html -> ()
-- | _ -> Misc.warning "rawhtml detected"
-- end ;
-- process :=
-- (fun () -> put_html () ; Dest.put_char '\n') ;
-- finish := put_html ;
-- noeof scan_byline lexbuf
--
--and close_rawhtml _ = ()
--
- let open_forget lexbuf =
- process := (fun () -> Out.reset line_buff) ;
- finish := (fun () -> Out.reset line_buff) ;
- noeof scan_byline lexbuf
-
--and close_forget _ = ()
-+let open_raw lexbuf =
-+ process := (fun () -> put_html () ; Dest.put_char '\n') ;
-+ finish := put_html ;
-+ noeof scan_byline lexbuf
-+
-+let open_rawhtml lexbuf = match !Parse_opts.destination with
-+ | Parse_opts.Html -> open_raw lexbuf
-+ | _ -> open_forget lexbuf
-+
-+let open_rawtext lexbuf = match !Parse_opts.destination with
-+ | Parse_opts.Text|Parse_opts.Info -> open_raw lexbuf
-+ | _ -> open_forget lexbuf
-+
-+let close_nothing _ = ()
-
- let open_tofile chan lexbuf =
- process :=
-@@ -794,8 +795,13 @@
- noeof scan_byline lexbuf) ;
- def_code "\\endverbatim*" close_verbenv ;
-
-+def_code "\\rawtext" open_rawtext ;
-+def_code "\\endrawtext" close_nothing ;
- def_code "\\rawhtml" open_rawhtml ;
--def_code "\\endrawhtml" close_forget ;
-+def_code "\\endrawhtml" close_nothing ;
-+def_code "\\raw" open_raw ;
-+def_code "\\endraw" close_nothing ;
-+
- def_code "\\verblatex" open_forget ;
- def_code "\\endverblatex" Scan.check_alltt_skip ;
- def_code "\\verbimage" open_verbimage ;
Deleted: packages/hevea/experimental/debian/patches/05_license.dpatch
===================================================================
--- packages/hevea/experimental/debian/patches/05_license.dpatch 2005-03-20 19:51:23 UTC (rev 1017)
+++ packages/hevea/experimental/debian/patches/05_license.dpatch 2005-03-20 19:55:34 UTC (rev 1018)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_license.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes to license as received from upstream author Luc Maranget
-## DP: by email on Tue, 18 Jan 2005 15:21:46 +0100
-
-@DPATCH@
-diff -urNad hevea-1.07/LICENSE /tmp/dpep.ihb6hP/hevea-1.07/LICENSE
---- hevea-1.07/LICENSE 1999-12-01 20:04:34.000000000 +0100
-+++ /tmp/dpep.ihb6hP/hevea-1.07/LICENSE 2005-01-20 08:19:14.000000000 +0100
-@@ -13,6 +13,12 @@
-
- ----------------------------------------------------------------------
-
-+ As a special exception to the Q Public Licence, you may develop
-+ application programs, reusable components and other software items
-+ that link with the original or modified versions of the Software
-+ and are not made available to the general public, without any of the
-+ additional requirements listed in clause 6c of the Q Public licence.
-+
- THE Q PUBLIC LICENSE version 1.0
-
- Copyright (C) 1999 Troll Tech AS, Norway.
-@@ -114,8 +120,7 @@
-
- Choice of Law
-
--This license is governed by the Laws of France. Disputes shall be
--settled by the Court of Versailles.
-+This license is governed by the Laws of France.
-
- ----------------------------------------------------------------------
-
Modified: packages/hevea/experimental/debian/rules
===================================================================
--- packages/hevea/experimental/debian/rules 2005-03-20 19:51:23 UTC (rev 1017)
+++ packages/hevea/experimental/debian/rules 2005-03-20 19:55:34 UTC (rev 1018)
@@ -25,9 +25,10 @@
dh_installdirs
$(MAKE) install\
TARGET=byte\
- LIBDIR=`pwd`/debian/hevea/usr/share/hevea\
- BINDIR=`pwd`/debian/hevea/usr/bin
- cp hevea.sty `pwd`/debian/hevea/usr/share/texmf/tex/latex/misc
+ DESTDIR=`pwd`/debian/hevea\
+ PREFIX=usr\
+ LIBDIR=usr/share/hevea\
+ LATEXLIBDIR=/usr/share/texmf/tex/latex/misc
binary-arch: build install