[SCM] Debian packaging for apr branch, master, updated. 228510f6c6a1761c1e85f07013f80921a2bf637a

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit 228510f6c6a1761c1e85f07013f80921a2bf637a
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat May 11 14:46:28 2013 +0200

    Don't override normal CFLAGS

diff --git a/debian/changelog b/debian/changelog
index fde0738..45ec019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ apr (1.4.6-4) UNRELEASED; urgency=low
   * Make the /dev/shm sanity check during build work if it is a symbolic link.
   * Remove the ancient ino_t configure sanity test that causes a FTBFS on x32.
     Closes: #701193
+  * Don't override CFLAGS and LDFLAGS during build. This fixes the debug
+    information being useless. Closes: #703466
 
  -- Stefan Fritsch <sf at debian.org>  Wed, 15 Aug 2012 19:58:25 +0200
 
diff --git a/debian/rules b/debian/rules
index a40c5b7..2e6b435 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,7 +68,7 @@ $(BUILDDIR)/config.status:
 	# we need to force the use of bash here. Otherwise, if apr is built with
 	# /bin/sh -> /bin/bash, the resulting libtool will not work on systems
 	# where /bin/sh -> /bin/dash
-	cd $(BUILDDIR) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFFLAGS) CONFIG_SHELL=/bin/bash /bin/bash ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --includedir=\$${prefix}/usr/include/apr-1.0 --with-installbuilddir=\$${prefix}/usr/share/apr-1.0/build  --enable-nonportable-atomics --enable-allocator-uses-mmap
+	cd $(BUILDDIR) && $(CONFFLAGS) CONFIG_SHELL=/bin/bash /bin/bash ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --includedir=\$${prefix}/usr/include/apr-1.0 --with-installbuilddir=\$${prefix}/usr/share/apr-1.0/build  --enable-nonportable-atomics --enable-allocator-uses-mmap
 ifeq (hurd, $(DEB_BUILD_ARCH_OS))
 	# multicast not supported on Hurd
 	sed -i '/HAVE_STRUCT_IPMREQ/ d' $(BUILDDIR)/include/arch/unix/apr_private.h
@@ -95,7 +95,7 @@ build-indep: build-stamp
 build-stamp: $(BUILDDIR)/config.status
 	dh_testdir
 
-	$(MAKE) -C $(BUILDDIR) CFLAGS="$(H_CFLAGS)" LDFLAGS="$(H_LDFLAGS)"
+	$(MAKE) -C $(BUILDDIR) CFLAGS="$(H_CFLAGS) $(CFLAGS)" LDFLAGS="$(H_LDFLAGS) $(LDFLAGS)"
 	$(MAKE) -C $(BUILDDIR) dox
 
 	touch $@
@@ -120,7 +120,7 @@ IGNORE_TESTSOCK = $(shell IGN=false; \
 
 test-stamp: build
 	dh_testdir
-	$(MAKE) -C $(BUILDDIR)/test all CFLAGS="$(H_CFLAGS)" LDFLAGS="$(H_LDFLAGS)"
+	$(MAKE) -C $(BUILDDIR)/test all CFLAGS="$(H_CFLAGS) $(CFLAGS)" LDFLAGS="$(H_LDFLAGS) $(LDFLAGS)"
 	cd $(BUILDDIR)/test && ./testall -v testsockets testsock || $(IGNORE_TESTSOCK)
 	cd $(BUILDDIR)/test && ( ulimit -S -s 8192 ; ./testall -v testatomic)
 	cd $(BUILDDIR)/test && ./testall -v -x testsockets testsock testatomic

-- 
Debian packaging for apr