[Pkg-ocaml-maint-commits] r3267 - in /trunk/packages/bibtex2html/trunk/debian: changelog patches/00list patches/03_charset.dpatch

treinen at users.alioth.debian.org treinen at users.alioth.debian.org
Tue Oct 24 10:07:26 UTC 2006 

Author: treinen
Date: Tue Oct 24 10:07:25 2006
New Revision: 3267

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3267
Log:
bibtex2html-1.84-1

Modified:
    trunk/packages/bibtex2html/trunk/debian/changelog
    trunk/packages/bibtex2html/trunk/debian/patches/00list
    trunk/packages/bibtex2html/trunk/debian/patches/03_charset.dpatch

Modified: trunk/packages/bibtex2html/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/changelog?rev=3267&op=diff
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/changelog (original)
+++ trunk/packages/bibtex2html/trunk/debian/changelog Tue Oct 24 10:07:25 2006
@@ -1,8 +1,9 @@
 bibtex2html (1.84-1) unstable; urgency=low
 
   * New upstream release.
-
- -- Ralf Treinen <treinen at debian.org>  Thu, 19 Oct 2006 19:28:58 +0200
+  * Adapt patch 03_charset to the new Makefile.in
+
+ -- Ralf Treinen <treinen at debian.org>  Tue, 24 Oct 2006 09:46:13 +0200
 
 bibtex2html (1.83-1) unstable; urgency=low
 

Modified: trunk/packages/bibtex2html/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/patches/00list?rev=3267&op=diff
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/patches/00list (original)
+++ trunk/packages/bibtex2html/trunk/debian/patches/00list Tue Oct 24 10:07:25 2006
@@ -1,2 +1,2 @@
-#03_charset
+03_charset
 06_doc-noexamples

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=3267&op=diff
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/patches/03_charset.dpatch (original)
+++ trunk/packages/bibtex2html/trunk/debian/patches/03_charset.dpatch Tue Oct 24 10:07:25 2006
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 ## 03_charset.dpatch by Ralf Treinen <treinen at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: get the charset from the locale or command line option
 
 if [ $# -ne 1 ]; then
@@ -23,9 +22,58 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/bibtex2html/trunk/bibtex2html-1.73/html.ml bibtex2html-1.73/html.ml
---- /home/rt/debian/pkg-ocaml-maint/packages/bibtex2html/trunk/bibtex2html-1.73/html.ml	2004-09-08 22:08:35.000000000 +0200
-+++ bibtex2html-1.73/html.ml	2004-09-08 22:09:34.000000000 +0200
+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 @@
+ 	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)
+ 	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)  
+ 
+ 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: $(BIB2BIBOBJS)
+-	$(OCAMLOPT) $(PROFILE) $(FLAGS) -o bib2bib str.cmxa $(BIB2BIBOBJS) $(STRLIB)
++	$(OCAMLOPT) $(PROFILE) $(FLAGS) -o bib2bib 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) 
+ 
+ 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
+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 @@
  
  let bgcolor = ref None
@@ -55,10 +103,10 @@
    begin match !css with
      | None -> ()
      | Some f -> 
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/bibtex2html/trunk/bibtex2html-1.73/main.ml bibtex2html-1.73/main.ml
---- /home/rt/debian/pkg-ocaml-maint/packages/bibtex2html/trunk/bibtex2html-1.73/main.ml	2004-09-08 22:08:35.000000000 +0200
-+++ bibtex2html-1.73/main.ml	2004-09-08 22:10:55.000000000 +0200
-@@ -307,6 +307,7 @@
+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
    -t title   title of the HTML file (default is the filename)
    -bg color  background color of the HTML file (default is none)
@@ -66,7 +114,7 @@
    -css file  specify a style sheet file
    -o file    redirect the output
    -footer    additional footer in the HTML file
-@@ -360,6 +361,10 @@
+@@ -378,6 +379,10 @@
  	Html.bgcolor := Some s; parse_rec rem
      | ("-bg" | "-background" | "--background") :: [] ->
  	usage()
@@ -77,65 +125,10 @@
      | ("-css" | "-style-sheet" | "--style-sheet") :: f :: rem ->
  	Html.css := Some f; parse_rec rem
      | ("-css" | "-style-sheet" | "--style-sheet") :: [] ->
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/bibtex2html/trunk/bibtex2html-1.73/Makefile.in bibtex2html-1.73/Makefile.in
---- /home/rt/debian/pkg-ocaml-maint/packages/bibtex2html/trunk/bibtex2html-1.73/Makefile.in	2004-09-08 22:08:35.000000000 +0200
-+++ bibtex2html-1.73/Makefile.in	2004-09-08 22:09:34.000000000 +0200
-@@ -80,18 +80,21 @@
- 	cp *.1 $$HOME/man/man1
- 
- bibtex2html: $(OBJS)
--	$(OCAMLOPT) $(PROFILE) $(FLAGS) -o bibtex2html str.cmxa $(OBJS) $(STRLIB)
-+	$(OCAMLOPT) $(PROFILE) $(FLAGS) -o bibtex2html str.cmxa unix.cma \
-+		$(OBJS) $(STRLIB)
- 	strip bibtex2html
- 
- 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.cma \
-+		$(OBJS) $(STRLIB) -cclib "-L. -static"
- 	strip $@
- 
- SRC=$(OBJS:.cmx=.ml)
-@@ -100,18 +103,21 @@
- 	cd defun; $(OCAMLOPT) $(FLAGS) -o ../$@ str.cmxa $(SRC)
- 
- bib2bib: $(BIB2BIBOBJS)
--	$(OCAMLOPT) $(PROFILE) $(FLAGS) -o bib2bib str.cmxa $(BIB2BIBOBJS) $(STRLIB)
-+	$(OCAMLOPT) $(PROFILE) $(FLAGS) -o bib2bib str.cmxa unix.cmxa \
-+		 $(BIB2BIBOBJS) $(STRLIB)
- 	strip bib2bib
- 
- 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
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/bibtex2html/trunk/bibtex2html-1.73/manual.tex bibtex2html-1.73/manual.tex
---- /home/rt/debian/pkg-ocaml-maint/packages/bibtex2html/trunk/bibtex2html-1.73/manual.tex	2004-09-08 22:08:35.000000000 +0200
-+++ bibtex2html-1.73/manual.tex	2004-09-08 22:09:34.000000000 +0200
-@@ -247,6 +247,12 @@
+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 @@
  
    set a style sheet file for the HTML document (default is none).

More information about the Pkg-ocaml-maint-commits mailing list