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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-10-04 06:32:24 +0000 (Sat, 04 Oct 2008)
New Revision: 2179

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
Log:
we don't need to move cifs.upcall around, it's now installed to the right
place upstream.



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-10-04 06:31:19 UTC (rev 2178)
+++ trunk/samba/debian/changelog	2008-10-04 06:32:24 UTC (rev 2179)
@@ -1,6 +1,8 @@
 samba (2:3.2.3-4) UNRELEASED; urgency=low
 
-  * New upstream version.
+  * New upstream release.
+    - debian/rules: we don't need to move cifs.upcall around, it's now
+      installed to the right place upstream.
 
  -- Steve Langasek <vorlon at debian.org>  Fri, 03 Oct 2008 23:31:03 -0700
 

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2008-10-04 06:31:19 UTC (rev 2178)
+++ trunk/samba/debian/rules	2008-10-04 06:32:24 UTC (rev 2179)
@@ -133,12 +133,6 @@
 
 	$(MAKE) -C source install DESTDIR=$(DESTDIR)
 
-	# 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
 	# default library path. Here we move it to /usr/lib/.