[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. fc27dba553cb0c1244ccfb1baba4041da16499c4

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit fc27dba553cb0c1244ccfb1baba4041da16499c4
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu Feb 16 02:40:03 2012 +0100

    We still need some awk for building, bug gawk is fine, too

diff --git a/debian/control b/debian/control
index a4aaf8d..df896d1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: httpd
 Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Stefan Fritsch <sf at debian.org>, Steinar H. Gunderson <sesse at debian.org>, Arno Töll <debian at toell.net>
-#missing dependencies: mawk, autoconf
+#missing dependencies: autoconf
 Build-Depends: debhelper (>= 8.1.0~), lsb-release, dpkg-dev (>= 1.16.1~),
  libaprutil1-dev (>= 1.4.0), libapr1-dev, libpcre3-dev, zlib1g-dev,
  libssl-dev (>= 0.9.8m), libcap-dev [linux-any],
- liblua5.1-0-dev, libxml2-dev, autotools-dev
+ liblua5.1-0-dev, libxml2-dev, autotools-dev, gawk | awk
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.2
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-apache/apache2.git
diff --git a/debian/rules b/debian/rules
index 07e398a..cdc462a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ AP2_CFLAGS = -pipe $(shell dpkg-buildflags --get CFLAGS)
 AP2_LDFLAGS = -Wl,--as-needed $(shell dpkg-buildflags --get LDFLAGS)
 AP2_CPPFLAGS = -DPLATFORM='\"$(LSB_RELEASE)\"' $(shell dpkg-buildflags --get CPPFLAGS)
 
-#CONFFLAGS += ac_cv_prog_AWK=mawk ac_cv_prog_LYNX_PATH=www-browser
+#CONFFLAGS += ac_cv_prog_LYNX_PATH=www-browser
 #
 #ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 #DEB_BUILD_STRIP = yes

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)