[Pkg-ocaml-maint-commits] [SCM] bibtex2html packaging branch, master, updated. debian/1.94-5-27-gd11e136

[Ralf Treinen]

The following commit has been merged in the master branch:
commit d11e136af701e9ac5611302de7ad474fce48435c
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Mar 31 20:44:28 2010 +0200

    one patch no longer necessary, shifte linenumbers in remaining patches

diff --git a/debian/changelog b/debian/changelog
index d1bf8dd..c82615b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 bibtex2html (1.95-1) unstable; urgency=low
 
   * New upstream version
+  * Remove patch strings_utf8, this is fixed by upstream now.
+  * Shifted linenumbers of patches according to the new upstream version.
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 31 Mar 2010 20:27:21 +0200
+ -- Ralf Treinen <treinen at debian.org>  Wed, 31 Mar 2010 20:44:19 +0200
 
 bibtex2html (1.94-5) unstable; urgency=low
 
diff --git a/debian/patches/charset b/debian/patches/charset
index 553b1f2..6b64875 100755
--- a/debian/patches/charset
+++ b/debian/patches/charset
@@ -6,7 +6,7 @@ Closes-Bug:  Debian Bug#198802
 
 --- 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 @@
+@@ -104,38 +104,38 @@
  	cp *.1 $$HOME/man/man1
  
  bibtex2html$(EXE): $(OBJS)
@@ -57,7 +57,7 @@ Closes-Bug:  Debian Bug#198802
 diff -urNad trunk~/html.ml trunk/html.ml
 --- 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 @@
+@@ -21,11 +21,28 @@
  let bgcolor = ref None
  let css = ref None
  
@@ -89,7 +89,7 @@ diff -urNad trunk~/html.ml trunk/html.ml
 diff -urNad trunk~/main.ml trunk/main.ml
 --- 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 @@
+@@ -320,6 +320,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)
@@ -97,7 +97,7 @@ diff -urNad trunk~/main.ml trunk/main.ml
    -css file  specify a style sheet file
    -o file    redirect the output
    -header    additional header in the HTML file
-@@ -394,6 +395,10 @@
+@@ -392,6 +393,10 @@
  	Html.bgcolor := Some s; parse_rec rem
      | ("-bg" | "-background" | "--background") :: [] ->
  	usage()
@@ -111,7 +111,7 @@ diff -urNad trunk~/main.ml trunk/main.ml
 diff -urNad trunk~/manual.tex trunk/manual.tex
 --- 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 @@
+@@ -276,6 +276,12 @@
  
    set a style sheet file for the HTML document (default is none).
  
diff --git a/debian/patches/doc-noexamples b/debian/patches/doc-noexamples
index 7417d90..cf09e65 100755
--- a/debian/patches/doc-noexamples
+++ b/debian/patches/doc-noexamples
@@ -3,7 +3,7 @@ Author: Ralf Treinen <treinen at debian.org>
 
 --- bibtex2html-1.75/manual.tex	2005-02-06 16:13:44.000000000 +0100
 +++ /tmp/dpep.62kfUa/bibtex2html-1.75/manual.tex	2005-02-06 16:15:33.000000000 +0100
-@@ -62,12 +62,9 @@
+@@ -83,12 +83,9 @@
  Then two HTML documents are created (unless option
  \verb|-nobibsource| is selected or input is standard input, see below) : 
  \begin{itemize}
@@ -17,7 +17,7 @@ Author: Ralf Treinen <treinen at debian.org>
  \end{itemize}
  \texttt{bibtex} is called on \textit{file.bib} in order to produce the
  a LaTeX document, and then this LaTeX document is translated into an
-@@ -115,21 +112,16 @@
+@@ -136,21 +133,16 @@
  \end{itemize}
  
  
diff --git a/debian/patches/series b/debian/patches/series
index 17a3665..1c90bd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-strings_utf8
 charset
 doc-noexamples
diff --git a/debian/patches/strings_utf8 b/debian/patches/strings_utf8
deleted file mode 100755
index 9a389f8..0000000
--- a/debian/patches/strings_utf8
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Print copyright information in UTF8
-Author: Ralf Treinen <treinen at debian.org>
-
---- trunk~/copying.ml	2008-02-20 09:12:52.000000000 +0100
-+++ trunk/copying.ml	2008-03-22 11:52:25.000000000 +0100
-@@ -36,7 +36,7 @@
- 
- let authors = match Sys.os_type with
-   | "Win32" -> "Jean-Christophe Filli\131tre and Claude March\130"
--  | _       -> "Jean-Christophe Filliâtre and Claude Marché" (* iso latin 1 *)
-+  | _       -> "Jean-Christophe Filliâtre and Claude Marché" (* utf8 *)
- 
- let banner softname =
-   if not !Options.quiet then begin

-- 
bibtex2html packaging