[Pkg-openldap-devel] r1260 - in openldap/trunk/debian: . patches

[matthijs at alioth.debian.org]

tags 575900 pending
thanks

Author: matthijs
Date: 2010-04-18 13:17:10 +0000 (Sun, 18 Apr 2010)
New Revision: 1260

Added:
   openldap/trunk/debian/patches/autogroup-makefile
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
   openldap/trunk/debian/rules
Log:
 * Add autogroup slapd module.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-04-18 12:57:00 UTC (rev 1259)
+++ openldap/trunk/debian/changelog	2010-04-18 13:17:10 UTC (rev 1260)
@@ -22,8 +22,9 @@
   * Better document the TLSCipherSuite in slapd.conf manpage (Closes: #563113)
   * Better document the TLS_CIPHER_SUITE in ldap.conf manpage (Closes: #510346)
   * Add smbk5pwd slapd module, used patch from Mark Hymers (Closes: #443073)
+  * Add autogroup slapd module, used patch from Mathieu Parent (Closes: #575900)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 18 Apr 2010 14:55:32 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 18 Apr 2010 15:15:34 +0200
 
 openldap (2.4.17-2.1) unstable; urgency=high
 

Added: openldap/trunk/debian/patches/autogroup-makefile
===================================================================
--- openldap/trunk/debian/patches/autogroup-makefile	                        (rev 0)
+++ openldap/trunk/debian/patches/autogroup-makefile	2010-04-18 13:17:10 UTC (rev 1260)
@@ -0,0 +1,30 @@
+Index: b/contrib/slapd-modules/autogroup/Makefile
+===================================================================
+--- a/contrib/slapd-modules/autogroup/Makefile
++++ b/contrib/slapd-modules/autogroup/Makefile
+@@ -1,6 +1,6 @@
+-LIBTOOL=../../../libtool
++LIBTOOL=../../../debian/build/libtool
+ 
+-CPPFLAGS+=-I../../../include -I../../../servers/slapd
++CPPFLAGS+=-I../../../debian/build/include -I../../../include -I../../../servers/slapd
+ 
+ all: autogroup.la
+ 
+@@ -9,12 +9,12 @@
+ 
+ autogroup.la:	autogroup.lo
+ 	$(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
+-	-rpath $(PREFIX)/lib -module -o $@ $? 
++	-rpath /usr/lib/ldap -module -o $@ $?
+ 
+ clean:
+ 	rm -f autogroup.lo autogroup.la
+ 
+ install: autogroup.la
+-	mkdir -p $(PREFIX)/lib/openldap
+-	$(LIBTOOL) --mode=install cp autogroup.la $(PREFIX)/lib/openldap
+-	$(LIBTOOL) --finish $(PREFIX)/lib
++	mkdir -p $(DESTDIR)/usr/lib/ldap
++	$(LIBTOOL) --mode=install cp autogroup.la $(DESTDIR)/usr/lib/ldap
++

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2010-04-18 12:57:00 UTC (rev 1259)
+++ openldap/trunk/debian/patches/series	2010-04-18 13:17:10 UTC (rev 1260)
@@ -12,3 +12,4 @@
 shutdown-issue-6322
 manpage-tlscyphersuite-additions
 smbk5pwd-makefile
+autogroup-makefile

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2010-04-18 12:57:00 UTC (rev 1259)
+++ openldap/trunk/debian/rules	2010-04-18 13:17:10 UTC (rev 1260)
@@ -103,6 +103,7 @@
 build-stamp: configure-stamp
 	$(MAKE) -C $(builddir) $(MAKEVARS)
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd
+	$(MAKE) -C contrib/slapd-modules/autogroup
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	RESOLV_MULTI=off $(MAKE) -C $(builddir) test
 endif
@@ -116,6 +117,7 @@
 install-stamp: build-stamp
 	$(MAKE) -C $(builddir) $(MAKEVARS) install
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd install DESTDIR=$(installdir)
+	$(MAKE) -C contrib/slapd-modules/autogroup install DESTDIR=$(installdir)
 	for F in $(installdir)/usr/lib/*.so.*.*.*; do \
 	    if echo "$$F" | grep -q libslapi ; then \
 	        continue; \
@@ -202,6 +204,7 @@
 	
 	# Clean the contrib directory
 	rm -rf contrib/slapd-modules/smbk5pwd/.libs contrib/slapd-modules/smbk5pwd/smbk5pwd.{lo,la,o}
+	rm -rf contrib/slapd-modules/autogroup/.libs contrib/slapd-modules/autogroup/autogroup.{lo,la,o}
 	dh_clean
 
 .PHONY: binary binary-arch binary-indep build build-arch build-indep clean