[Pkg-apache-commits] [SCM] Debian packaging for the apr (Apache Portable Runtime) package branch, master, updated. 77ded69e10a5a7749932f9f19e12ba0275a1534f

Stefan Fritsch sf at sfritsch.de
Sat May 19 14:18:22 UTC 2012 

The following commit has been merged in the master branch:
commit e37bfbaf5697e1164e137ffa365f0480e6460ed3
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat May 19 15:51:12 2012 +0200

    refresh all patches

diff --git a/debian/patches/GNU_SOURCE_earlier.patch b/debian/patches/GNU_SOURCE_earlier.patch
old mode 100755
new mode 100644
index 025df8f..c77c81b
--- a/debian/patches/GNU_SOURCE_earlier.patch
+++ b/debian/patches/GNU_SOURCE_earlier.patch
@@ -2,9 +2,10 @@ From: Stefan Fritsch <sf at debian.org>
 Subject: _GNU_SOURCE needs to be #defined before #including stuff
 (causing FTBFS on hurd, #530286)
 
-diff -urNad trunk~/include/apr.h.in trunk/include/apr.h.in
---- trunk~/include/apr.h.in	2009-06-07 19:10:19.000000000 +0200
-+++ trunk/include/apr.h.in	2009-06-07 20:50:52.261954142 +0200
+Index: apr/include/apr.h.in
+===================================================================
+--- apr.orig/include/apr.h.in
++++ apr/include/apr.h.in
 @@ -33,6 +33,10 @@
   * for Win32 or Netware by those build environments, respectively.
   */
diff --git a/debian/patches/fix-apr.pc.patch b/debian/patches/fix-apr.pc.patch
index f2a6cd8..890b514 100644
--- a/debian/patches/fix-apr.pc.patch
+++ b/debian/patches/fix-apr.pc.patch
@@ -5,8 +5,10 @@ Subject: No description.
  apr.pc.in |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
---- a/apr.pc.in
-+++ b/apr.pc.in
+Index: apr/apr.pc.in
+===================================================================
+--- apr.orig/apr.pc.in
++++ apr/apr.pc.in
 @@ -7,5 +7,6 @@
  Name: APR
  Description: The Apache Portable Runtime library
diff --git a/debian/patches/fix_apr-config.patch b/debian/patches/fix_apr-config.patch
old mode 100755
new mode 100644
index c92dc5f..51b4aa3
--- a/debian/patches/fix_apr-config.patch
+++ b/debian/patches/fix_apr-config.patch
@@ -5,8 +5,10 @@ Subject: No description.
  apr-config.in |    8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
 
---- a/apr-config.in
-+++ b/apr-config.in
+Index: apr/apr-config.in
+===================================================================
+--- apr.orig/apr-config.in
++++ apr/apr-config.in
 @@ -39,7 +39,7 @@
  LIBS="@EXTRA_LIBS@"
  EXTRA_INCLUDES="@EXTRA_INCLUDES@"
diff --git a/debian/patches/fix_doxygen.patch b/debian/patches/fix_doxygen.patch
old mode 100755
new mode 100644
index 5942864..18dd7fe
--- a/debian/patches/fix_doxygen.patch
+++ b/debian/patches/fix_doxygen.patch
@@ -6,8 +6,10 @@ 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(-)
 
---- a/docs/doxygen.conf
-+++ b/docs/doxygen.conf
+Index: apr/docs/doxygen.conf
+===================================================================
+--- apr.orig/docs/doxygen.conf
++++ apr/docs/doxygen.conf
 @@ -1,6 +1,6 @@
  PROJECT_NAME="Apache Portable Runtime"
  
@@ -16,8 +18,10 @@ Subject: Fix generation of docs for out-of-tree builds and newer doxygen version
  QUIET=YES
  RECURSIVE=YES
  FILE_PATTERNS=*.h
---- a/include/apr.h.in
-+++ b/include/apr.h.in
+Index: apr/include/apr.h.in
+===================================================================
+--- apr.orig/include/apr.h.in
++++ apr/include/apr.h.in
 @@ -445,11 +445,11 @@
  /** 
   * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
diff --git a/debian/patches/hurd_path_max.patch b/debian/patches/hurd_path_max.patch
index e21040b..b723dc5 100644
--- a/debian/patches/hurd_path_max.patch
+++ b/debian/patches/hurd_path_max.patch
@@ -5,8 +5,10 @@ Subject: #349418
  include/apr.h.in |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
---- a/include/apr.h.in
-+++ b/include/apr.h.in
+Index: apr/include/apr.h.in
+===================================================================
+--- apr.orig/include/apr.h.in
++++ apr/include/apr.h.in
 @@ -594,7 +594,8 @@
  #elif defined(_POSIX_PATH_MAX)
  #define APR_PATH_MAX       _POSIX_PATH_MAX
diff --git a/debian/patches/omit_extra_libs.patch b/debian/patches/omit_extra_libs.patch
index b8b23f0..524602e 100644
--- a/debian/patches/omit_extra_libs.patch
+++ b/debian/patches/omit_extra_libs.patch
@@ -5,8 +5,10 @@ Subject: #463399
  apr-config.in |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/apr-config.in
-+++ b/apr-config.in
+Index: apr/apr-config.in
+===================================================================
+--- apr.orig/apr-config.in
++++ apr/apr-config.in
 @@ -36,7 +36,7 @@
  CPPFLAGS="@EXTRA_CPPFLAGS@"
  CFLAGS="@EXTRA_CFLAGS@"
diff --git a/debian/patches/sendfile_hurd.patch b/debian/patches/sendfile_hurd.patch
old mode 100755
new mode 100644
index e950acb..312edae
--- a/debian/patches/sendfile_hurd.patch
+++ b/debian/patches/sendfile_hurd.patch
@@ -5,8 +5,10 @@ Subject: No description.
  network_io/unix/sendrecv.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/network_io/unix/sendrecv.c
-+++ b/network_io/unix/sendrecv.c
+Index: apr/network_io/unix/sendrecv.c
+===================================================================
+--- apr.orig/network_io/unix/sendrecv.c
++++ apr/network_io/unix/sendrecv.c
 @@ -245,7 +245,7 @@
  /* Define a structure to pass in when we have a NULL header value */
  static apr_hdtr_t no_hdtr;
@@ -14,5 +16,5 @@ Subject: No description.
 -#if defined(__linux__) && defined(HAVE_WRITEV)
 +#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
  
- /* Helper function for apr_socket_sendfile.
-  * Takes care of sendfile vs. sendfile64 (must be detected at runtime),
+ apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
+                                  apr_hdtr_t *hdtr, apr_off_t *offset,
diff --git a/debian/patches/ship_find_apr.m4.patch b/debian/patches/ship_find_apr.m4.patch
old mode 100755
new mode 100644
index 7fd3971..d3bcd0f
--- a/debian/patches/ship_find_apr.m4.patch
+++ b/debian/patches/ship_find_apr.m4.patch
@@ -5,9 +5,11 @@ Subject: Install a set of random build files too
  Makefile.in |    9 +++++++++
  1 file changed, 9 insertions(+)
 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -87,6 +87,15 @@
+Index: apr/Makefile.in
+===================================================================
+--- apr.orig/Makefile.in
++++ apr/Makefile.in
+@@ -90,6 +90,15 @@
  	done
  	$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
  	$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)

-- 
Debian packaging for the apr (Apache Portable Runtime) package

More information about the Pkg-apache-commits mailing list