[Pkg-ocaml-maint-commits] r5939 - in /trunk/packages/bibtex2html: tarballs/bibtex2html_1.92.orig.tar.gz trunk/debian/changelog trunk/debian/patches/03_charset.dpatch
treinen at users.alioth.debian.org
treinen at users.alioth.debian.org
Mon Aug 11 23:49:45 UTC 2008
Author: treinen
Date: Mon Aug 11 23:49:45 2008
New Revision: 5939
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5939
Log:
bibtex2html 1.92 (still have to test before upload)
Added:
trunk/packages/bibtex2html/tarballs/bibtex2html_1.92.orig.tar.gz (with props)
Modified:
trunk/packages/bibtex2html/trunk/debian/changelog
trunk/packages/bibtex2html/trunk/debian/patches/03_charset.dpatch
Added: trunk/packages/bibtex2html/tarballs/bibtex2html_1.92.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/tarballs/bibtex2html_1.92.orig.tar.gz?rev=5939&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/bibtex2html/tarballs/bibtex2html_1.92.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/packages/bibtex2html/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/changelog?rev=5939&op=diff
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/changelog (original)
+++ trunk/packages/bibtex2html/trunk/debian/changelog Mon Aug 11 23:49:45 2008
@@ -1,3 +1,12 @@
+bibtex2html (1.92-1) unstable; urgency=low
+
+ * New upstream version. This release fixes a bug with accent parsing
+ and conversion (closes: Bug#467082).
+ * Adapted patch 03_charset to new upstream version.
+ * Standards-Version 3.8.0 (no change).
+
+ -- Ralf Treinen <treinen at debian.org> Tue, 12 Aug 2008 01:43:30 +0200
+
bibtex2html (1.91-3) unstable; urgency=low
* Recompile with ocaml 3.10.2
Modified: trunk/packages/bibtex2html/trunk/debian/patches/03_charset.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/patches/03_charset.dpatch?rev=5939&op=diff
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/patches/03_charset.dpatch (original)
+++ trunk/packages/bibtex2html/trunk/debian/patches/03_charset.dpatch Mon Aug 11 23:49:45 2008
@@ -1,18 +1,19 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_charset.dpatch by Ralf Treinen <treinen at debian.org>
+## 03_charset.dpatch by <treinen at debian.org>
##
-## DP: get the charset from the locale or command line option
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: get charset from locale or commandline
@DPATCH@
diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in 2006-10-19 11:03:06.000000000 +0200
-+++ trunk/Makefile.in 2006-10-24 09:43:49.000000000 +0200
-@@ -84,38 +84,38 @@
+--- trunk~/Makefile.in 2008-07-08 16:09:08.000000000 +0200
++++ trunk/Makefile.in 2008-08-12 01:33:07.000000000 +0200
+@@ -88,38 +88,38 @@
cp *.1 $$HOME/man/man1
- bibtex2html: $(OBJS)
-- $(OCAMLOPT) $(PROFILE) $(FLAGS) -o bibtex2html str.cmxa $(OBJS) $(STRLIB)
-+ $(OCAMLOPT) $(PROFILE) $(FLAGS) -o bibtex2html str.cmxa unix.cmxa $(OBJS) $(STRLIB)
+ bibtex2html$(EXE): $(OBJS)
+- $(OCAMLOPT) $(PROFILE) $(FLAGS) -o bibtex2html$(EXE) str.cmxa $(OBJS) $(STRLIB)
++ $(OCAMLOPT) $(PROFILE) $(FLAGS) -o bibtex2html$(EXE) str.cmxa unix.cmxa $(OBJS) $(STRLIB)
strip bibtex2html$(EXE)
bibtex2html.byte: $(OBJS:.cmx=.cmo)
@@ -21,7 +22,8 @@
bibtex2html.pbyte: $(OBJS:.cmx=.cmo)
$(OCAMLC) -use-runtime ~demons/bin/$(OSTYPE)/ocamlcustomrun \
- -o bibtex2html.pbyte str.cma $(OBJS:.cmx=.cmo)
+- -o bibtex2html.pbyte str.cma $(OBJS:.cmx=.cmo)
++ -o bibtex2html.pbyte str.cma unix.cma $(OBJS:.cmx=.cmo)
bibtex2html.static: $(OBJS)
- $(OCAMLOPT) $(PROFILE) $(FLAGS) -o $@ str.cmxa $(OBJS) $(STRLIB) -cclib "-L. -static"
@@ -34,9 +36,9 @@
- cd defun; $(OCAMLOPT) $(FLAGS) -o ../$@ str.cmxa $(SRC)
+ cd defun; $(OCAMLOPT) $(FLAGS) -o ../$@ str.cmxa unix.cmxa $(SRC)
- bib2bib: $(BIB2BIBOBJS)
-- $(OCAMLOPT) $(PROFILE) $(FLAGS) -o bib2bib str.cmxa $(BIB2BIBOBJS) $(STRLIB)
-+ $(OCAMLOPT) $(PROFILE) $(FLAGS) -o bib2bib str.cmxa unix.cmxa $(BIB2BIBOBJS) $(STRLIB)
+ bib2bib$(EXE): $(BIB2BIBOBJS)
+- $(OCAMLOPT) $(PROFILE) $(FLAGS) -o bib2bib$(EXE) str.cmxa $(BIB2BIBOBJS) $(STRLIB)
++ $(OCAMLOPT) $(PROFILE) $(FLAGS) -o bib2bib$(EXE) str.cmxa unix.cmxa $(BIB2BIBOBJS) $(STRLIB)
strip bib2bib$(EXE)
bib2bib.byte: $(BIB2BIBOBJS:.cmx=.cmo)
@@ -45,7 +47,8 @@
bib2bib.pbyte: $(BIB2BIBOBJS:.cmx=.cmo)
$(OCAMLC) -use-runtime ~demons/bin/$(OSTYPE)/ocamlcustomrun \
- -o bib2bib.pbyte str.cma $(BIB2BIBOBJS:.cmx=.cmo)
+- -o bib2bib.pbyte str.cma $(BIB2BIBOBJS:.cmx=.cmo)
++ -o bib2bib.pbyte str.cma unix.cma $(BIB2BIBOBJS:.cmx=.cmo)
bib2bib.static: $(BIB2BIBOBJS)
- $(OCAMLOPT) $(PROFILE) $(FLAGS) -o $@ str.cmxa $(BIB2BIBOBJS) $(STRLIB) -cclib "-L. -static"
@@ -54,13 +57,12 @@
static: bibtex2html.static bib2bib.static
diff -urNad trunk~/html.ml trunk/html.ml
---- trunk~/html.ml 2006-10-19 11:03:06.000000000 +0200
-+++ trunk/html.ml 2006-10-24 09:40:48.000000000 +0200
-@@ -22,12 +22,27 @@
-
+--- trunk~/html.ml 2008-07-08 16:09:08.000000000 +0200
++++ trunk/html.ml 2008-08-12 01:33:06.000000000 +0200
+@@ -23,11 +23,28 @@
let bgcolor = ref None
let css = ref None
--
+
+let defaultcharset = "ISO-8859-1"
+let charset =
+ ref (try
@@ -82,21 +84,22 @@
+ "<meta http-equiv=\"content-type\" content=\"text/html; charset=%s\">\n"
+ !charset;
+ output_string ch "<meta name=\"generator\" content=\"bibtex2html\">\n";
++
begin match !css with
| None -> ()
| Some f ->
diff -urNad trunk~/main.ml trunk/main.ml
---- trunk~/main.ml 2006-10-19 11:03:06.000000000 +0200
-+++ trunk/main.ml 2006-10-24 09:40:48.000000000 +0200
-@@ -316,6 +316,7 @@
- -r reverse the sort
+--- trunk~/main.ml 2008-07-08 16:09:08.000000000 +0200
++++ trunk/main.ml 2008-08-12 01:33:04.000000000 +0200
+@@ -322,6 +322,7 @@
+ -revkeys entries numbered in reverse order
-t title title of the HTML file (default is the filename)
-bg color background color of the HTML file (default is none)
+ -charset c specify a charset c to use in the HEAD tag
-css file specify a style sheet file
-o file redirect the output
- -footer additional footer in the HTML file
-@@ -378,6 +379,10 @@
+ -header additional header in the HTML file
+@@ -391,6 +392,10 @@
Html.bgcolor := Some s; parse_rec rem
| ("-bg" | "-background" | "--background") :: [] ->
usage()
@@ -108,9 +111,9 @@
Html.css := Some f; parse_rec rem
| ("-css" | "-style-sheet" | "--style-sheet") :: [] ->
diff -urNad trunk~/manual.tex trunk/manual.tex
---- trunk~/manual.tex 2006-10-19 11:03:06.000000000 +0200
-+++ trunk/manual.tex 2006-10-24 09:40:48.000000000 +0200
-@@ -248,6 +248,12 @@
+--- trunk~/manual.tex 2008-07-08 16:09:08.000000000 +0200
++++ trunk/manual.tex 2008-08-12 01:32:50.000000000 +0200
+@@ -255,6 +255,12 @@
set a style sheet file for the HTML document (default is none).
@@ -123,3 +126,4 @@
\item[\texttt{-dl}, \texttt{\mm{}dl}] ~
use HTML \texttt{DL} lists instead of HTML tables to format entries.
+
More information about the Pkg-ocaml-maint-commits
mailing list