[Pkg-cyrus-sasl2-commits] r611 - in /cyrus-sasl-2.1/trunk/debian: changelog libsasl2-dev.examples rules sample/Makefile sample/config.h
roberto at users.alioth.debian.org
roberto at users.alioth.debian.org
Sat Mar 12 17:49:34 UTC 2011
Author: roberto
Date: Sat Mar 12 17:49:33 2011
New Revision: 611
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=611
Log:
Eliminate getsubopt conflict when building with glibc 2.2, thanks to
Colin Watson for the patch (Closes: #588528)
Removed:
cyrus-sasl-2.1/trunk/debian/sample/config.h
Modified:
cyrus-sasl-2.1/trunk/debian/changelog
cyrus-sasl-2.1/trunk/debian/libsasl2-dev.examples
cyrus-sasl-2.1/trunk/debian/rules
cyrus-sasl-2.1/trunk/debian/sample/Makefile
Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=611&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Sat Mar 12 17:49:33 2011
@@ -1,8 +1,9 @@
cyrus-sasl2 (2.1.23.dfsg1-8) UNRELEASED; urgency=low
- * NOT RELEASED YET
-
- -- Roberto C. Sanchez <roberto at connexer.com> Sat, 18 Dec 2010 13:28:04 -0500
+ * Eliminate getsubopt conflict when building with glibc 2.2, thanks to
+ Colin Watson for the patch (Closes: #588528)
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Sat, 12 Mar 2011 12:47:10 -0500
cyrus-sasl2 (2.1.23.dfsg1-7) unstable; urgency=low
Modified: cyrus-sasl-2.1/trunk/debian/libsasl2-dev.examples
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/libsasl2-dev.examples?rev=611&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/libsasl2-dev.examples (original)
+++ cyrus-sasl-2.1/trunk/debian/libsasl2-dev.examples Sat Mar 12 17:49:33 2011
@@ -1,3 +1,3 @@
sample/*.c
sample/*.h
-debian/sample/*.h
+config.h
Modified: cyrus-sasl-2.1/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/rules?rev=611&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/rules (original)
+++ cyrus-sasl-2.1/trunk/debian/rules Sat Mar 12 17:49:33 2011
@@ -142,8 +142,7 @@
rm -f build-stamp build-indep-stamp build-arch-stamp
rm -f $(CURDIR)/sample/sample-client \
- $(CURDIR)/sample/sample-server \
- $(CURDIR)/sample/config.h
+ $(CURDIR)/sample/sample-server
[ ! -f Makefile ] || $(MAKE) distclean
$(AUTOTOOLS_REVERSE)
(cd saslauthd && $(AUTOTOOLS_REVERSE) && cd ..)
@@ -193,9 +192,6 @@
cp $(CURDIR)/sasldb/* $(TMPBUILD_HEIMDAL)/sasldb/
cp $(CURDIR)/plugins/* $(TMPBUILD_HEIMDAL)/plugins/
cp $(CURDIR)/lib/* $(TMPBUILD_HEIMDAL)/lib/
-
- # Prepare to build sample-{client,server}
- cp -f $(CURDIR)/debian/sample/config.h $(CURDIR)/sample/config.h
# Record the build-time settings for later reference
echo 'To build this package, configure was called as follows:' \
Modified: cyrus-sasl-2.1/trunk/debian/sample/Makefile
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/sample/Makefile?rev=611&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sample/Makefile (original)
+++ cyrus-sasl-2.1/trunk/debian/sample/Makefile Sat Mar 12 17:49:33 2011
@@ -7,7 +7,7 @@
all: sample-server sample-client
sample-server: sample-server.c
- gcc -g -o sample-server sample-server.c -I. -I$(INCDIR1) -I$(INCDIR2) -L$(LIBDIR) -lsasl2
+ gcc -g -o sample-server sample-server.c -I. -I.. -I$(INCDIR1) -I$(INCDIR2) -L$(LIBDIR) -lsasl2
sample-client: sample-client.c
- gcc -g -o sample-client sample-client.c -I. -I$(INCDIR1) -I$(INCDIR2) -L$(LIBDIR) -lsasl2
+ gcc -g -o sample-client sample-client.c -I. -I.. -I$(INCDIR1) -I$(INCDIR2) -L$(LIBDIR) -lsasl2
More information about the Pkg-cyrus-sasl2-commits
mailing list