This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocamlnet.
commit 29699e4869ed4ef10191d834b5268e6514d82db7
Author: Dimitri John Ledkov <x...@ubuntu.com>
Date: Mon Jul 10 11:45:59 2017 +0000
Import Debian changes 4.1.2-1ubuntu2
ocamlnet (4.1.2-1ubuntu2) artful; urgency=medium
* Revert previous patch. Building with opaque doesn't resolve
approx FTBFS. Ship cmx files instead.
ocamlnet (4.1.2-1ubuntu1) artful; urgency=medium
* Import upstream patch to build with opaque files, instead of
installing cmx files. Should fix approx FTBFS.
ocamlnet (4.1.2-1build2) artful; urgency=high
* No change rebuild against ocaml 4.04.
ocamlnet (4.1.2-1build1) zesty; urgency=medium
* Rebuild against new OCaml ABI.
---
.gitignore | 1 -
debian/changelog | 26 +++++++++++++++++++
debian/control | 3 ++-
debian/patches/series | 1 +
debian/patches/ship-cmx.patch | 59 +++++++++++++++++++++++++++++++++++++++++++
debian/source/local-options | 2 --
src/rpc-generator/config.ml | 1 +
7 files changed, 89 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 845ca06..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.pc
diff --git a/debian/changelog b/debian/changelog
index d186c81..add4e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+ocamlnet (4.1.2-1ubuntu2) artful; urgency=medium
+
+ * Revert previous patch. Building with opaque doesn't resolve
+ approx FTBFS. Ship cmx files instead.
+
+ -- Dimitri John Ledkov <x...@ubuntu.com> Mon, 10 Jul 2017 11:45:59 +0000
+
+ocamlnet (4.1.2-1ubuntu1) artful; urgency=medium
+
+ * Import upstream patch to build with opaque files, instead of
+ installing cmx files. Should fix approx FTBFS.
+
+ -- Dimitri John Ledkov <x...@ubuntu.com> Sat, 08 Jul 2017 10:12:37 +0100
+
+ocamlnet (4.1.2-1build2) artful; urgency=high
+
+ * No change rebuild against ocaml 4.04.
+
+ -- Dimitri John Ledkov <x...@ubuntu.com> Fri, 30 Jun 2017 14:52:31 +0100
+
+ocamlnet (4.1.2-1build1) zesty; urgency=medium
+
+ * Rebuild against new OCaml ABI.
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 21 Dec 2016
15:11:33 +0100
+
ocamlnet (4.1.2-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/control b/debian/control
index 228aa2a..12348b8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: ocamlnet
Section: ocaml
Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OCaml Maintainers
<debian-ocaml-ma...@lists.debian.org>
Uploaders:
Stéphane Glondu <glo...@debian.org>
Build-Depends:
diff --git a/debian/patches/series b/debian/patches/series
index 53a382f..3943700 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-Fix-upstream-cleaning-rules.patch
0006-Fix-compilation-of-Apache-module.patch
0007-Fix-distclean-target.patch
+ship-cmx.patch
diff --git a/debian/patches/ship-cmx.patch b/debian/patches/ship-cmx.patch
new file mode 100644
index 0000000..70640e5
--- /dev/null
+++ b/debian/patches/ship-cmx.patch
@@ -0,0 +1,59 @@
+Description: Ship cmx files to fix reverse-depends FTBFS
+Author: Dimitri John Ledkov <x...@ubuntu.com
+
+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-
+
+ .PHONY: install-findlib
+ install-findlib: META
+- files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a dll* META
$(INSTALL_EXTRA)` && \
++ files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmx *.cmxa *.a dll* META
$(INSTALL_EXTRA)` && \
+ $(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
+@@ -7,6 +7,8 @@ PKGNAME = netcgi2-apache
+ GENERATE = config.h netcgi_apache_mod.ml META 500netcgi_apache.info
+
+ INSTALL_EXTRA = netcgi_modtpl.cma 500netcgi_apache.info \
++ netcgi_apache_mod.cmx netcgi_apache_mod.o \
++ netcgi_apache_mod.p.cmx netcgi_apache_mod.p.o \
+ 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
+@@ -26,7 +26,12 @@ OTHER_MAPPINGS = mappings/cp*.unimap \
+ INSTOTHER = install-netdb
+ PACKLIST = netdb-packlist
+ INSTALL_EXTRA = $(MAPPINGS:.ml=.cmo) $(MAPPINGS:.ml=.cmx) $(MAPPINGS:.ml=.o) \
+- netuniinit.cmo netuniinit.cmx netuniinit.o
++ netuniinit.cmo netuniinit.cmx netuniinit.o \
++ netmappings_iso.p.cmx netmappings_iso.p.o \
++ netmappings_jp.p.cmx netmappings_jp.p.o \
++ netmappings_kr.p.cmx netmappings_kr.p.o \
++ netmappings_other.p.cmx netmappings_other.p.o \
++ netuniinit.p.cmx netuniinit.p.o
+
+ PP_OPTIONS = -pp "$(CPPO) $(PP_BYTES) $(PP_DEPRECATED)"
+
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index c4cf480..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-abort-on-upstream-changes
-unapply-patches
diff --git a/src/rpc-generator/config.ml b/src/rpc-generator/config.ml
new file mode 100644
index 0000000..b713c9f
--- /dev/null
+++ b/src/rpc-generator/config.ml
@@ -0,0 +1 @@
+let cpp = "cpp";;
--
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
