[Pkg-samba-maint] r1426 - trunk/samba/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-05-30 20:03:22 +0000 (Wed, 30 May 2007)
New Revision: 1426

Added:
   trunk/samba/debian/patches/no_smbmount_symlink.patch
Modified:
   trunk/samba/debian/patches/samba.patch
   trunk/samba/debian/patches/series
Log:
Split out samba.patch which seems made of two different fixes


Added: trunk/samba/debian/patches/no_smbmount_symlink.patch
===================================================================
--- trunk/samba/debian/patches/no_smbmount_symlink.patch	                        (rev 0)
+++ trunk/samba/debian/patches/no_smbmount_symlink.patch	2007-05-30 20:03:22 UTC (rev 1426)
@@ -0,0 +1,35 @@
+Goal: installing smbmount and smbumount is done The Debian Way in debian/rules
+
+Fixes: ?
+
+Status wrt upstream: Debian specific
+
+Note: 
+
+Index: samba-3.0.25a/source/script/installbin.sh.in
+===================================================================
+--- samba-3.0.25a.orig/source/script/installbin.sh.in	2007-05-26 07:45:39.764216387 +0200
++++ samba-3.0.25a/source/script/installbin.sh.in	2007-05-26 07:46:32.740638424 +0200
+@@ -21,13 +21,15 @@
+  chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
+ 
+  # this is a special case, mount needs this in a specific location
+- if [ $p2 = smbmount ]; then
+-   if [ ! -d $DESTDIR/@rootsbindir@ ]; then
+-      mkdir $DESTDIR/@rootsbindir@
+-   fi
+-   echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
+-   ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
+- fi
++ # Commented out for the Debian Samba package. We take care of this
++ # important symlink in debian/rules. (peloy at debian.org)
++ # if [ $p2 = smbmount ]; then
++ #  if [ ! -d $DESTDIR/@rootsbindir@ ]; then
++ #     mkdir $DESTDIR/@rootsbindir@
++ #  fi
++ #  echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
++ #  ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
++ # fi
+ done
+ 
+ 

Modified: trunk/samba/debian/patches/samba.patch
===================================================================
--- trunk/samba/debian/patches/samba.patch	2007-05-30 19:58:11 UTC (rev 1425)
+++ trunk/samba/debian/patches/samba.patch	2007-05-30 20:03:22 UTC (rev 1426)
@@ -1,11 +1,9 @@
-Goal: Seems to be multiple:
-      - chunk 1: ?
+Goal: - chunk 1: ?
       - chunk 2: ?
-      - chunk 3: installing smbmount and smbumount is done The Debian Way in debian/rules
 
 Fixes: ?
 
-Status wrt upstream: Chunk 3 is Debian specific. Not sure for chunks 1 and 2
+Status wrt upstream: Not sure
 
 Note: 
 
@@ -52,30 +50,3 @@
  	if ((cli = cli_initialise()) == NULL)
  		return False;
  
-Index: samba-3.0.25a/source/script/installbin.sh.in
-===================================================================
---- samba-3.0.25a.orig/source/script/installbin.sh.in	2007-05-26 07:45:39.764216387 +0200
-+++ samba-3.0.25a/source/script/installbin.sh.in	2007-05-26 07:46:32.740638424 +0200
-@@ -21,13 +21,15 @@
-  chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
- 
-  # this is a special case, mount needs this in a specific location
-- if [ $p2 = smbmount ]; then
--   if [ ! -d $DESTDIR/@rootsbindir@ ]; then
--      mkdir $DESTDIR/@rootsbindir@
--   fi
--   echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
--   ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
-- fi
-+ # Commented out for the Debian Samba package. We take care of this
-+ # important symlink in debian/rules. (peloy at debian.org)
-+ # if [ $p2 = smbmount ]; then
-+ #  if [ ! -d $DESTDIR/@rootsbindir@ ]; then
-+ #     mkdir $DESTDIR/@rootsbindir@
-+ #  fi
-+ #  echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
-+ #  ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
-+ # fi
- done
- 
- 

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2007-05-30 19:58:11 UTC (rev 1425)
+++ trunk/samba/debian/patches/series	2007-05-30 20:03:22 UTC (rev 1426)
@@ -8,6 +8,7 @@
 pam-examples.patch
 README_nosmbldap-tools.patch
 samba.patch
+no_smbmount_symlink.patch
 smbclient-pager.patch
 smbmount-mtab-flags.patch
 smbmount-nomtab.patch