From 7d8d193c05d60ab9b86d52075bb9ec5ad1857903 Mon Sep 17 00:00:00 2001 From: Eloy Paris Date: Mon, 8 Sep 2003 14:48:09 +0000 Subject: Sync'ing packaging/Debian/ with the latest files from the official Debian packages. This files are in sync. with the Debian packages for 3.0.0rc2. --- .../Debian/debian/patches/installswat.sh.patch | 26 ++++++++-------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'packaging/Debian/debian/patches/installswat.sh.patch') diff --git a/packaging/Debian/debian/patches/installswat.sh.patch b/packaging/Debian/debian/patches/installswat.sh.patch index ff5f23a1cf3..b425e3bef76 100644 --- a/packaging/Debian/debian/patches/installswat.sh.patch +++ b/packaging/Debian/debian/patches/installswat.sh.patch @@ -1,5 +1,5 @@ ---- samba-3.0alpha23.orig/source/script/installswat.sh 2001-10-17 16:00:14.000000000 -0400 -+++ samba-3.0alpha23/source/script/installswat.sh 2003-04-06 03:18:29.000000000 -0400 +--- samba_3_0/source/script/installswat.sh.orig 2003-08-28 18:03:10.000000000 -0400 ++++ samba_3_0/source/script/installswat.sh 2003-08-28 18:11:14.000000000 -0400 @@ -9,7 +9,7 @@ echo Installing the Samba Web Administration Tool @@ -36,7 +36,7 @@ FNAME=$SWATDIR/$ln/help/`basename $f` echo $FNAME if [ "x$BOOKDIR" = "x" ]; then -@@ -49,31 +45,31 @@ +@@ -49,26 +45,24 @@ cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? rm -f $f chmod 0644 $FNAME @@ -62,23 +62,15 @@ cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? chmod 0644 $FNAME + done ++ done +# Install html documentation +for f in $SRCDIR../docs/htmldocs/*.html; do -+ FNAME=$SWATDIR/help/`basename $f` -+ echo $FNAME -+ ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges? -+# chmod 0644 $FNAME ++ FNAME=$SWATDIR/help/`basename $f` ++ echo $FNAME ++ ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges? ++ chmod 0644 $FNAME done - # Install Using Samba book - --if [ "x$BOOKDIR" != "x" ]; then -+# For Debian we do not install anything here, we just create a symlink -+# pointing to /usr/share/doc/samba-doc/htmldocs/using_samba/ in -+# debian/rules (peloy@debian.org) -+if /bin/false; then - - # Create directories - + # Install Using Samba book (but only if it is there) -- cgit