This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocamlnet.
commit 95f2baa1efc073373ff5a1053251f1900e389c74
Author: Stephane Glondu <st...@glondu.net>
Date: Thu Jul 20 22:02:43 2017 +0200
Put Dimitri's patch in git format
---
...p-cmx-files-to-fix-reverse-depends-FTBFS.patch} | 62 ++++++++++++----------
debian/patches/series | 2 +-
2 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/debian/patches/ship-cmx.patch
b/debian/patches/0008-Ship-cmx-files-to-fix-reverse-depends-FTBFS.patch
similarity index 61%
rename from debian/patches/ship-cmx.patch
rename to debian/patches/0008-Ship-cmx-files-to-fix-reverse-depends-FTBFS.patch
index 70640e5..bd6485a 100644
--- a/debian/patches/ship-cmx.patch
+++ b/debian/patches/0008-Ship-cmx-files-to-fix-reverse-depends-FTBFS.patch
@@ -1,11 +1,19 @@
-Description: Ship cmx files to fix reverse-depends FTBFS
-Author: Dimitri John Ledkov <x...@ubuntu.com
+From: Dimitri John Ledkov <x...@ubuntu.com>
+Date: Thu, 20 Jul 2017 22:00:51 +0200
+Subject: Ship cmx files to fix reverse-depends FTBFS
-Index: ocamlnet-4.1.2/Makefile.rules
-===================================================================
---- ocamlnet-4.1.2.orig/Makefile.rules
-+++ ocamlnet-4.1.2/Makefile.rules
-@@ -158,7 +158,7 @@ realuninstall: $(UNINSTOTHER) uninstall-
+---
+ Makefile.rules | 2 +-
+ src/netcgi2-apache/Makefile.pre | 2 ++
+ src/netsys/Makefile.pre | 1 +
+ src/netunidata/Makefile.pre | 7 ++++++-
+ 4 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.rules b/Makefile.rules
+index 1eb01bc..5c99b70 100644
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -158,7 +158,7 @@ realuninstall: $(UNINSTOTHER) uninstall-$(INSTMETHOD)
.PHONY: install-findlib
install-findlib: META
@@ -14,22 +22,10 @@ Index: ocamlnet-4.1.2/Makefile.rules
$(OCAMLFIND) install $(PKGNAME) $$files
.PHONY: uninstall-findlib
-Index: ocamlnet-4.1.2/src/netsys/Makefile.pre
-===================================================================
---- ocamlnet-4.1.2.orig/src/netsys/Makefile.pre
-+++ ocamlnet-4.1.2/src/netsys/Makefile.pre
-@@ -9,6 +9,7 @@ INSTALL_EXTRA = netsys_oothr.cmo \
- netsys_oothr_mt_init.cmo \
- netsys_oothr_mt_init.cmx netsys_oothr_mt_init.o \
- netsys_oothr_mt_init.p.cmx netsys_oothr_mt_init.p.o \
-+ netsys_gprof_init.cmx netsys_gprof_init.o \
- netsys_gprof_init.p.cmx netsys_gprof_init.p.o \
- netsys_c_gprof.o \
- netsys_c_event.h \
-Index: ocamlnet-4.1.2/src/netcgi2-apache/Makefile.pre
-===================================================================
---- ocamlnet-4.1.2.orig/src/netcgi2-apache/Makefile.pre
-+++ ocamlnet-4.1.2/src/netcgi2-apache/Makefile.pre
+diff --git a/src/netcgi2-apache/Makefile.pre b/src/netcgi2-apache/Makefile.pre
+index d402e1c..f79306e 100644
+--- a/src/netcgi2-apache/Makefile.pre
++++ b/src/netcgi2-apache/Makefile.pre
@@ -7,6 +7,8 @@ PKGNAME = netcgi2-apache
GENERATE = config.h netcgi_apache_mod.ml META 500netcgi_apache.info
@@ -39,10 +35,22 @@ Index: ocamlnet-4.1.2/src/netcgi2-apache/Makefile.pre
mod_netcgi_apache.so
PP_OPTIONS = -pp "$(CPPO) $(PP_BYTES) $(PP_DEPRECATED)"
-Index: ocamlnet-4.1.2/src/netunidata/Makefile.pre
-===================================================================
---- ocamlnet-4.1.2.orig/src/netunidata/Makefile.pre
-+++ ocamlnet-4.1.2/src/netunidata/Makefile.pre
+diff --git a/src/netsys/Makefile.pre b/src/netsys/Makefile.pre
+index 471a519..ff0564d 100644
+--- a/src/netsys/Makefile.pre
++++ b/src/netsys/Makefile.pre
+@@ -9,6 +9,7 @@ INSTALL_EXTRA = netsys_oothr.cmo \
+ netsys_oothr_mt_init.cmo \
+ netsys_oothr_mt_init.cmx netsys_oothr_mt_init.o \
+ netsys_oothr_mt_init.p.cmx netsys_oothr_mt_init.p.o \
++ netsys_gprof_init.cmx netsys_gprof_init.o \
+ netsys_gprof_init.p.cmx netsys_gprof_init.p.o \
+ netsys_c_gprof.o \
+ netsys_c_event.h \
+diff --git a/src/netunidata/Makefile.pre b/src/netunidata/Makefile.pre
+index 4b5114b..66155a4 100644
+--- a/src/netunidata/Makefile.pre
++++ b/src/netunidata/Makefile.pre
@@ -26,7 +26,12 @@ OTHER_MAPPINGS = mappings/cp*.unimap \
INSTOTHER = install-netdb
PACKLIST = netdb-packlist
diff --git a/debian/patches/series b/debian/patches/series
index 3943700..8256b1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@
0005-Fix-upstream-cleaning-rules.patch
0006-Fix-compilation-of-Apache-module.patch
0007-Fix-distclean-target.patch
-ship-cmx.patch
+0008-Ship-cmx-files-to-fix-reverse-depends-FTBFS.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
