← Back to branch summary

~ubuntu-branches/ubuntu/feisty/samba/feisty-security

« back to all changes in this revision

Viewing changes to debian/patches/.svn/text-base/installswat.sh.patch.svn-base

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2006-03-24 02:59:17 UTC
  • mfrom: (0.5.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060324025917-ztv23ezkut7lt4t1
Tags: 3.0.21c-1ubuntu1
* Merge with Debian for new upstream bugfixes, UVF exception by mdz.
* Remove dapper->dapper upgrade hack, which should be a non-issue now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/.svn/text-base/installswat.sh.patch.svn-base
1
 
Index: samba-3.0.21a.new/source/script/installswat.sh
2
 
===================================================================
3
 
--- samba-3.0.21a.new.orig/source/script/installswat.sh 2005-12-20 16:28:39.000000000 +0100
4
 
+++ samba-3.0.21a.new/source/script/installswat.sh      2006-01-02 09:45:50.547172952 +0100
5
 
@@ -114,7 +114,11 @@
6
 
 
7
 
 # Install Using Samba book (but only if it is there)
8
 
 
9
 
-if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then
10
 
+# Under Debian we don't actually install the book. The book is part of
11
 
+# the samba-doc package, so we just provide a symlink that points to
12
 
+# where the book is actually installed. The symlink is created in
13
 
+# debian/rules.
14
 
+if /bin/false; then
15
 
 
16
 
     # Create directories
17