[Pkg-openldap-devel] r1387 - openldap/trunk/debian

[Steve Langasek]

On Sat, Oct 08, 2011 at 10:50:53PM +0000, vorlon at alioth.debian.org wrote:
> @@ -129,6 +121,12 @@
>  	dh_strip -plibldap-2.4-2 --dbg-package=libldap-2.4-2-dbg
>  	dh_strip -pslapd --dbg-package=slapd-dbg
>  	dh_strip -Nlibldap-2.4-2 -Nslapd
> +	# hardlink these so not confined by apparmor; do this here and not
> +	# in dh_link so that dh_strip doesn't get confused and put the wrong
> +	# binary in the debug package.
> +	for f in slapacl slapadd slapauth slapcat slapdn slapindex slappasswd slaptest slapschema ; do \
> +	    ln -f $(slapddir)/slapd $(slapddir)/$$f ; \
> +	done
>  
>  override_dh_link:
>  	for pkg in libldap2-dev libldap-2.4-2; do \
> @@ -136,11 +134,6 @@
>  	done
>  	dh_link
>  
> -	# hardlink these so not confined by apparmor
> -	for f in slapacl slapadd slapauth slapcat slapdn slapindex slappasswd slaptest slapschema ; do \
> -	    ln -f $(slapddir)/slapd $(slapddir)/$$f ; \
> -	done
> -
>  override_dh_makeshlibs:
>  	# ideally we would do this and not have any libldap-2.4.so.2 links
>  	# at all, but that requires adjusting the build scripts first to
> 
> 

Whoops, that part wasn't meant to be part of this commit; stupid
svn-buildpackage letting me silently clobber the file.  Anyway, not
reverting because I've tested this change and it fixes the problem in
question.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org