[Pkg-samba-maint] r2157 - trunk/samba/debian

[bubulle at alioth.debian.org]

tags 496880 pending
thanks

Author: bubulle
Date: 2008-08-28 17:31:39 +0000 (Thu, 28 Aug 2008)
New Revision: 2157

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
Log:
Fix FTBFS on GNU/kFreeBSD

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-08-27 22:42:30 UTC (rev 2156)
+++ trunk/samba/debian/changelog	2008-08-28 17:31:39 UTC (rev 2157)
@@ -1,3 +1,9 @@
+samba (2:3.2.3-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS on GNU/kFreeBSD. Closes: #496880
+
+ -- Christian Perrier <bubulle at debian.org>  Thu, 28 Aug 2008 19:30:58 +0200
+
 samba (2:3.2.3-1) unstable; urgency=high
 
   * High-urgency upload for security fix

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2008-08-27 22:42:30 UTC (rev 2156)
+++ trunk/samba/debian/rules	2008-08-28 17:31:39 UTC (rev 2157)
@@ -135,7 +135,9 @@
 
 	# doesn't belong in /sbin; will be fixed upstream, in the meantime
 	# install it in the right place so that we're future-proofed
+ifeq ($(mount_cifs),yes)
 	mv $(DESTDIR)/sbin/cifs.upcall $(DESTDIR)/usr/sbin/cifs.upcall
+endif
 
 	# Starting with Samba 3.0.6 libsmbclient.so is installed in
 	# /usr/lib/samba. We don't want it there since it is not in the