[Pkg-gnupg-commit] r36 - in /gnupg/trunk/debian: changelog rules

[pusling-guest at users.alioth.debian.org]

Author: pusling-guest
Date: Tue Jun  3 22:11:55 2008
New Revision: 36

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=36
Log:
Don't depend, but recommend libldap, this is only needed in some
cases. (Closes: 399167)

Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/rules

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=36&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Tue Jun  3 22:11:55 2008
@@ -24,6 +24,8 @@
   * if rm -rf fails, we should also fail
   * Handle DEB_BUILD_OPTIONS=nostrip in debian/rules (Closes: #437050)
   * add md5sums to package (Closes: 430459)
+  * Don't depend, but recommend libldap, this is only needed in some
+    cases. (Closes: 399167)
 
  -- Sune Vuorela <debian at pusling.com>  Sun, 01 Jun 2008 21:21:10 +0200
 

Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=36&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Tue Jun  3 22:11:55 2008
@@ -107,7 +107,12 @@
 
 	find debian/tmp/ -type d -empty | xargs rmdir
 
-	find debian/tmp/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps
+	#find debian/tmp/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps                                                                                      
+	find debian/tmp/ -path debian/tmp/usr/lib/gnupg/gpgkeys_ldap \                                                                                                               
+		-or -type f -print | \                                                                                                                                               
+		xargs file | grep ELF | cut -d: -f 1 | \                                                                                                                             
+		xargs dpkg-shlibdeps \                                                                                                                                               
+		-dRecommends debian/tmp/usr/lib/gnupg/gpgkeys_ldap -dDepends  
 	cd debian/tmp && find * -type f | grep -v DEBIAN | xargs md5sum > DEBIAN/md5sums
 	dpkg-gencontrol -pgnupg -isp
 	chown -R root.root debian/tmp