[Pkg-cyrus-sasl2-commits] r154 - in /cyrus-sasl-2.1/trunk/debian:
changelog libsasl2-2-dev.examples
rules sample/Makefile sasl2-bin.dirs sasl2-bin.install
fabbe at users.alioth.debian.org
fabbe at users.alioth.debian.org
Sat Nov 18 13:37:42 CET 2006
Author: fabbe
Date: Sat Nov 18 13:37:42 2006
New Revision: 154
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=154
Log:
Build sample-{client,server} and ship in sasl2-bin.
Modified:
cyrus-sasl-2.1/trunk/debian/changelog
cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.examples
cyrus-sasl-2.1/trunk/debian/rules
cyrus-sasl-2.1/trunk/debian/sample/Makefile
cyrus-sasl-2.1/trunk/debian/sasl2-bin.dirs
cyrus-sasl-2.1/trunk/debian/sasl2-bin.install
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=154&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Sat Nov 18 13:37:42 2006
@@ -2,7 +2,11 @@
* NOT RELEASED YET
- -- Fabian Fagerholm <fabbe at debian.org> Fri, 17 Nov 2006 09:29:49 +0200
+ [ Fabian Fagerholm ]
+ * debian/rules, etc.: Build sample-{client,server} and ship them with
+ Debianized names (prefix sasl-) in sasl2-bin. (Closes: #305357)
+
+ -- Fabian Fagerholm <fabbe at debian.org> Sat, 18 Nov 2006 14:34:17 +0200
cyrus-sasl2 (2.1.22.dfsg1-3) unstable; urgency=low
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=154&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.examples (original)
+++ cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.examples Sat Nov 18 13:37:42 2006
@@ -1,3 +1,3 @@
sample/*.c
sample/*.h
-sample/Makefile
+debian/sample/*.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=154&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/rules (original)
+++ cyrus-sasl-2.1/trunk/debian/rules Sat Nov 18 13:37:42 2006
@@ -75,8 +75,7 @@
ifneq "$(wildcard config.guess.old)" ""
mv config.guess.old config/config.guess
endif
- if [ -f $(CURDIR)/sample/Makefile.old ]; then mv -f $(CURDIR)/sample/Makefile.old $(CURDIR)/sample/Makefile; fi
- rm -f $(CURDIR)/sample/config.h
+ rm -f $(CURDIR)/sample/{sample-client,sample-server,config.h}
-$(MAKE) distclean
-rm -f config.h config.log autom4ate.cache
@@ -135,9 +134,10 @@
--sysconfdir=/etc \
--with-devrandom=/dev/urandom
- if [ -f $(CURDIR)/sample/Makefile ]; then mv -f $(CURDIR)/sample/Makefile $(CURDIR)/sample/Makefile.old; fi
- cp -f $(CURDIR)/debian/sample/Makefile $(CURDIR)/sample/Makefile
+ # 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:' \
> debian/README.configure-options
grep with\ options config.status | sed -e \
@@ -157,6 +157,9 @@
# ignoring the first failure.
-$(MAKE)
$(MAKE)
+
+ # Build sample-{client,server}
+ make -f $(CURDIR)/debian/sample/Makefile -C $(CURDIR)/sample T=$(CURDIR)
touch build-arch-stamp
@@ -189,6 +192,12 @@
mv $(TMPPKG)/usr/sbin/dbconverter-2 $(TMPPKG)/usr/sbin/sasldbconverter2
install -c -m 644 utils/sasldbconverter2.8 \
$(TMPPKG)/usr/share/man/man8/sasldbconverter2.8
+
+ # Install sample-{client,server} with Debianized names
+ install -m 755 -D $(CURDIR)/sample/sample-client \
+ $(TMPPKG)/usr/bin/sasl-sample-client
+ install -m 755 -D $(CURDIR)/sample/sample-server \
+ $(TMPPKG)/usr/sbin/sasl-sample-server
# Alter the rpath of certain binaries and shared libraries.
chrpath -d $(TMPPKG)/usr/sbin/sasldblistusers2 \
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=154&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sample/Makefile (original)
+++ cyrus-sasl-2.1/trunk/debian/sample/Makefile Sat Nov 18 13:37:42 2006
@@ -1,10 +1,12 @@
#!/usr/bin/make -f
+
+INCDIR=$(T)/include
+LIBDIR=$(T)/lib/.libs
all: sample-server sample-client
sample-server: sample-server.c
- gcc -g -o sample-server sample-server.c -I. -I/usr/include/sasl -lsasl2
+ gcc -g -o sample-server sample-server.c -I. -I$(INCDIR) -L$(LIBDIR) -lsasl2
sample-client: sample-client.c
- gcc -g -o sample-client sample-client.c -I. -I/usr/include/sasl -lsasl2
-
+ gcc -g -o sample-client sample-client.c -I. -I$(INCDIR) -L$(LIBDIR) -lsasl2
Modified: cyrus-sasl-2.1/trunk/debian/sasl2-bin.dirs
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/sasl2-bin.dirs?rev=154&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.dirs (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.dirs Sat Nov 18 13:37:42 2006
@@ -1,3 +1,4 @@
+usr/bin
usr/sbin
usr/share/doc
usr/share/man/man8
Modified: cyrus-sasl-2.1/trunk/debian/sasl2-bin.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/sasl2-bin.install?rev=154&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.install (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.install Sat Nov 18 13:37:42 2006
@@ -1,2 +1,3 @@
+usr/bin
usr/sbin
usr/share/man/man8
More information about the Pkg-cyrus-sasl2-commits
mailing list