[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-2-103-g3e5239c

Arno Töll arno at debian.org
Thu May 30 23:57:11 UTC 2013


The following commit has been merged in the master branch:
commit 3e5239c851ab7ced45990b3b594936b79e7f33b8
Author: Arno Töll <arno at debian.org>
Date:   Fri May 31 01:56:49 2013 +0200

    Use the -lcap hack on kfreebsd, too

diff --git a/debian/changelog b/debian/changelog
index 028e2a6..809ec66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apache2 (2.4.4-5) UNRELEASED; urgency=low
+
+  * Fix compile issue on kfreebsd. leaves itk still broken on kfreebsd on
+    hurd, but that's ok. There are alternative MPMs left. Moreover, we are
+    likely to split itk to a separate source soon
+
+ -- Arno Töll <arno at debian.org>  Fri, 31 May 2013 01:33:04 +0200
+
 apache2 (2.4.4-4) unstable; urgency=low
 
   [ Stefan Fritsch ]
diff --git a/debian/rules b/debian/rules
index 228701c..2a16e51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,9 +86,12 @@ override_dh_auto_configure: generate-maintainer-scripts prebuild-checks server/m
 		--enable-mods-static="unixd logio watchdog version" \
 		CFLAGS="$(AP2_CFLAGS)" CPPFLAGS="$(AP2_CPPFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" \
 		$(AP2_EXTRAFLAGS)
-ifneq (hurd, $(DEB_BUILD_ARCH_OS))
+
+
+ifneq ($(DEB_HOST_ARCH_OS),linux)
 	# XXX Hack to make mod_mpm_itk.so link against libcap until we
 	# XXX move itk to a separate package
+	echo "$(DEB_HOST_ARCH_OS): weird arch: removing -lcap"
 	perl -p -i -e 's/(-avoid-version)/$$1 -lcap/' server/mpm/itk/modules.mk
 endif
 

-- 
Debian packaging for apache2



More information about the Pkg-apache-commits mailing list