[apr] 01/01: Merge tag 'debian/1.5.2-3'
Stefan Fritsch
sf at moszumanska.debian.org
Fri Aug 21 18:01:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
sf pushed a commit to branch master
in repository apr.
commit 980f04c53d031f895f5bfef03503e97ad44a938e
Merge: 096b814 c102aa3
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Fri Aug 21 19:59:29 2015 +0200
Merge tag 'debian/1.5.2-3'
This was by accident not pushed to master.
Conflicts:
debian/changelog
debian/changelog | 16 +++++++++++-----
debian/patches/series | 1 +
debian/patches/use_fcntl_locking.patch | 22 ++++++++++++++++++++++
3 files changed, 34 insertions(+), 5 deletions(-)
diff --cc debian/changelog
index 082584d,a5a1e9a..5251d0c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,19 @@@
- apr (1.5.2-3) UNRELEASED; urgency=medium
-
- [ Stefan Fritsch ]
- * Add debug output for strange test failure on reproducible.debian.net.
++apr (1.5.2-4) UNRELEASED; urgency=medium
+
+ [ Jean-Michel Vourgère ]
+ * Update Vcs-Browser: address.
+ * d/watch: Check gpg signature of upstream source.
+
- -- Stefan Fritsch <sf at debian.org> Thu, 20 Aug 2015 09:13:40 +0200
++ -- Stefan Fritsch <sf at debian.org> Fri, 21 Aug 2015 20:00:57 +0200
++
+ apr (1.5.2-3) unstable; urgency=medium
+
+ * Use flock for apr_file_lock()/_unlock(). This has the advantage that
+ the lock is per FD and not per process. On the other hand, locking over
+ NFS may not work any more for non-Linux kernels. Closes: #752872
+ * Add debug output for strange test failure on reproducible.debian.net.
+
+ -- Stefan Fritsch <sf at debian.org> Thu, 20 Aug 2015 13:47:59 +0200
apr (1.5.2-2) unstable; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git
More information about the Pkg-apache-commits
mailing list