[Pkg-samba-maint] r1610 - branches/samba/no-more-smbfs/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-11-25 08:43:43 +0000 (Sun, 25 Nov 2007)
New Revision: 1610

Added:
   branches/samba/no-more-smbfs/debian/smbfs.links
Modified:
   branches/samba/no-more-smbfs/debian/rules
   branches/samba/no-more-smbfs/debian/smbfs.files
Log:
install the new mount.smbfs script in the package; use debian/smbfs.links
for the various links specific to this package, rather than
debian/rules+debian/smbfs.files



Modified: branches/samba/no-more-smbfs/debian/rules
===================================================================
--- branches/samba/no-more-smbfs/debian/rules	2007-11-25 08:31:32 UTC (rev 1609)
+++ branches/samba/no-more-smbfs/debian/rules	2007-11-25 08:43:43 UTC (rev 1610)
@@ -148,12 +148,8 @@
 	install -m 0644 source/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
 	install -m 0644 source/nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
 
-ifeq ($(smbfs),yes)
-	# smbfs is deprecated; provide a wrapper that translates any
-	# smbfs mount calls into cifs mount calls
-	ln -s /sbin/umount.cifs $(DESTDIR)/usr/bin/smbumount
-	ln -s umount.cifs.8 $(DESTDIR)/usr/share/man/man8/smbumount.8
-	ln -s mount.cifs.8 $(DESTDIR)/usr/share/man/man8/mount.smbfs.8
+ifeq ($(mount_cifs),yes)
+	install -m 0755 debian/mount.smbfs debian/smbfs/sbin/mount.smbfs
 endif
 
 	# For CUPS to support printing to samba printers, it's necessary

Modified: branches/samba/no-more-smbfs/debian/smbfs.files
===================================================================
--- branches/samba/no-more-smbfs/debian/smbfs.files	2007-11-25 08:31:32 UTC (rev 1609)
+++ branches/samba/no-more-smbfs/debian/smbfs.files	2007-11-25 08:43:43 UTC (rev 1610)
@@ -1,10 +1,6 @@
 sbin/mount.smbfs
-sbin/mount.smb
 sbin/mount.cifs
 sbin/umount.cifs
-usr/bin/smbmount
-usr/bin/smbumount
-usr/bin/smbmnt
 usr/share/man/man8/smbmount.8
 usr/share/man/man8/smbumount.8
 usr/share/man/man8/smbmnt.8

Added: branches/samba/no-more-smbfs/debian/smbfs.links
===================================================================
--- branches/samba/no-more-smbfs/debian/smbfs.links	                        (rev 0)
+++ branches/samba/no-more-smbfs/debian/smbfs.links	2007-11-25 08:43:43 UTC (rev 1610)
@@ -0,0 +1,5 @@
+sbin/mount.smbfs usr/bin/smbmount
+sbin/umount.cifs usr/bin/smbumount
+usr/share/man/man8/umount.cifs.8 usr/share/man/man8/smbumount.8
+usr/share/man/man8/mount.cifs.8 usr/share/man/man8/smbmount.8
+usr/share/man/man8/mount.cifs.8 usr/share/man/man8/mount.smbfs.8