[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. debian/0.7.1-2-8-g6c4bc46

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 5eeb1077fca63a282a92e33a3b6df300a4f7cc2f
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Dec 24 15:17:03 2009 +0100

    Remove patches, switch to format 3.0 (quilt)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8f3c3e5..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,16 +0,0 @@
-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 3578a87..11a39b1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends:
  imagemagick,
  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
deleted file mode 100644
index e061aa2..0000000
--- a/debian/patches/0001-Fix-manpage-double-UTF8-encoding.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/0002-Fix-build-when-ocamlopt-is-missing.patch b/debian/patches/0002-Fix-build-when-ocamlopt-is-missing.patch
deleted file mode 100644
index 2a27ce7..0000000
--- a/debian/patches/0002-Fix-build-when-ocamlopt-is-missing.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Thu, 13 Aug 2009 13:38:08 +0200
-Subject: [PATCH] Fix build when ocamlopt is missing
-
- * call ocamlbuild with -byte-plugin on bytecode platforms
- * fix install-byte rule
-
-Forwarded upstream.
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- ocamlbuild.Makefile.in |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/ocamlbuild.Makefile.in b/ocamlbuild.Makefile.in
-index 771e140..58db088 100644
---- a/ocamlbuild.Makefile.in
-+++ b/ocamlbuild.Makefile.in
-@@ -46,6 +46,7 @@ ifeq "$(OCAMLBEST)" "opt"
- TOOL= tool.native
- else
- TOOL= tool.byte
-+OBOPTS += -byte-plugin
- endif
- 
- ifeq "$(TERM)" "dumb"
-@@ -56,7 +57,8 @@ endif
- 
- DTYPES = -tag dtypes
- 
--OCAMLBUILD := ocamlbuild -no-links $(DTYPES) -tag cairo_ at CAIRO@ $(OCAMLBUILD_DISPLAY)
-+OCAMLBUILD := ocamlbuild $(OBOPTS) -no-links $(DTYPES) -tag cairo_ at CAIRO@ $(OCAMLBUILD_DISPLAY)
-+
- BUILD := _build/
- 
- CMA := mlpost.cma
-@@ -203,7 +205,7 @@ install-byte:
- 	mkdir -p $(LIBDIR)
- 	cp -f $(BUILD)mlpost.cmo $(BUILD)mlpost.cmi META $(BUILD)$(CMA) "$(LIBDIR)"
- 	mkdir -p $(BINDIR)
--	cp -f tool.byte $(BINDIR)/mlpost
-+	cp -f $(BUILD)tool.byte $(BINDIR)/mlpost
- 	cp -f mlpost.1 $(MANDIR)/man1
- 
- install-opt:
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b29efb1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-manpage-double-UTF8-encoding.patch
-0002-Fix-build-when-ocamlopt-is-missing.patch
diff --git a/debian/rules b/debian/rules
index 9ba7631..725274d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..46ebe02
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
\ No newline at end of file

-- 
mlpost packaging