[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. debian/0.6-3-8-gd9139b0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 750ed2c6e5b9a3377a7986fca5f7f342585e8de4
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Aug 11 14:30:27 2009 +0200

    Add a patch to fix double UTF8-encoding in manpage

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..8f3c3e5
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,16 @@
+Mlpost Debian source package
+============================
+
+Patching upstream sources
+-------------------------
+
+This source package uses quilt to apply and remove its patches. Please
+refer to `/usr/share/doc/quilt/README.source' for information about
+how to use quilt for source packages.
+
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (>= 0.4.2) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
+
+ -- Stephane Glondu <steph at glondu.net>, Tue, 11 Aug 2009 14:29:21 +0200
diff --git a/debian/control b/debian/control
index 75bdabb..50d29eb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ DM-Upload-Allowed: yes
 Build-Depends:
  debhelper (>= 7),
  dh-ocaml,
+ quilt,
  cdbs,
  libcairo-ocaml-dev,
  libbitstring-ocaml-dev,
diff --git a/debian/patches/0001-Fix-manpage-double-UTF8-encoding.patch b/debian/patches/0001-Fix-manpage-double-UTF8-encoding.patch
new file mode 100644
index 0000000..e061aa2
--- /dev/null
+++ b/debian/patches/0001-Fix-manpage-double-UTF8-encoding.patch
@@ -0,0 +1,29 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 11 Aug 2009 14:06:39 +0200
+Subject: [PATCH] Fix manpage double-UTF8 encoding
+
+Forwarded upstream.
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ mlpost.1 |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mlpost.1 b/mlpost.1
+index 2460d41..02f161d 100644
+--- a/mlpost.1
++++ b/mlpost.1
+@@ -47,9 +47,9 @@ Display the list of options
+ .br
+ .SH AUTHOR
+ Mlpost was written by Romain Bardou,
+-Johannes Kanig, Stéphane Lescuyer and
+-Jean-Christophe Filliâtre.
++Johannes Kanig, Stéphane Lescuyer and
++Jean-Christophe Filliâtre.
+ .PP
+-This manual page was written by Stéphane Glondu <steph at glondu.net>
++This manual page was written by Stéphane Glondu <steph at glondu.net>
+ for the Debian project (but may be used by others).
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9dde1ca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-manpage-double-UTF8-encoding.patch
diff --git a/debian/rules b/debian/rules
index 725274d..9ba7631 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/ocaml.mk

-- 
mlpost packaging