[apr] 02/04: Switch to 1.5.2
Stefan Fritsch
sf at moszumanska.debian.org
Sat Aug 15 14:48:12 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 98f46ef74134ef074e8512faf92dea2cb0398537
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Sat Aug 15 13:16:10 2015 +0200
Switch to 1.5.2
- add changelog entry
- refresh some patches
- remove obsolete patch debian/patches/buildfix_r1589984
---
debian/changelog | 6 ++++++
debian/patches/buildfix_r1589984 | 30 ------------------------------
debian/patches/fix_doxygen.patch | 10 +++-------
debian/patches/hurd_path_max.patch | 4 +---
debian/patches/hurd_shm_flock.patch | 8 +++-----
debian/patches/series | 1 -
debian/patches/ship_find_apr.m4.patch | 4 +---
7 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a17cd07..dd6b6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apr (1.5.2-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+
+ -- Stefan Fritsch <sf at debian.org> Sat, 15 Aug 2015 13:10:09 +0200
+
apr (1.5.1-3) unstable; urgency=medium
[Helmut Grohne]
diff --git a/debian/patches/buildfix_r1589984 b/debian/patches/buildfix_r1589984
deleted file mode 100644
index fcc57e7..0000000
--- a/debian/patches/buildfix_r1589984
+++ /dev/null
@@ -1,30 +0,0 @@
-#commit 08f46e7b670a6b2d09436f8f852db9d63de88297
-#Author: Jeff Trawick <trawick at apache.org>
-#Date: Fri Apr 25 10:51:11 2014 +0000
-#
-# Merge 1589982 from trunk:
-#
-# Avoid remaking gen_test_char and the library unnecessarily.
-#
-#
-# git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1589984 13f79535-47bb-0310-9956-ffa450edef68
-#
-Index: apr/Makefile.in
-===================================================================
---- apr.orig/Makefile.in
-+++ apr/Makefile.in
-@@ -138,11 +138,11 @@ check: $(TARGET_LIB)
- etags:
- etags `find . -name '*.[ch]'`
-
--make_tools_dir:
-+OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
-+tools/gen_test_char.lo: tools/gen_test_char.c
- $(APR_MKDIR) tools
-+ $(LT_COMPILE)
-
--OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
--tools/gen_test_char.lo: make_tools_dir
- tools/gen_test_char at EXEEXT@: $(OBJECTS_gen_test_char)
- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
-
diff --git a/debian/patches/fix_doxygen.patch b/debian/patches/fix_doxygen.patch
index 8e759d2..e4c45f8 100644
--- a/debian/patches/fix_doxygen.patch
+++ b/debian/patches/fix_doxygen.patch
@@ -6,8 +6,6 @@ Subject: Fix generation of docs for out-of-tree builds and newer doxygen version
include/apr.h.in | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
-Index: apr/docs/doxygen.conf
-===================================================================
--- apr.orig/docs/doxygen.conf
+++ apr/docs/doxygen.conf
@@ -1,6 +1,6 @@
@@ -18,11 +16,9 @@ Index: apr/docs/doxygen.conf
QUIET=YES
RECURSIVE=YES
FILE_PATTERNS=*.h
-Index: apr/include/apr.h.in
-===================================================================
--- apr.orig/include/apr.h.in
+++ apr/include/apr.h.in
-@@ -445,11 +445,11 @@
+@@ -445,11 +445,11 @@ typedef apr_uint32_t apr_uin
/**
* Thread callbacks from APR functions must be declared with APR_THREAD_FUNC,
* so that they follow the platform's calling convention.
@@ -38,7 +34,7 @@ Index: apr/include/apr.h.in
*/
#define APR_THREAD_FUNC @apr_thread_func@
-@@ -481,11 +481,11 @@
+@@ -483,11 +483,11 @@ typedef apr_uint32_t apr_uin
* APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
* @see APR_DECLARE @see APR_DECLARE_DATA
* @remark Both the declaration and implementations must use the same macro.
@@ -54,7 +50,7 @@ Index: apr/include/apr.h.in
*/
#define APR_DECLARE_NONSTD(type) type
-@@ -496,12 +496,12 @@
+@@ -498,12 +498,12 @@ typedef apr_uint32_t apr_uin
* @remark Note that the declaration and implementations use different forms,
* but both must include the macro.
*
diff --git a/debian/patches/hurd_path_max.patch b/debian/patches/hurd_path_max.patch
index b723dc5..c920a41 100644
--- a/debian/patches/hurd_path_max.patch
+++ b/debian/patches/hurd_path_max.patch
@@ -5,11 +5,9 @@ Subject: #349418
include/apr.h.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: apr/include/apr.h.in
-===================================================================
--- apr.orig/include/apr.h.in
+++ apr/include/apr.h.in
-@@ -594,7 +594,8 @@
+@@ -610,7 +610,8 @@ typedef int apr_wait_t;
#elif defined(_POSIX_PATH_MAX)
#define APR_PATH_MAX _POSIX_PATH_MAX
#else
diff --git a/debian/patches/hurd_shm_flock.patch b/debian/patches/hurd_shm_flock.patch
index 312e085..84f0f39 100644
--- a/debian/patches/hurd_shm_flock.patch
+++ b/debian/patches/hurd_shm_flock.patch
@@ -8,11 +8,9 @@ Bug: #656880
# upstream inclusion. (As you can guess, ideally all of those
# non-working methods should be ideally fixed in Hurd...)
-Index: apr/configure.in
-===================================================================
--- apr.orig/configure.in
+++ apr/configure.in
-@@ -1188,6 +1188,13 @@
+@@ -1213,6 +1213,13 @@ case $host in
APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON)
;;
esac
@@ -26,7 +24,7 @@ Index: apr/configure.in
APR_END_DECISION
AC_DEFINE_UNQUOTED($ac_decision)
-@@ -1256,6 +1263,13 @@
+@@ -1286,6 +1293,13 @@ case $host in
fi
;;
esac
@@ -40,7 +38,7 @@ Index: apr/configure.in
APR_END_DECISION
AC_DEFINE_UNQUOTED($ac_decision)
-@@ -2215,6 +2229,12 @@
+@@ -2262,6 +2276,12 @@ APR_IFALLYES(header:OS.h func:create_sem
if test "x$apr_lock_method" != "x"; then
APR_DECISION_FORCE($apr_lock_method)
fi
diff --git a/debian/patches/series b/debian/patches/series
index 2a43196..4f509ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@ fix_doxygen.patch
omit_extra_libs.patch
hurd_shm_flock.patch
dont_override_external_buildflags
-buildfix_r1589984
libtoolize_check.patch
diff --git a/debian/patches/ship_find_apr.m4.patch b/debian/patches/ship_find_apr.m4.patch
index d3bcd0f..0393970 100644
--- a/debian/patches/ship_find_apr.m4.patch
+++ b/debian/patches/ship_find_apr.m4.patch
@@ -5,11 +5,9 @@ Subject: Install a set of random build files too
Makefile.in | 9 +++++++++
1 file changed, 9 insertions(+)
-Index: apr/Makefile.in
-===================================================================
--- apr.orig/Makefile.in
+++ apr/Makefile.in
-@@ -90,6 +90,15 @@
+@@ -92,6 +92,15 @@ install: $(TARGETS)
done
$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
--
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