[Pkg-ocaml-maint-commits] [SCM] bibtex2html packaging branch, master, updated. debian/1.94-1-9-gc8a0138

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 585f3b96e5ea77dcf785da00b1f192f58521416a
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Nov 12 21:48:32 2009 +0100

    move from dpatch to quilt

diff --git a/debian/control b/debian/control
index a9fa337..35b9fc0 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders:
  Sylvain Le Gall <gildor at debian.org>
 Standards-Version: 3.8.2
 Build-Depends-Indep: ocaml-nox (>= 3.07), hevea
-Build-Depends: debhelper (>= 7.0), dpatch, cdbs, dh-ocaml
+Build-Depends: debhelper (>= 7.0), quilt, cdbs, dh-ocaml
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/bibtex2html.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/bibtex2html.git
 Homepage: http://www.lri.fr/~filliatr/bibtex2html/index.en.html
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d18bae9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_strings_utf8
-03_charset
-06_doc-noexamples
diff --git a/debian/patches/03_charset.dpatch b/debian/patches/charset
similarity index 94%
rename from debian/patches/03_charset.dpatch
rename to debian/patches/charset
index d45922e..f098897 100755
--- a/debian/patches/03_charset.dpatch
+++ b/debian/patches/charset
@@ -1,11 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_charset.dpatch by  <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: get charset from locale or commandline
+Author: Ralf Treinen <treinen at debian.org>
+Credits: Junichi Uekawa <dancer at netfort.gr.jp> for submitting the idea of
+ solving the same problem for the hevea package
+Description: get charset from locale or commandline
+Closes-Bug:  Debian Bug#198802
 
- at DPATCH@
-diff -urNad trunk~/Makefile.in trunk/Makefile.in
 --- 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 @@
diff --git a/debian/patches/06_doc-noexamples.dpatch b/debian/patches/doc-noexamples
similarity index 100%
rename from debian/patches/06_doc-noexamples.dpatch
rename to debian/patches/doc-noexamples
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..17a3665
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+strings_utf8
+charset
+doc-noexamples
diff --git a/debian/patches/01_strings_utf8.dpatch b/debian/patches/strings_utf8
similarity index 100%
rename from debian/patches/01_strings_utf8.dpatch
rename to debian/patches/strings_utf8

-- 
bibtex2html packaging