Tags 391753 + patch pending
Thanks
Hi!
I have prepared an NMU for this package. It updates the dependency and
adds the correct compilation flags for libapr1.
I have attached the full interdiff output of my NMU. It modifies some
extra things in debian/rules due to a difference in yada version.
BTW, this yada thing is quite unfriendly to the NMUer. It's not nice that
you have to update the whole debian/rules and end up with so many
differences, just to make a very simple change.
--
Love,
Marga.
diff -u libapache-mod-rpaf-0.5/debian/changelog
libapache-mod-rpaf-0.5/debian/changelog
--- libapache-mod-rpaf-0.5/debian/changelog
+++ libapache-mod-rpaf-0.5/debian/changelog
@@ -1,3 +1,13 @@
+libapache-mod-rpaf (0.5-2.1) unstable; urgency=low
+
+ * Non-maintainer upload to update dependency on an uninstallable package.
+ * Updated the dependency of libapache2-mod-suphp to apache2.2-common.
+ (Closes: #391753)
+ * Added a call to apr-1-config --cppflags to get the correct CFLAGS at
+ build time.
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Wed, 18 Oct 2006 14:20:31 -0300
+
libapache-mod-rpaf (0.5-2) unstable; urgency=low
* Add rpaf.conf with base configuration.
diff -u libapache-mod-rpaf-0.5/debian/packages
libapache-mod-rpaf-0.5/debian/packages
--- libapache-mod-rpaf-0.5/debian/packages
+++ libapache-mod-rpaf-0.5/debian/packages
@@ -98,7 +98,7 @@
mkdir apache2-build
pushd apache2-build
cp -a ../mod_rpaf-2.0.c mod_rpaf.c
- $APXS2 -c -S CFLAGS="`$APXS2 -q CFLAGS` $CFLAGS" mod_rpaf.c
+ $APXS2 -c -S CFLAGS="`$APXS2 -q CFLAGS` `apr-1-config --cppflags`
$CFLAGS" mod_rpaf.c
popd
Clean: sh
rm -rf *-build || true
@@ -171,7 +171,7 @@
Package: libapache2-mod-rpaf
Architecture: any
-Depends: apache2-common (>= %{apache2_version}), []
+Depends: apache2.2-common (>= %{apache2_version}), []
Description: module for Apache2 which takes the last IP from the
'X-Forwarded-For' header
rpaf is short for reverse proxy add forward.
.
diff -u libapache-mod-rpaf-0.5/debian/rules libapache-mod-rpaf-0.5/debian/rules
--- libapache-mod-rpaf-0.5/debian/rules
+++ libapache-mod-rpaf-0.5/debian/rules
@@ -1,18 +1,57 @@
#!/usr/bin/make -f
# Generated automatically from debian/packages
-# by yada v0.32, of Fri, 11 Mar 2005
+# by yada v0.48, of Wed, 28 Sep 2005
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS
2>/dev/null)
+DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU
2>/dev/null)
+DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU
2>/dev/null)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE
2>/dev/null)
+DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM
2>/dev/null)
+
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
+DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS
2>/dev/null)
+DEB_BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU
2>/dev/null)
+DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU
2>/dev/null)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE
2>/dev/null)
+DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM
2>/dev/null)
+
+# Take account of old dpkg-architecture output.
+ifeq ($(DEB_HOST_ARCH_CPU),)
+ DEB_HOST_ARCH_CPU := $(DEB_HOST_GNU_CPU))
+ ifeq ($(DEB_HOST_ARCH_CPU),i486)
+ DEB_HOST_ARCH_OS := i386
+ else
+ ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
+ DEB_HOST_ARCH_OS := amd64
+ endif
+ endif
+endif
+ifeq ($(DEB_HOST_ARCH_OS),)
+ DEB_HOST_ARCH_OS := $(subst -gnu,,$(DEB_HOST_GNU_SYSTEM))
+ ifeq ($(DEB_HOST_ARCH_OS),gnu)
+ DEB_HOST_ARCH_OS := hurd
+ endif
+endif
+ifeq ($(DEB_BUILD_ARCH_CPU),)
+ DEB_BUILD_ARCH_CPU := $(DEB_BUILD_GNU_CPU))
+ ifeq ($(DEB_BUILD_ARCH_CPU),i486)
+ DEB_BUILD_ARCH_OS := i386
+ else
+ ifeq ($(DEB_BUILD_ARCH_CPU),x86_64)
+ DEB_BUILD_ARCH_OS := amd64
+ endif
+ endif
+endif
+ifeq ($(DEB_BUILD_ARCH_OS),)
+ DEB_BUILD_ARCH_OS := $(subst -gnu,,$(DEB_BUILD_GNU_SYSTEM))
+ ifeq ($(DEB_BUILD_ARCH_OS),gnu)
+ DEB_BUILD_ARCH_OS := hurd
+ endif
+endif
-VERSION:=$(shell LC_ALL=C dpkg-parsechangelog | sed -ne 's/^Version:
*\([^2]*\)/\1/p')
+LEFT_PARENTHESIS:=(
+VERSION:=$(shell head -n1 debian/changelog | sed -e "s/^[0-9a-zA-Z.-]*
$(LEFT_PARENTHESIS)//" -e "s/[^0-9a-zA-Z.:+~-].*//")
SHELL=/bin/bash
@@ -55,9 +94,11 @@
debian/control: $(shell which yada) debian/packages-tmp
yada rebuild control
-templates: debian/templates
+templates: debian/templates debian/po/POTFILES.in
debian/templates: $(shell which yada) debian/packages-tmp
yada rebuild templates
+debian/po/POTFILES.in: $(shell which yada) debian/packages-tmp
+ yada rebuild templates
debian/build-stamp: debian/build-arch-stamp debian/build-indep-stamp
@[ -f $(shell which yada) -a -f debian/rules ]
@@ -97,7 +138,7 @@
echo -E 'mkdir apache2-build';\
echo -E 'pushd apache2-build';\
echo -E ' cp -a ../mod_rpaf-2.0.c mod_rpaf.c';\
- echo -E ' $$APXS2 -c -S CFLAGS="`$$APXS2 -q CFLAGS` $$CFLAGS"
mod_rpaf.c';\
+ echo -E ' $$APXS2 -c -S CFLAGS="`$$APXS2 -q CFLAGS` `apr-1-config
--cppflags` $$CFLAGS" mod_rpaf.c';\
echo -E 'popd') | /bin/bash
touch debian/build-stamp
@@ -163,7 +204,7 @@
find debian/tmp-libapache2-mod-rpaf -type f -print \
| sed -n 's/^debian\/tmp-libapache2-mod-rpaf\(\/etc\/.*\)$$/\1/p' \
> debian/tmp-libapache2-mod-rpaf/DEBIAN/conffiles
- if test ! -s debian/tmp-libapache2-mod-rpaf/DEBIAN/conffiles; then rm
-f debian/tmp-libapache2-mod-rpaf/DEBIAN/conffiles; fi
+ test -s debian/tmp-libapache2-mod-rpaf/DEBIAN/conffiles || rm -f
debian/tmp-libapache2-mod-rpaf/DEBIAN/conffiles
yada rebuild control
yada generate substvars libapache2-mod-rpaf
umask 022 && dpkg-gencontrol -isp -plibapache2-mod-rpaf
-Pdebian/tmp-libapache2-mod-rpaf
@@ -219,7 +260,7 @@
find debian/tmp-libapache-mod-rpaf -type f -print \
| sed -n 's/^debian\/tmp-libapache-mod-rpaf\(\/etc\/.*\)$$/\1/p' \
> debian/tmp-libapache-mod-rpaf/DEBIAN/conffiles
- if test ! -s debian/tmp-libapache-mod-rpaf/DEBIAN/conffiles; then rm -f
debian/tmp-libapache-mod-rpaf/DEBIAN/conffiles; fi
+ test -s debian/tmp-libapache-mod-rpaf/DEBIAN/conffiles || rm -f
debian/tmp-libapache-mod-rpaf/DEBIAN/conffiles
yada rebuild control
yada generate substvars libapache-mod-rpaf
umask 022 && dpkg-gencontrol -isp -plibapache-mod-rpaf
-Pdebian/tmp-libapache-mod-rpaf
diff -u libapache-mod-rpaf-0.5/debian/control
libapache-mod-rpaf-0.5/debian/control
--- libapache-mod-rpaf-0.5/debian/control
+++ libapache-mod-rpaf-0.5/debian/control
@@ -3,11 +3,11 @@
Section: web
Priority: extra
Standards-Version: 3.6.1
-Build-Depends: apache-dev (>= 1.3.23), apache2-threaded-dev (>= 2.0.50-10),
yada (>= 0.32)
+Build-Depends: apache-dev (>= 1.3.23), apache2-threaded-dev (>= 2.0.50-10),
yada (>= 0.48)
Package: libapache-mod-rpaf
Architecture: any
-Depends: apache-common (>= 1.3.33-4), ${libapache-mod-rpaf:Depends}
+Depends: apache-common (>= 1.3.34-4), ${libapache-mod-rpaf:Depends}
Description: module for Apache which takes the last IP from the
'X-Forwarded-For' header
rpaf is short for reverse proxy add forward.
.
@@ -24,7 +24,7 @@
Package: libapache2-mod-rpaf
Architecture: any
-Depends: apache2-common (>= 2.0.53-5), ${libapache2-mod-rpaf:Depends}
+Depends: apache2.2-common (>= 2.2.3-2), ${libapache2-mod-rpaf:Depends}
Description: module for Apache2 which takes the last IP from the
'X-Forwarded-For' header
rpaf is short for reverse proxy add forward.
.
