[Pkg-ocaml-maint-commits] [menhir] 05/06: Refresh patches

Mehdi Dogguy mehdi at moszumanska.debian.org
Sun Jul 19 22:13:30 UTC 2015


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

mehdi pushed a commit to branch master
in repository menhir.

commit 4611a663ea135f16d3e62ed8bbbb4b0ea6e5075f
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Jul 20 00:00:00 2015 +0000

    Refresh patches
---
 debian/patches/0001-Remove-some-invalid-characters.patch         | 3 +--
 .../patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch  | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0001-Remove-some-invalid-characters.patch b/debian/patches/0001-Remove-some-invalid-characters.patch
index 88810f9..d5dba8d 100644
--- a/debian/patches/0001-Remove-some-invalid-characters.patch
+++ b/debian/patches/0001-Remove-some-invalid-characters.patch
@@ -3,7 +3,7 @@ Date: Wed, 23 Sep 2009 18:55:38 +0200
 Subject: Remove some invalid characters
 
 ---
- menhir.1 |    2 +-
+ menhir.1 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/menhir.1 b/menhir.1
@@ -19,4 +19,3 @@ index e241b91..ac2940c 100644
  .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-Use-CURDIR-instead-of-.-during-bootstrap.patch b/debian/patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch
index 838fa09..2c04b61 100644
--- a/debian/patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch
+++ b/debian/patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch
@@ -3,20 +3,19 @@ Date: Thu, 27 Mar 2014 20:45:19 +0100
 Subject: Use CURDIR instead of '.' during bootstrap
 
 ---
- src/Makefile |    2 +-
+ src/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index cbf0388..a6b6f03 100644
+index 6fc070d..599fc4e 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -60,7 +60,7 @@ stage1:
  # Stage 2.
  # Build Menhir using Menhir (from stage 1).
  
--FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --error-recovery --stdlib . --strict --fixed-exception
-+FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --error-recovery --stdlib $(CURDIR) --strict --fixed-exception
+-FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --stdlib . --strict --fixed-exception
++FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --stdlib $(CURDIR) --strict --fixed-exception
  
  stage2:
  	@$(OCAMLBUILD) -build-dir _stage2 -tag fancy_parser \
--- 

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



More information about the Pkg-ocaml-maint-commits mailing list