[Pkg-apache-commits] r1126 - in /trunk/apr: changelog control rules symbols.common symbols.hurd symbols.kfreebsd symbols.linux symbols.with-sendfile symbols.without-sendfile

sf at alioth.debian.org sf at alioth.debian.org
Thu Jan 28 19:27:39 UTC 2010 

Author: sf
Date: Thu Jan 28 19:27:22 2010
New Revision: 1126

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1126
Log:
* Fix FTBFS on kfreebsd: Create os specific symbols file: With *_epoll on                           
  linux, with *_kqueue on kfreebsd, with neither on hurd.                                           
* Bump Standards-Version:                                                                           
  - In the rules file, use the DEB_*_ARCH* instead of the DEB_*_GNU*                                
    variables, where applicable.                                                                    

Added:
    trunk/apr/symbols.hurd
    trunk/apr/symbols.kfreebsd
      - copied, changed from r1121, trunk/apr/symbols.without-sendfile
    trunk/apr/symbols.linux
      - copied, changed from r1121, trunk/apr/symbols.with-sendfile
Removed:
    trunk/apr/symbols.with-sendfile
    trunk/apr/symbols.without-sendfile
Modified:
    trunk/apr/changelog
    trunk/apr/control
    trunk/apr/rules
    trunk/apr/symbols.common

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=1126&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Thu Jan 28 19:27:22 2010
@@ -1,3 +1,13 @@
+apr (1.4.2-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS on kfreebsd: Create os specific symbols file: With *_epoll on
+    linux, with *_kqueue on kfreebsd, with neither on hurd.
+  * Bump Standards-Version:
+    - In the rules file, use the DEB_*_ARCH* instead of the DEB_*_GNU*
+      variables, where applicable.
+
+ -- Stefan Fritsch <sf at debian.org>  Thu, 28 Jan 2010 19:47:48 +0100
+
 apr (1.4.2-1) experimental; urgency=low
 
   [ Stefan Fritsch ]

Modified: trunk/apr/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/control?rev=1126&op=diff
==============================================================================
--- trunk/apr/control (original)
+++ trunk/apr/control Thu Jan 28 19:27:22 2010
@@ -4,7 +4,7 @@
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Tollef Fog Heen <tfheen at debian.org>, Peter Samuelson <peter at p12n.org>, Stefan Fritsch <sf at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>
 Build-Depends: debhelper (>> 6.0.7), autoconf, autotools-dev, dpatch, mawk, uuid-dev, doxygen, netbase, net-tools, libtool, python
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apr
 Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apr
 Homepage: http://apr.apache.org/

Modified: trunk/apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/rules?rev=1126&op=diff
==============================================================================
--- trunk/apr/rules (original)
+++ trunk/apr/rules Thu Jan 28 19:27:22 2010
@@ -10,10 +10,10 @@
 # # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 DEB_BUILD_ARCH       ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 
-BUILDDIR := build-$(DEB_HOST_GNU_TYPE)
+BUILDDIR := build-$(DEB_BUILD_ARCH)
 
 CFLAGS := $(CFLAGS) -pipe -Wall -g
 
@@ -58,7 +58,7 @@
 endif
 
 # disable tests on hurd until they are fixed (#530286)
-ifeq (gnu, $(DEB_BUILD_GNU_SYSTEM))
+ifeq (hurd, $(DEB_BUILD_ARCH_OS))
 	TEST_TARGET =
 endif
 
@@ -77,7 +77,7 @@
 	gcc -I$(CURDIR)/include -I$(BUILDDIR)/include `$(BUILDDIR)/apr-1-config --cppflags` -o debian/ino_t_test debian/ino_t_test.c
 	debian/ino_t_test
 	rm -f debian/ino_t_test
-ifeq (gnu, $(DEB_BUILD_GNU_SYSTEM))
+ifeq (hurd, $(DEB_BUILD_ARCH_OS))
 	# multicast not supported on Hurd
 	sed -i '/HAVE_STRUCT_IPMREQ/ d' $(BUILDDIR)/include/arch/unix/apr_private.h
 endif
@@ -128,8 +128,6 @@
 
 binary-indep: build install
 
-WITH_OR_WITHOUT_SENDFILE=$(shell dpkg --print-architecture | grep -q kfreebsd && echo without || echo with)
-
 binary-arch: build install
 	dh_testdir
 	dh_testroot
@@ -142,7 +140,7 @@
 	dh_lintian
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -- -Idebian/symbols.$(WITH_OR_WITHOUT_SENDFILE)-sendfile
+	dh_makeshlibs -- -Idebian/symbols.$(DEB_BUILD_ARCH_OS)
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

Modified: trunk/apr/symbols.common
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/symbols.common?rev=1126&op=diff
==============================================================================
--- trunk/apr/symbols.common (original)
+++ trunk/apr/symbols.common Thu Jan 28 19:27:22 2010
@@ -232,7 +232,6 @@
  apr_pollcb_create at Base 1.3.2
  apr_pollcb_create_ex at Base 1.4.2
  apr_pollcb_poll at Base 1.3.2
- apr_pollcb_provider_epoll at Base 1.4.2
  apr_pollcb_provider_poll at Base 1.4.2
  apr_pollcb_remove at Base 1.3.2
  apr_pollset_add at Base 1.2.7
@@ -242,7 +241,6 @@
  apr_pollset_drain_wakeup_pipe at Base 1.4.2
  apr_pollset_method_name at Base 1.4.2
  apr_pollset_poll at Base 1.2.7
- apr_pollset_provider_epoll at Base 1.4.2
  apr_pollset_provider_poll at Base 1.4.2
  apr_pollset_provider_select at Base 1.4.2
  apr_pollset_remove at Base 1.2.7

Added: trunk/apr/symbols.hurd
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/symbols.hurd?rev=1126&op=file
==============================================================================
--- trunk/apr/symbols.hurd (added)
+++ trunk/apr/symbols.hurd Thu Jan 28 19:27:22 2010
@@ -1,0 +1,2 @@
+#include "symbols.common"
+ apr_socket_sendfile at Base 1.2.7

Copied: trunk/apr/symbols.kfreebsd (from r1121, trunk/apr/symbols.without-sendfile)
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/symbols.kfreebsd?rev=1126&op=diff
==============================================================================
--- trunk/apr/symbols.without-sendfile (original)
+++ trunk/apr/symbols.kfreebsd Thu Jan 28 19:27:22 2010
@@ -1,1 +1,3 @@
 #include "symbols.common"
+ apr_pollcb_provider_kqueue at Base 1.4.2
+ apr_pollset_provider_kqueue at Base 1.4.2

Copied: trunk/apr/symbols.linux (from r1121, trunk/apr/symbols.with-sendfile)
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/symbols.linux?rev=1126&op=diff
==============================================================================
--- trunk/apr/symbols.with-sendfile (original)
+++ trunk/apr/symbols.linux Thu Jan 28 19:27:22 2010
@@ -1,2 +1,4 @@
 #include "symbols.common"
  apr_socket_sendfile at Base 1.2.7
+ apr_pollcb_provider_epoll at Base 1.4.2
+ apr_pollset_provider_epoll at Base 1.4.2

More information about the Pkg-apache-commits mailing list