Updating the Debian packaging stuff in packaging/Debian/. This hadn't

been updated since the 3.0.0 release so it was broken for 3.0.1 and
later. It's nice that now the Makefile supports a $DESTDIR for "make
install" :-)
(This used to be commit 40c6bf1498785850789fca3d28ea4e7ceaa296ce)

1 files changed, 11 insertions, 72 deletions

diff --git a/packaging/Debian/debian/patches/installswat.sh.patch b/packaging/Debian/debian/patches/installswat.sh.patch
index b425e3bef7..a2b1cf8f43 100644
--- a/packaging/Debian/debian/patches/installswat.sh.patch
+++ b/packaging/Debian/debian/patches/installswat.sh.patch
@@ -1,76 +1,15 @@
---- 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
+--- samba-3.0.1/source/script/installswat.sh.orig	2004-01-13 13:43:42.000000000 -0500
++++ samba-3.0.1/source/script/installswat.sh	2004-01-13 12:56:49.000000000 -0500
+@@ -85,7 +85,11 @@
  
- LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
--echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
-+echo Installing the following additional langs: `cd $SRCDIR../swat/lang/; /bin/echo ??`
- 
- for ln in $LANGS; do 
-  SWATLANGDIR=$SWATDIR/$ln
-@@ -23,21 +23,17 @@
- 	fi
-     fi
-  done
--done
--
--# Install images
--for ln in $LANGS; do
- 
--for f in $SRCDIR../swat/$ln/images/*.gif; do
-+ # Install images
-+ for f in $SRCDIR../swat/$ln/images/*.gif; do
-       FNAME=$SWATDIR/$ln/images/`basename $f`
-       echo $FNAME
-       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-       chmod 0644 $FNAME
--done
--
--# Install html help
-+ done
- 
--for f in $SRCDIR../swat/$ln/help/*.html; do
-+ # Install html help
-+ for f in $SRCDIR../swat/$ln/help/*.html; do
-       FNAME=$SWATDIR/$ln/help/`basename $f`
-       echo $FNAME
-       if [ "x$BOOKDIR" = "x" ]; then
-@@ -49,26 +45,24 @@
-       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-       rm -f $f
-       chmod 0644 $FNAME
--done
--
--# Install html documentation
--
--for f in $SRCDIR../docs/htmldocs/*.html; do
--      FNAME=$SWATDIR/help/`basename $f`
--      echo $FNAME
--      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
--      chmod 0644 $FNAME
--done
--
--# Install "server-side" includes
-+ done
+ # Install Using Samba book (but only if it is there)
  
--for f in $SRCDIR../swat/$ln/include/*.html; do
-+ # Install "server-side" includes
-+ for f in $SRCDIR../swat/$ln/include/*.html; do
-       FNAME=$SWATDIR/$ln/include/`basename $f`
-       echo $FNAME
-       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-       chmod 0644 $FNAME
-+ done
-+
- done
+-if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then
++# Under Debian we don't actually install the book. The book is part of
++# the samba-doc package, so we just provide a symlink that points to
++# where the book is actually installed. The symlink is created in
++# debian/rules.
++if /bin/false; then
  
-+# 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
- done
+     # Create directories
  
- # Install Using Samba book (but only if it is there)