[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-25-g476f73c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 476f73c6c6811f97bd3bb14ae0cbfae9287e38df
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 4 08:37:31 2013 +0200

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index f86dab4..a36eca1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 ocamlnet (3.6.4-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * Fix incorrect use of F_SETFL with FD_CLOEXEC, thanks to Guillem Jover
-    (Closes: #696279)
+    - remove patches that were merged upstream:
+      + Add-rpath-to-Apache-module,
+      + Link-against-the-PIC-version-of-libcamlrun
+    - fix incorrect use of F_SETFL with FD_CLOEXEC, thanks to Guillem Jover
+      (Closes: #696279)
+    - fix compilation with Apache 2.4
+  * Update packaging for Apache 2.4 transition (Closes: #666825)
   * Update copyright file and use format version 1.0
   * Bump Standards-Version to 3.9.4
 

-- 
ocamlnet packaging