[Pkg-ocaml-maint-commits] [SCM] ocamlweb packaging branch, master, updated. debian/1.37-11-2-gcef8082

[Ralf Treinen]

The following commit has been merged in the master branch:
commit ae09f8f93be823c41809933e7d61a646132a419a
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Jan 3 13:51:23 2010 +0100

    source format 3.0, update dependencies on tex

diff --git a/debian/changelog b/debian/changelog
index 80f10fc..56f5f34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ocamlweb (1.37-12) unstable; urgency=low
+
+  * Added Recommends on hevea, texlive-binaries, texlive-latex-base,
+    removed Recommends of tetex-extra
+  * Converted to source format 3.0:
+    - converted dpatch patches to quilt
+    - don't use dpatch CDBS rules
+    - remove build-dependency on dpatch
+    - add debian/source/format
+  * Standards-Version 3.8.3 (no change)
+
+ -- Ralf Treinen <treinen at debian.org>  Sun, 03 Jan 2010 13:50:49 +0100
+
 ocamlweb (1.37-11) unstable; urgency=low
 
   [ Ralf Treinen ]
diff --git a/debian/control b/debian/control
index 644b6f6..de9d24b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Uploaders:
  Stefano Zacchiroli <zack at debian.org>,
  Samuel Mimram <smimram at debian.org>,
  Sylvain Le Gall <gildor at debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Build-Depends-Indep: ocaml-nox (>= 3.07)
-Build-Depends: debhelper (>= 7.0), dpatch, tex-common, cdbs, dh-ocaml
+Build-Depends: debhelper (>= 7.0), tex-common, cdbs, dh-ocaml
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlweb.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlweb.git
 Homepage: http://www.lri.fr/~filliatr/ocamlweb/index.en.html
@@ -18,7 +18,9 @@ Homepage: http://www.lri.fr/~filliatr/ocamlweb/index.en.html
 Package: ocamlweb
 Architecture: all
 Depends: ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
-Recommends: texlive-latex-extra | tetex-extra 
+# Recommends: texlive-latex-extra for fullpage.sty, texlive-binaries for
+# dvips, texlive-latex-base for latex.
+Recommends: texlive-latex-extra, hevea, texlive-binaries, texlive-latex-base
 Suggests: hevea
 Enhances: ocaml
 Description: Literate programming tool for Objective Caml
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fa8d36d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01manpage-doc
-
diff --git a/debian/patches/01manpage-doc.dpatch b/debian/patches/manpage-doc
similarity index 58%
rename from debian/patches/01manpage-doc.dpatch
rename to debian/patches/manpage-doc
index bc19b23..dbd5162 100755
--- a/debian/patches/01manpage-doc.dpatch
+++ b/debian/patches/manpage-doc
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01manpage-doc.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add to the man page pointer to the complete documentation in html.
+Author: Ralf Treinen <treinen at debian.org>
+Description: Add to the man page pointer to the complete documentation in html.
 
- at DPATCH@
-diff -urNad trunk~/doc/ocamlweb.1 trunk/doc/ocamlweb.1
 --- trunk~/doc/ocamlweb.1	2005-11-04 14:30:08.000000000 +0100
 +++ trunk/doc/ocamlweb.1	2005-11-05 13:17:17.839779033 +0100
 @@ -28,6 +28,10 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bc14776
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+manpage-doc
diff --git a/debian/rules b/debian/rules
index 5f75229..2f63266 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
 install/ocamlweb::
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
ocamlweb packaging