[Pkg-ocaml-maint-commits] [SCM] menhir packaging branch, master, updated. debian/20090505.dfsg-1-5-g1a56eba

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 1a56ebaaa9c3c74f0e94b00ba6054954e0c0f5e9
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Sep 23 18:54:26 2009 +0200

    Convert patches to quilt format and use quilt instead of dpatch

diff --git a/debian/changelog b/debian/changelog
index 1b3fe56..a4453df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ menhir (20090505.dfsg-2) unstable; urgency=low
   * Build-dep on ocaml >= 3.11.1-2
   * Use new address and remove DMUA
   * Bump standards to 3.8.3
+  * Convert patches to quilt format and use quilt instead of dpatch
 
  -- Mehdi Dogguy <mehdi at debian.org>  Wed, 23 Sep 2009 18:48:23 +0200
 
diff --git a/debian/control b/debian/control
index bb05750..c13c2f5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders:
   Samuel Mimram <smimram at debian.org>,
   Mehdi Dogguy <mehdi at debian.org>
 Build-Depends:
-  debhelper (>= 7.0.0),
-  dpatch,
+  debhelper (>= 7.0.50),
+  quilt (>= 0.46-7),
   ocaml-nox (>= 3.11.1-2),
   dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
diff --git a/debian/patches/0001-Remove-some-invalid-characters.patch b/debian/patches/0001-Remove-some-invalid-characters.patch
new file mode 100644
index 0000000..b24dcbd
--- /dev/null
+++ b/debian/patches/0001-Remove-some-invalid-characters.patch
@@ -0,0 +1,22 @@
+From: Samuel Mimram <smimram at debian.org>
+Date: Wed, 23 Sep 2009 18:55:38 +0200
+Subject: [PATCH] Remove some invalid characters
+
+---
+ menhir.1 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/menhir.1 b/menhir.1
+index e241b91..ac2940c 100644
+--- a/menhir.1
++++ b/menhir.1
+@@ -134,7 +134,7 @@ Synonymous with
+ 
+ .SH AUTHOR
+ .B menhir
+-was written by François Pottier and Yann Régis-Gianas.
++was written by Fran\(,cois Pottier and Yann R\('egis-Gianas.
+ .PP
+ This manual page was written by Samuel Mimram <smimram at debian.org>,
+ for the Debian project (but may be used by others).
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 112ed86..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-manpage
diff --git a/debian/patches/manpage.dpatch b/debian/patches/manpage.dpatch
deleted file mode 100755
index e1995e6..0000000
--- a/debian/patches/manpage.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## manpage.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove some invalid characters.
-
- at DPATCH@
-diff -urNad menhir-20060615~/menhir.1 menhir-20060615/menhir.1
---- menhir-20060615~/menhir.1	2006-06-15 07:26:06.000000000 +0000
-+++ menhir-20060615/menhir.1	2006-06-24 19:25:19.000000000 +0000
-@@ -119,7 +119,7 @@
- 
- .SH AUTHOR
- .B menhir
--was written by François Pottier and Yann Régis-Gianas.
-+was written by Fran\(,cois Pottier and Yann R\('egis-Gianas.
- .PP
- This manual page was written by Samuel Mimram <smimram at debian.org>,
- 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..a1baaf9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Remove-some-invalid-characters.patch
diff --git a/debian/rules b/debian/rules
index 7793294..7176c47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,4 +17,4 @@ override_dh_auto_install:
 	cp src/menhir.$(OCAML_BEST) $(DESTDIR)/usr/bin/menhir
 
 %:
-	dh --with ocaml $@
+	dh --with quilt,ocaml $@

-- 
menhir packaging