[Pkg-ocaml-maint-commits] [menhir] 04/06: drop patches which are applied upstream

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository menhir.

commit 1107c8ec037b3b1d91504671968a898aed9c1889
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Nov 23 08:15:02 2017 +0100

    drop patches which are applied upstream
---
 debian/changelog                                   |  5 ++++-
 .../0001-Remove-some-invalid-characters.patch      | 21 ---------------------
 ...yte-plugin-to-ocamlbuild-when-TARGET-byte.patch | 22 ----------------------
 debian/patches/series                              |  2 --
 4 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6c5a84..36ff8b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 menhir (20171013-1) unstable; urgency=medium
 
   * New upstream version.
+    - drop patch Remove-some-invalid-characters which has been applied upstream
+    - drop patch Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte which has
+      been applied upstream
 
- -- Ralf Treinen <treinen at debian.org>  Thu, 23 Nov 2017 08:05:40 +0100
+ -- Ralf Treinen <treinen at debian.org>  Thu, 23 Nov 2017 08:14:21 +0100
 
 menhir (20170712-1) unstable; urgency=medium
 
diff --git a/debian/patches/0001-Remove-some-invalid-characters.patch b/debian/patches/0001-Remove-some-invalid-characters.patch
deleted file mode 100644
index d5dba8d..0000000
--- a/debian/patches/0001-Remove-some-invalid-characters.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Samuel Mimram <smimram at debian.org>
-Date: Wed, 23 Sep 2009 18:55:38 +0200
-Subject: Remove some invalid characters
-
----
- menhir.1 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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/0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch b/debian/patches/0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch
deleted file mode 100644
index 409d72a..0000000
--- a/debian/patches/0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Sun, 17 Jan 2016 21:10:32 +0100
-Subject: Pass -byte-plugin to ocamlbuild when TARGET=byte
-
----
- src/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: menhir/src/Makefile
-===================================================================
---- menhir.orig/src/Makefile	2017-06-19 21:33:31.354898652 +0200
-+++ menhir/src/Makefile	2017-06-19 21:36:02.847858660 +0200
-@@ -11,6 +11,9 @@
- # Ocamlbuild tool and settings.
- 
- OCAMLBUILD := ocamlbuild -classic-display -j 0
-+ifeq ($(TARGET),byte)
-+OCAMLBUILD := $(OCAMLBUILD) -byte-plugin
-+endif
- 
- # ----------------------------------------------------------------------------
- # For everyday development.
diff --git a/debian/patches/series b/debian/patches/series
index 8abc548..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-0001-Remove-some-invalid-characters.patch
-0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/menhir.git