[Pkg-cyrus-sasl2-commits] r591 - in /cyrus-sasl-2.1/branches/package-consolidate/debian: changelog rules
roberto at users.alioth.debian.org
roberto at users.alioth.debian.org
Sun Aug 22 18:46:42 UTC 2010
Author: roberto
Date: Sun Aug 22 18:46:39 2010
New Revision: 591
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=591
Log:
place common ./configure options into a variable, and acknowledge NMU
Modified:
cyrus-sasl-2.1/branches/package-consolidate/debian/changelog
cyrus-sasl-2.1/branches/package-consolidate/debian/rules
Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/changelog?rev=591&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/changelog (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/changelog Sun Aug 22 18:46:39 2010
@@ -1,5 +1,6 @@
cyrus-sasl2 (2.1.23.dfsg1-6) unstable; urgency=low
+ * Acknowlge NMU (thanks to Ben Hutchings)
* Merge cyrus-sasl2 and cyrus-sasl2-heimdal source packages (Closes: #568358)
+ Build against new heimdal-multidev (Closes: #591147)
* Properly detect presence of Heimdal (Closes: #590912); thanks tremendously
Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/rules?rev=591&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/rules (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/rules Sun Aug 22 18:46:39 2010
@@ -60,95 +60,11 @@
CONFIGURE_GSSAPI=--disable-gssapi
endif
-# Prepare shared library version numbers.
-version=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-# Some convenience variables
-export TMPBUILD_MIT := $(CURDIR)/build-mit
-export TMPBUILD_HEIMDAL := $(CURDIR)/build-heimdal
-export TMPPKG_MIT := $(CURDIR)/debian/tmp-mit
-export TMPPKG_HEIMDAL := $(CURDIR)/debian/tmp-heimdal
-
-AUTOFILES=acinclude.m4 aclocal.m4 config/config.sub config/config.guess \
- config/ltmain.sh config/libtool.m4
-BUILD_TMP_SUFFIX=.debian-build.tmp
-AUTOTOOLS=for i in $(AUTOFILES); do \
- if [ -e $$i ]; then \
- mv --verbose $$i `basename $$i`$(BUILD_TMP_SUFFIX) ; \
- fi ; \
- done && \
- libtoolize --force && \
- aclocal-1.9 -I $(CURDIR)/cmulocal -I $(CURDIR)/config && \
- autoheader && \
- autoconf && \
- automake-1.9 --add-missing --include-deps && \
- touch stamp-h.in
-AUTOTOOLS_REVERSE=for i in $(AUTOFILES); do \
- if [ -e `basename $$i`$(BUILD_TMP_SUFFIX) ]; then \
- if [ -e $$i ]; then rm -fv $$i; fi ; \
- mv --verbose `basename $$i`$(BUILD_TMP_SUFFIX) $$i ; \
- fi ; \
- done
-
-
-### The Makefile targets begin. ###
-
-
-###
-# Clean up the source tree to prepare for building.
-# Use dpatch targets to unpatch any applied patches.
-###
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp build-indep-stamp build-arch-stamp
-
- rm -f $(CURDIR)/sample/sample-client \
- $(CURDIR)/sample/sample-server \
- $(CURDIR)/sample/config.h
- [ ! -f Makefile ] || $(MAKE) distclean
- $(AUTOTOOLS_REVERSE)
- (cd saslauthd && $(AUTOTOOLS_REVERSE) && cd ..)
- -rm -f config.h config.log autom4ate.cache
-
- # Remove symlinks that the CMU build sets up but never removes.
- # They can be found by running find . -lname '*' -print in the
- # source tree before and after a build and comparing the differences.
- rm -f lib/sasldb.c lib/db_berkeley.c lib/allockey.c lib/cram.c \
- lib/digestmd5.c lib/otp.c lib/gssapi.c lib/plain.c \
- lib/anonymous.c lib/login.c lib/ntlm.c lib/sql.c lib/ldapdb.c
-
- # Remove generated man pages
- -rm -f sasl-sample-client.8 sasl-sample-server.8
-
- # Remove build directories
- rm -rf $(TMPBUILD_MIT) $(TMPBUILD_HEIMDAL) $(TMPPKG_MIT) $(TMPPKG_HEIMDAL)
-
- dh_clean
-
-###
-# Configure the package.
-# Use dpatch targets to apply any available patches.
-###
-config.status: patch configure
- dh_testdir
-
- # Avoid problems with timestamp skew and autotools.
- touch configure
- $(AUTOTOOLS)
- (cd saslauthd && $(AUTOTOOLS) && cd ..)
- (mkdir $(TMPBUILD_MIT); cd $(TMPBUILD_MIT); \
- LDFLAGS="$(LDFLAGS) -L/usr/lib/mit-krb5 -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/mit-krb5" ../configure \
- --host=$(DEB_HOST_GNU_TYPE) \
+CONFIGURE_COMMON_OPTIONS="--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-gss_impl=mit \
--enable-static \
--enable-shared \
--enable-alwaystrue \
@@ -176,7 +92,93 @@
--with-pgsql=/usr/include/postgresql \
--with-configdir=/etc/sasl:/usr/lib/sasl2 \
--sysconfdir=/etc \
- --with-devrandom=/dev/urandom; \
+ --with-devrandom=/dev/urandom"
+
+# Prepare shared library version numbers.
+version=`ls src/.libs/lib*.so.* | \
+ awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+major=`ls src/.libs/lib*.so.* | \
+ awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+# Some convenience variables
+export TMPBUILD_MIT := $(CURDIR)/build-mit
+export TMPBUILD_HEIMDAL := $(CURDIR)/build-heimdal
+export TMPPKG_MIT := $(CURDIR)/debian/tmp-mit
+export TMPPKG_HEIMDAL := $(CURDIR)/debian/tmp-heimdal
+
+AUTOFILES=acinclude.m4 aclocal.m4 config/config.sub config/config.guess \
+ config/ltmain.sh config/libtool.m4
+BUILD_TMP_SUFFIX=.debian-build.tmp
+AUTOTOOLS=for i in $(AUTOFILES); do \
+ if [ -e $$i ]; then \
+ mv --verbose $$i `basename $$i`$(BUILD_TMP_SUFFIX) ; \
+ fi ; \
+ done && \
+ libtoolize --force && \
+ aclocal-1.9 -I $(CURDIR)/cmulocal -I $(CURDIR)/config && \
+ autoheader && \
+ autoconf && \
+ automake-1.9 --add-missing --include-deps && \
+ touch stamp-h.in
+AUTOTOOLS_REVERSE=for i in $(AUTOFILES); do \
+ if [ -e `basename $$i`$(BUILD_TMP_SUFFIX) ]; then \
+ if [ -e $$i ]; then rm -fv $$i; fi ; \
+ mv --verbose `basename $$i`$(BUILD_TMP_SUFFIX) $$i ; \
+ fi ; \
+ done
+
+
+### The Makefile targets begin. ###
+
+
+###
+# Clean up the source tree to prepare for building.
+# Use dpatch targets to unpatch any applied patches.
+###
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp build-indep-stamp build-arch-stamp
+
+ rm -f $(CURDIR)/sample/sample-client \
+ $(CURDIR)/sample/sample-server \
+ $(CURDIR)/sample/config.h
+ [ ! -f Makefile ] || $(MAKE) distclean
+ $(AUTOTOOLS_REVERSE)
+ (cd saslauthd && $(AUTOTOOLS_REVERSE) && cd ..)
+ -rm -f config.h config.log autom4ate.cache
+
+ # Remove symlinks that the CMU build sets up but never removes.
+ # They can be found by running find . -lname '*' -print in the
+ # source tree before and after a build and comparing the differences.
+ rm -f lib/sasldb.c lib/db_berkeley.c lib/allockey.c lib/cram.c \
+ lib/digestmd5.c lib/otp.c lib/gssapi.c lib/plain.c \
+ lib/anonymous.c lib/login.c lib/ntlm.c lib/sql.c lib/ldapdb.c
+
+ # Remove generated man pages
+ -rm -f sasl-sample-client.8 sasl-sample-server.8
+
+ # Remove build directories
+ rm -rf $(TMPBUILD_MIT) $(TMPBUILD_HEIMDAL) $(TMPPKG_MIT) $(TMPPKG_HEIMDAL)
+
+ dh_clean
+
+###
+# Configure the package.
+# Use dpatch targets to apply any available patches.
+###
+config.status: patch configure
+ dh_testdir
+
+ # Avoid problems with timestamp skew and autotools.
+ touch configure
+ $(AUTOTOOLS)
+ (cd saslauthd && $(AUTOTOOLS) && cd ..)
+ (mkdir $(TMPBUILD_MIT); cd $(TMPBUILD_MIT); \
+ LDFLAGS="$(LDFLAGS) -L/usr/lib/mit-krb5 -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/mit-krb5" ../configure \
+ $(CONFIGURE_COMMON_OPTIONS) \
+ --with-gss_impl=mit; \
cd ..)
# Cope with the way that ./configure creates symlinks
cp $(CURDIR)/sasldb/* $(TMPBUILD_MIT)/sasldb/
@@ -184,40 +186,8 @@
cp $(CURDIR)/lib/* $(TMPBUILD_MIT)/lib/
(mkdir $(TMPBUILD_HEIMDAL); cd $(TMPBUILD_HEIMDAL); \
LDFLAGS="$(LDFLAGS) -L/usr/lib/heimdal -Wl,-z,defs" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/heimdal" ../configure \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --with-gss_impl=heimdal \
- --enable-static \
- --enable-shared \
- --enable-alwaystrue \
- --enable-checkapop \
- --enable-cram \
- --enable-digest \
- --enable-otp \
- --disable-srp \
- --disable-srp-setpass \
- --disable-krb4 \
- $(CONFIGURE_GSSAPI) \
- --enable-gss_mutexes \
- --enable-auth-sasldb \
- --enable-plain \
- --enable-anon \
- --enable-login \
- --enable-ntlm \
- --disable-passdss \
- $(CONFIGURE_SQL) \
- $(CONFIGURE_LDAPDB) \
- --disable-macos-framework \
- --with-pam \
- --with-saslauthd=/var/run/saslauthd \
- $(CONFIGURE_LDAP) \
- --with-pgsql=/usr/include/postgresql \
- --with-configdir=/etc/sasl:/usr/lib/sasl2 \
- --sysconfdir=/etc \
- --with-devrandom=/dev/urandom; \
+ $(CONFIGURE_COMMON_OPTIONS) \
+ --with-gss_impl=heimdal; \
cd ..)
# Cope with the way that ./configure creates symlinks
cp $(CURDIR)/sasldb/* $(TMPBUILD_HEIMDAL)/sasldb/
More information about the Pkg-cyrus-sasl2-commits
mailing list