[Pkg-cyrus-sasl2-commits] r71 - in /cyrus-sasl-2.1/trunk/debian: libsasl2-2-dev.examples patches/0009_build_samples_on_debian.dpatch patches/00list rules samples/ samples/Makefile samples/config.h

[el_cubano-guest at users.alioth.debian.org]

Author: el_cubano-guest
Date: Thu Oct 19 02:45:54 2006
New Revision: 71

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=71
Log:
Fix it so that patch 0009 is no longer necessary and extra files for sample building are included by other means

Added:
    cyrus-sasl-2.1/trunk/debian/samples/
    cyrus-sasl-2.1/trunk/debian/samples/Makefile
    cyrus-sasl-2.1/trunk/debian/samples/config.h
Removed:
    cyrus-sasl-2.1/trunk/debian/patches/0009_build_samples_on_debian.dpatch
Modified:
    cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.examples
    cyrus-sasl-2.1/trunk/debian/patches/00list
    cyrus-sasl-2.1/trunk/debian/rules

Modified: cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.examples
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.examples?rev=71&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.examples (original)
+++ cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.examples Thu Oct 19 02:45:54 2006
@@ -1,3 +1,3 @@
 sample/*.c
 sample/*.h
-sample/Makefile*
+sample/Makefile

Modified: cyrus-sasl-2.1/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/00list?rev=71&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Thu Oct 19 02:45:54 2006
@@ -6,4 +6,3 @@
 0006_library_mutexes
 0007_manpages_section
 0008_one_time_sasl_set_alloc
-0009_build_samples_on_debian

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=71&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/rules (original)
+++ cyrus-sasl-2.1/trunk/debian/rules Thu Oct 19 02:45:54 2006
@@ -75,6 +75,8 @@
 ifneq "$(wildcard config.guess.old)" ""
 	mv config.guess.old config/config.guess
 endif
+	if [ -f $(CURDIR)/samples/Makefile.old ]; then mv -f $(CURDIR)/samples/Makefile.old $(CURDIR)/samples/Makefile; fi
+	rm -f $(CURDIR)/samples/config.h
 	-$(MAKE) distclean
 	-rm -f config.h config.log autom4ate.cache
 
@@ -100,6 +102,9 @@
 	touch configure
 	$(AUTOTOOLS)
 	(cd saslauthd && $(AUTOTOOLS) && cd ..)
+	mv -f $(CURDIR)/samples/Makefile $(CURDIR)/samples/Makefile.old
+	cp -f $(CURDIR)/debian/samples/Makefile $(CURDIR)/samples/Makefile
+	cp -f $(CURDIR)/debian/samples/config.h $(CURDIR)/samples/config.h
 	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure \
 	       --host=$(DEB_HOST_GNU_TYPE) \
 	       --build=$(DEB_BUILD_GNU_TYPE) \

Added: cyrus-sasl-2.1/trunk/debian/samples/Makefile
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/samples/Makefile?rev=71&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/samples/Makefile (added)
+++ cyrus-sasl-2.1/trunk/debian/samples/Makefile Thu Oct 19 02:45:54 2006
@@ -1,0 +1,10 @@
+#!/usr/bin/make -f
+
+all: sample-server sample-client
+
+sample-server: sample-server.c
+	gcc -g -o sample-server sample-server.c -I. -I/usr/include/sasl -lsasl2
+
+sample-client: sample-client.c
+	gcc -g -o sample-client sample-client.c -I. -I/usr/include/sasl -lsasl2
+

Added: cyrus-sasl-2.1/trunk/debian/samples/config.h
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/samples/config.h?rev=71&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/samples/config.h (added)
+++ cyrus-sasl-2.1/trunk/debian/samples/config.h Thu Oct 19 02:45:54 2006
@@ -1,0 +1,11 @@
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#define PACKAGE "sasl-sample-pkg"
+#define VERSION "0.0"
+#define PLUGINDIR "/usr/lib/sasl2"
+#define EXIT_FAILURE 1
+#define EXIT_SUCCESS 0
+#define HIER_DELIMITER '/'
+