[Pkg-cyrus-sasl2-commits] r7 - in /cyrus-sasl-2.1/trunk/debian: cyrus-sasl-2.1-bin.install cyrus-sasl-2.1-doc.install libsasl2-2-dev.install libsasl2-2-modules-gssapi-heimdal.install libsasl2-2-modules-sql.install libsasl2-2-modules.install libsasl2-2.install rules

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Tue May 30 12:17:55 2006
New Revision: 7

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=7
Log:
Update install files and rules to install files into the correct packages.

Modified:
    cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-bin.install
    cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-doc.install
    cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.install
    cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-gssapi-heimdal.install
    cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-sql.install
    cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules.install
    cyrus-sasl-2.1/trunk/debian/libsasl2-2.install
    cyrus-sasl-2.1/trunk/debian/rules

Modified: cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-bin.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-bin.install?rev=7&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-bin.install (original)
+++ cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-bin.install Tue May 30 12:17:55 2006
@@ -1,3 +1,2 @@
 usr/sbin
 usr/share/man/man8
-

Modified: cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-doc.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-doc.install?rev=7&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-doc.install (original)
+++ cyrus-sasl-2.1/trunk/debian/cyrus-sasl-2.1-doc.install Tue May 30 12:17:55 2006
@@ -1,3 +1,2 @@
 doc/*.html
-saslauthd/LDAP_SASLAUTHD
-
+doc/LDAP_SASLAUTHD

Modified: cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.install?rev=7&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.install (original)
+++ cyrus-sasl-2.1/trunk/debian/libsasl2-2-dev.install Tue May 30 12:17:55 2006
@@ -1,4 +1,4 @@
-usr/include
-usr/lib/*.so
-usr/lib/sasl2/*.so
-
+usr/include/sasl
+usr/lib/libsasl2.??
+usr/lib/libsasl2.a
+usr/share/man/man3

Modified: cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-gssapi-heimdal.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-gssapi-heimdal.install?rev=7&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-gssapi-heimdal.install (original)
+++ cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-gssapi-heimdal.install Tue May 30 12:17:55 2006
@@ -1,2 +1,1 @@
-usr/lib/sasl2/libgssapiv2.so.*
-
+usr/lib/sasl2/libgssapiv2.*

Modified: cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-sql.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-sql.install?rev=7&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-sql.install (original)
+++ cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules-sql.install Tue May 30 12:17:55 2006
@@ -1,2 +1,1 @@
-usr/lib/sasl2/libsql.so.*
-
+usr/lib/sasl2/libsql.*

Modified: cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules.install?rev=7&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules.install (original)
+++ cyrus-sasl-2.1/trunk/debian/libsasl2-2-modules.install Tue May 30 12:17:55 2006
@@ -1,9 +1,7 @@
-usr/lib/sasl2/libanonymous.so.*
-usr/lib/sasl2/libcrammd5.so.*
-usr/lib/sasl2/libdigestmd5.so.*
-usr/lib/sasl2/liblogin.so.*
-usr/lib/sasl2/libntlm.so.*
-usr/lib/sasl2/libotp.so.*
-usr/lib/sasl2/libplain.so.*
-usr/lib/sasl2/libsasldb.so.*
-
+usr/lib/sasl2/libanonymous.*
+usr/lib/sasl2/libcrammd5.*
+usr/lib/sasl2/libdigestmd5.*
+usr/lib/sasl2/liblogin.*
+usr/lib/sasl2/libntlm.*
+usr/lib/sasl2/libotp.*
+usr/lib/sasl2/libplain.*

Modified: cyrus-sasl-2.1/trunk/debian/libsasl2-2.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/libsasl2-2.install?rev=7&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/libsasl2-2.install (original)
+++ cyrus-sasl-2.1/trunk/debian/libsasl2-2.install Tue May 30 12:17:55 2006
@@ -1,3 +1,2 @@
-usr/lib/*.so.*
-usr/share/man/man3
-
+usr/lib/libsasl2.so.*
+usr/lib/sasl2/libsasldb*

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=7&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/rules (original)
+++ cyrus-sasl-2.1/trunk/debian/rules Tue May 30 12:17:55 2006
@@ -117,9 +117,11 @@
 	       --enable-ntlm \
 	       --disable-passdss \
 	       --enable-sql \
+	       --disable-ldapdb \
 	       --disable-macos-framework \
 	       --with-pam \
 	       --with-saslauthd=/var/run/saslauth \
+	       --without-ldap \
 	       --with-pgsql=/usr/include/postgresql
 	       
 	echo 'To build this package, configure was called as follows:' \
@@ -170,12 +172,14 @@
 	mv $(TMPPKG)/usr/share/man/man8/pluginviewer.8 \
 		$(TMPPKG)/usr/share/man/man8/saslpluginviewer.8
 
-	mkdir $(TMPPKG)/saslauthd
-	cp saslauthd/LDAP_SASLAUTHD $(TMPPKG)/saslauthd/
+	mkdir $(TMPPKG)/doc
+	cp saslauthd/LDAP_SASLAUTHD $(TMPPKG)/doc
 
 	# Phase 2: actually install the files into
 	# their corresponding package.
 	dh_install --autodest --list-missing --sourcedir=$(TMPPKG)
+	dh_install --sourcedir=$(TMPPKG) -p libsasl2-2 \
+		debian/README.configure-options
 
 	ls -laR # TODO: remove (debug)