This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository bibtex2html.

commit 57be5dd330ce6fdbad5cb4e18b53a9b37b79862e
Author: Ralf Treinen <trei...@free.fr>
Date:   Sun Jul 6 19:35:43 2014 +0200

    new upstream source: adjust patches
---
 debian/changelog                  |  9 ++++
 debian/patches/charset            | 92 +++++++++++++--------------------------
 debian/patches/path-expand-styles |  8 ++--
 3 files changed, 44 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28debd0..a42a53d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bibtex2html (1.98-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Refreshed patches: charset, path-expand-styles
+  * Update patch charset: we also have to link with unix.cma
+  * Deactivate patch paranoid-bibtex which has been fixed upstream.
+
+ -- Ralf Treinen <trei...@debian.org>  Sun, 06 Jul 2014 19:51:21 +0200
+
 bibtex2html (1.97-5) unstable; urgency=low
 
   * Standards-Version 3.9.5 (no change)
diff --git a/debian/patches/charset b/debian/patches/charset
index a833dc7..16526a2 100644
--- a/debian/patches/charset
+++ b/debian/patches/charset
@@ -4,62 +4,10 @@ Credits: Junichi Uekawa <dan...@netfort.gr.jp> for submitting 
the idea of
  solving the same problem for the hevea package
 Closes-Bug:  Debian Bug#198802
 
-Index: bibtex2html/Makefile.in
-===================================================================
---- bibtex2html.orig/Makefile.in       2010-10-01 08:10:01.000000000 +0200
-+++ bibtex2html/Makefile.in    2010-10-01 08:16:32.000000000 +0200
-@@ -108,38 +108,38 @@
-       cp *.1 $$HOME/man/man1
- 
- 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)
--      $(OCAMLC) $(PROFILE) $(FLAGS)-o bibtex2html.byte str.cma 
$(OBJS:.cmx=.cmo) $(STRLIB) 
-+      $(OCAMLC) $(PROFILE) $(FLAGS)-o bibtex2html.byte str.cma unix.cma 
$(OBJS:.cmx=.cmo) $(STRLIB) 
- 
- 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 unix.cma $(OBJS:.cmx=.cmo)  
- 
- bibtex2html.static: $(OBJS)
--      $(OCAMLOPT) $(PROFILE) $(FLAGS) -o $@ str.cmxa $(OBJS) $(STRLIB) -cclib 
"-L. -static"
-+      $(OCAMLOPT) $(PROFILE) $(FLAGS) -o $@ str.cmxa unix.cmxa $(OBJS) 
$(STRLIB) -cclib "-L. -static"
-       strip $@
- 
- SRC=$(OBJS:.cmx=.ml)
- bibtex2html.dfc: $(SRC)
-       ocamldefun -d defun `ocamldefun-args $(SRC)`
--      cd defun; $(OCAMLOPT) $(FLAGS) -o ../$@ str.cmxa $(SRC)
-+      cd defun; $(OCAMLOPT) $(FLAGS) -o ../$@ str.cmxa unix.cmxa $(SRC)
- 
- 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)
--      $(OCAMLC)  $(PROFILE) $(FLAGS) -o bib2bib.byte str.cma 
$(BIB2BIBOBJS:.cmx=.cmo) $(STRLIB)
-+      $(OCAMLC)  $(PROFILE) $(FLAGS) -o bib2bib.byte str.cma unix.cma 
$(BIB2BIBOBJS:.cmx=.cmo) $(STRLIB)
- 
- 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 unix.cma $(BIB2BIBOBJS:.cmx=.cmo) 
- 
- bib2bib.static: $(BIB2BIBOBJS)
--      $(OCAMLOPT) $(PROFILE) $(FLAGS) -o $@ str.cmxa $(BIB2BIBOBJS) $(STRLIB) 
-cclib "-L. -static"
-+      $(OCAMLOPT) $(PROFILE) $(FLAGS) -o $@ str.cmxa unix.cmxa $(BIB2BIBOBJS) 
$(STRLIB) -cclib "-L. -static"
-       strip $@
- 
- static: bibtex2html.static bib2bib.static
 Index: bibtex2html/html.ml
 ===================================================================
---- bibtex2html.orig/html.ml   2010-09-21 19:41:49.000000000 +0200
-+++ bibtex2html/html.ml        2010-10-01 08:16:32.000000000 +0200
+--- bibtex2html.orig/html.ml   2014-07-06 19:48:42.491331063 +0200
++++ bibtex2html/html.ml        2014-07-06 19:48:42.483331063 +0200
 @@ -21,11 +21,28 @@
  let bgcolor = ref None
  let css = ref None
@@ -88,12 +36,12 @@ Index: bibtex2html/html.ml
 +
    begin match !css with
      | None -> ()
-     | Some f -> 
+     | Some f ->
 Index: bibtex2html/main.ml
 ===================================================================
---- bibtex2html.orig/main.ml   2010-10-01 08:10:01.000000000 +0200
-+++ bibtex2html/main.ml        2010-10-01 08:16:32.000000000 +0200
-@@ -324,6 +324,7 @@
+--- bibtex2html.orig/main.ml   2014-07-06 19:48:42.491331063 +0200
++++ bibtex2html/main.ml        2014-07-06 19:48:42.483331063 +0200
+@@ -344,6 +344,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)
@@ -101,7 +49,7 @@ Index: bibtex2html/main.ml
    -css file  specify a style sheet file
    -o file    redirect the output
    -header    additional header in the HTML file
-@@ -396,6 +397,10 @@
+@@ -416,6 +417,10 @@
        Html.bgcolor := Some s; parse_rec rem
      | ("-bg" | "-background" | "--background") :: [] ->
        usage()
@@ -114,8 +62,8 @@ Index: bibtex2html/main.ml
      | ("-css" | "-style-sheet" | "--style-sheet") :: [] ->
 Index: bibtex2html/manual.tex
 ===================================================================
---- bibtex2html.orig/manual.tex        2010-09-21 19:41:49.000000000 +0200
-+++ bibtex2html/manual.tex     2010-10-01 08:16:32.000000000 +0200
+--- bibtex2html.orig/manual.tex        2014-07-06 19:48:42.491331063 +0200
++++ bibtex2html/manual.tex     2014-07-06 19:48:42.483331063 +0200
 @@ -276,6 +276,12 @@
  
    set a style sheet file for the HTML document (default is none).
@@ -129,3 +77,25 @@ Index: bibtex2html/manual.tex
  \item[\texttt{-dl}, \texttt{\mm{}dl}] ~
  
    use HTML \texttt{DL} lists instead of HTML tables to format entries.
+Index: bibtex2html/Makefile.in
+===================================================================
+--- bibtex2html.orig/Makefile.in       2014-07-06 19:48:42.491331063 +0200
++++ bibtex2html/Makefile.in    2014-07-06 19:49:55.435328392 +0200
+@@ -112,7 +112,7 @@
+       strip bibtex2html$(EXE)
+ 
+ bibtex2html.byte: $(OBJS:.cmx=.cmo)
+-      $(OCAMLC) $(PROFILE) $(FLAGS)-o bibtex2html.byte str.cma 
$(OBJS:.cmx=.cmo) $(STRLIB)
++      $(OCAMLC) $(PROFILE) $(FLAGS)-o bibtex2html.byte str.cma unix.cma 
$(OBJS:.cmx=.cmo) $(STRLIB)
+ 
+ bibtex2html.pbyte: $(OBJS:.cmx=.cmo)
+       $(OCAMLC) -use-runtime ~demons/bin/$(OSTYPE)/ocamlcustomrun \
+@@ -132,7 +132,7 @@
+       strip bib2bib$(EXE)
+ 
+ bib2bib.byte: $(BIB2BIBOBJS:.cmx=.cmo)
+-      $(OCAMLC)  $(PROFILE) $(FLAGS) -o bib2bib.byte str.cma 
$(BIB2BIBOBJS:.cmx=.cmo) $(STRLIB)
++      $(OCAMLC)  $(PROFILE) $(FLAGS) -o bib2bib.byte str.cma unix.cma 
$(BIB2BIBOBJS:.cmx=.cmo) $(STRLIB)
+ 
+ bib2bib.pbyte: $(BIB2BIBOBJS:.cmx=.cmo)
+       $(OCAMLC) -use-runtime ~demons/bin/$(OSTYPE)/ocamlcustomrun \
diff --git a/debian/patches/path-expand-styles 
b/debian/patches/path-expand-styles
index d232498..f13f135 100644
--- a/debian/patches/path-expand-styles
+++ b/debian/patches/path-expand-styles
@@ -5,9 +5,9 @@ Debian-Bug: #698004
 
 Index: bibtex2html/main.ml
 ===================================================================
---- bibtex2html.orig/main.ml   2013-01-13 21:14:30.000000000 +0100
-+++ bibtex2html/main.ml        2013-01-13 21:15:18.000000000 +0100
-@@ -391,6 +391,15 @@
+--- bibtex2html.orig/main.ml   2014-07-06 19:28:16.555375961 +0200
++++ bibtex2html/main.ml        2014-07-06 19:28:16.551375961 +0200
+@@ -405,6 +405,15 @@
  ";
    exit (if error then 1 else 0)
  
@@ -23,7 +23,7 @@ Index: bibtex2html/main.ml
  let parse () =
    let rec parse_rec = function
  
-@@ -420,7 +429,7 @@
+@@ -434,7 +443,7 @@
      | ("-footer" | "--footer") :: [] ->
        usage()
      | ("-s" | "-style" | "--style") :: s :: rem ->

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/bibtex2html.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to