[Pkg-ocaml-maint-commits] [perl4caml] 06/09: Refresh patches
Stéphane Glondu
glondu at moszumanska.debian.org
Wed Jul 19 09:36:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository perl4caml.
commit 0d58f68702ab8522f82093fbc6870b510e39c721
Author: Stephane Glondu <steph at glondu.net>
Date: Wed Jul 19 11:18:53 2017 +0200
Refresh patches
---
debian/patches/0001-Fix-Makefile-to-detect-ocamlopt.patch | 7 +++----
debian/patches/0001-Fix-use-of-CAMLparam-etc-macros.patch | 6 +-----
debian/patches/0002-Disable-libnet-google-perl-wrappers.patch | 7 +++----
debian/patches/0003-Fix-for-Perl-5.12-SVt_RV-missing.patch | 7 +++----
4 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/debian/patches/0001-Fix-Makefile-to-detect-ocamlopt.patch b/debian/patches/0001-Fix-Makefile-to-detect-ocamlopt.patch
index 00bf9f9..fb91a43 100644
--- a/debian/patches/0001-Fix-Makefile-to-detect-ocamlopt.patch
+++ b/debian/patches/0001-Fix-Makefile-to-detect-ocamlopt.patch
@@ -1,12 +1,12 @@
From: Mike Furr <mfurr at debian.org>
Date: Wed, 4 May 2005 02:28:31 +0000
-Subject: [PATCH] Fix Makefile to detect ocamlopt
+Subject: Fix Makefile to detect ocamlopt
Signed-off-by: Mike Furr <mfurr at debian.org>
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- Makefile | 29 ++++++++++++++++++++++++++---
- 1 files changed, 26 insertions(+), 3 deletions(-)
+ Makefile | 29 ++++++++++++++++++++++++++---
+ 1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 4827101..f79b054 100644
@@ -83,4 +83,3 @@ index 4827101..f79b054 100644
-.PHONY: depend dist check-manifest html dpkg test run-tests
\ No newline at end of file
+.PHONY: depend dist check-manifest html dpkg test run-tests
---
diff --git a/debian/patches/0001-Fix-use-of-CAMLparam-etc-macros.patch b/debian/patches/0001-Fix-use-of-CAMLparam-etc-macros.patch
index e04c7e5..19f0262 100644
--- a/debian/patches/0001-Fix-use-of-CAMLparam-etc-macros.patch
+++ b/debian/patches/0001-Fix-use-of-CAMLparam-etc-macros.patch
@@ -1,7 +1,6 @@
-From 36b9a44ab49471646b7a3548d1e2d28c015063ad Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Sun, 6 Nov 2016 19:09:58 +0000
-Subject: [PATCH] Fix use of CAMLparam etc macros.
+Subject: Fix use of CAMLparam etc macros.
This was broken previously, and OCaml 4.04 revealed it.
---
@@ -36,6 +35,3 @@ index 66f2959..ce53667 100644
}
CAMLprim value
---
-2.7.4
-
diff --git a/debian/patches/0002-Disable-libnet-google-perl-wrappers.patch b/debian/patches/0002-Disable-libnet-google-perl-wrappers.patch
index f53108e..364db74 100644
--- a/debian/patches/0002-Disable-libnet-google-perl-wrappers.patch
+++ b/debian/patches/0002-Disable-libnet-google-perl-wrappers.patch
@@ -1,13 +1,13 @@
From: Stephane Glondu <steph at glondu.net>
Date: Fri, 9 Oct 2009 12:10:20 +0200
-Subject: [PATCH] Disable libnet-google-perl wrappers
+Subject: Disable libnet-google-perl wrappers
As a consequence of #550329, see also #409163.
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- Makefile | 16 +++++++---------
- 1 files changed, 7 insertions(+), 9 deletions(-)
+ Makefile | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index f79b054..298451d 100644
@@ -52,4 +52,3 @@ index f79b054..298451d 100644
rm -rf html
mkdir html
-$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $^
---
diff --git a/debian/patches/0003-Fix-for-Perl-5.12-SVt_RV-missing.patch b/debian/patches/0003-Fix-for-Perl-5.12-SVt_RV-missing.patch
index bab3c38..83943d6 100644
--- a/debian/patches/0003-Fix-for-Perl-5.12-SVt_RV-missing.patch
+++ b/debian/patches/0003-Fix-for-Perl-5.12-SVt_RV-missing.patch
@@ -1,6 +1,6 @@
From: Iain Arnell <iarnell at gmail.com>
Date: Wed, 2 Jun 2010 17:34:43 +0100
-Subject: [PATCH] Fix for Perl 5.12: SVt_RV missing.
+Subject: Fix for Perl 5.12: SVt_RV missing.
Also reported as the following Debian bug:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578800
@@ -13,8 +13,8 @@ Commit taken from upstream Git repository.
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- perl_c.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ perl_c.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
diff --git a/perl_c.c b/perl_c.c
index 7970a81..66f2959 100644
@@ -48,4 +48,3 @@ index 7970a81..66f2959 100644
case SVt_PVMG:
break;
default:
---
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/perl4caml.git
More information about the Pkg-ocaml-maint-commits
mailing list