Bug#638053: php-sasl: diff for NMU version 0.1.0-1.1

tags 638053 + pending
thanks

Dear maintainer,

I've prepared an NMU for php-sasl (versioned as 0.1.0-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

.''`. Homepage: http://info.comodo.priv.at/ - PGP/GPG key ID: 0x8649AA06
: :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/
`. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
`- NP: Peter Jones: When The River Runs Dry


diff -u php-sasl-0.1.0/debian/control php-sasl-0.1.0/debian/control
php-sasl-0.1.0/debian/control
+++ php-sasl-0.1.0/debian/control
@@ -2,7 +2,7 @@
Section: web
Priority: optional
Maintainer: Jack Bates <ms419@freezone.co.uk>
-Build-Depends: debhelper (>= 5), po-debconf, xsltproc , php5-dev, libsasl2-dev
+Build-Depends: debhelper (>= 5), po-debconf, xsltproc , php5-dev, libsasl2-dev, dpkg-dev (>= 1.16.0)
Standards-Version: 3.7.2

Package: php5-sasl
diff -u php-sasl-0.1.0/debian/rules php-sasl-0.1.0/debian/rules
php-sasl-0.1.0/debian/rules
+++ php-sasl-0.1.0/debian/rules
@@ -15,6 +15,9 @@
DEBUG := --disable-debug
endif

+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export DEB_HOST_MULTIARCH
+
TAR=tar
PECL_PKG_NAME=sasl
PECL_PKG_REALNAME=sasl
diff -u php-sasl-0.1.0/debian/changelog php-sasl-0.1.0/debian/changelog
php-sasl-0.1.0/debian/changelog
+++ php-sasl-0.1.0/debian/changelog
@@ -1,3 +1,14 @@
+php-sasl (0.1.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "Check for libsasl in the multiarch path": add patch
+ (sasl-0.1.0/config.m4, debian/rules) from Ubuntu / Steve Langasek.
+ Explicitly build-depend on dpkg-dev (>= 1.16.0).
+ Closes: #638053
+ LP: #826601
+
+ -- gregor herrmann <gregoa@debian.org> Wed, 14 Sep 2011 17:41:51 +0200
+
php-sasl (0.1.0-1) unstable; urgency=low

* Initial release
only in patch2:
unchanged:
php-sasl-0.1.0.orig/sasl-0.1.0/config.m4
+++ php-sasl-0.1.0/sasl-0.1.0/config.m4
@@ -31,7 +31,7 @@

AC_MSG_CHECKING(for SASL library in $SASL_DIR/lib)
for i in $SEARCH_LIBS; do
- if test -r $SASL_DIR/lib/lib$i.a; then
+ if test -r $SASL_DIR/lib/lib$i.a || test -r $SASL_DIR/lib/$DEB_HOST_MULTIARCH/lib$i.a; then
SASL_LIB=$i
AC_MSG_RESULT(found -l$i)
fi







To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org