[Pkg-samba-maint] r797 - trunk

Noèl Köthe noel at costa.debian.org
Tue Dec 13 20:33:27 UTC 2005 

Author: noel
Date: 2005-12-13 20:33:23 +0000 (Tue, 13 Dec 2005)
New Revision: 797

Modified:
   trunk/README.debian
   trunk/changelog
   trunk/control
   trunk/control.in
   trunk/rules
   trunk/samba-doc.docs
   trunk/swat.files
   trunk/swat.postinst
Log:
separate samba-doc-pdf package. Closes: #281971; swat doc symlinked to samba-doc; swat now depends on samba-doc. Closes: #233447

Modified: trunk/README.debian
===================================================================
--- trunk/README.debian	2005-12-11 09:18:50 UTC (rev 796)
+++ trunk/README.debian	2005-12-13 20:33:23 UTC (rev 797)
@@ -84,6 +84,7 @@
 smbclient: A LanManager like simple client for Unix.
 swat: Samba Web Administration Tool
 samba-doc: Samba documentation.
+samba-doc-pdf: Samba documentation (PDF format).
 smbfs: Mount and umount commands for the smbfs (works with 2.2.x and
 	above kernels, not with 2.0.x kernels.)
 libpam-smbpass: pluggable authentication module for SMB password

Modified: trunk/changelog
===================================================================
--- trunk/changelog	2005-12-11 09:18:50 UTC (rev 796)
+++ trunk/changelog	2005-12-13 20:33:23 UTC (rev 797)
@@ -1,11 +1,17 @@
 samba (3.0.20b-4) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
   * Remove the smbldap-tools-* directory from the examples of samba-doc
     as these tools exist as an independent package. Closes: #341934
   * Swedish debconf translation update. Closes: #342022
   * Preserve the local admin settings for run_mode in /etc/default/samba
     when upgrading. Closes: #234038, #267988, #269735
 
+  [ Peter Eisentraut ]
+  * Added separate samba-doc-pdf package. Closes: #281971
+  * Removed duplicate documentation in swat package, symlinked to
+    samba-doc; swat now depends on samba-doc. Closes: #233447
+
  -- Christian Perrier <bubulle at debian.org>  Sun, 11 Dec 2005 09:46:58 +0100
 
 samba (3.0.20b-3) unstable; urgency=low

Modified: trunk/control
===================================================================
--- trunk/control	2005-12-11 09:18:50 UTC (rev 796)
+++ trunk/control	2005-12-13 20:33:23 UTC (rev 797)
@@ -28,6 +28,7 @@
   smbclient - LanManager-like simple client for Unix.
   swat - Samba Web Administration Tool
   samba-doc - Samba documentation.
+  samba-doc-pdf - Samba documentation in PDF format.
   smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above).
   libpam-smbpass - pluggable authentication module for SMB password database
   libsmbclient - Shared library that allows applications to talk to SMB servers
@@ -74,8 +75,7 @@
 
 Package: swat
 Architecture: any
-Depends: samba (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, netbase
-Recommends: samba-doc
+Depends: samba (= ${Source-Version}), samba-doc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, netbase
 Description: Samba Web Administration Tool
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve
@@ -84,9 +84,6 @@
  .
  This package contains the components of the Samba suite that are needed
  for Web administration of the Samba server.
- .
- Note: if you want to use the on-line documentation that is accesible
- through the Swat front-end you must install the samba-doc package.
 
 Package: samba-doc
 Section: doc
@@ -98,8 +95,20 @@
  is sometimes also referred to as the LanManager or NetBIOS protocol.
  .
  This package contains all the documentation that comes in the original
- tarball.
+ tarball, except in PDF format.
 
+Package: samba-doc-pdf
+Section: doc
+Architecture: all
+Description: Samba documentation (PDF format)
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains all the documentation that comes in the original
+ tarball in PDF format.
+
 Package: smbfs
 Section: otherosfs
 Priority: optional
@@ -166,7 +175,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: samba (<= 2.2.3-2)
 Description: service to resolve user and group information from Windows NT servers
  This package provides the winbindd daemon, which provides a

Modified: trunk/control.in
===================================================================
--- trunk/control.in	2005-12-11 09:18:50 UTC (rev 796)
+++ trunk/control.in	2005-12-13 20:33:23 UTC (rev 797)
@@ -28,6 +28,7 @@
   smbclient - LanManager-like simple client for Unix.
   swat - Samba Web Administration Tool
   samba-doc - Samba documentation.
+  samba-doc-pdf - Samba documentation in PDF format.
   smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above).
   libpam-smbpass - pluggable authentication module for SMB password database
   libsmbclient - Shared library that allows applications to talk to SMB servers
@@ -74,8 +75,7 @@
 
 Package: swat
 Architecture: any
-Depends: samba (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, netbase
-Recommends: samba-doc
+Depends: samba (= ${Source-Version}), samba-doc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, netbase
 Description: Samba Web Administration Tool
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve
@@ -84,9 +84,6 @@
  .
  This package contains the components of the Samba suite that are needed
  for Web administration of the Samba server.
- .
- Note: if you want to use the on-line documentation that is accesible
- through the Swat front-end you must install the samba-doc package.
 
 Package: samba-doc
 Section: doc
@@ -98,8 +95,20 @@
  is sometimes also referred to as the LanManager or NetBIOS protocol.
  .
  This package contains all the documentation that comes in the original
- tarball.
+ tarball, except in PDF format.
 
+Package: samba-doc-pdf
+Section: doc
+Architecture: all
+Description: Samba documentation (PDF format)
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains all the documentation that comes in the original
+ tarball in PDF format.
+
 Package: smbfs
 Section: otherosfs
 Priority: optional

Modified: trunk/rules
===================================================================
--- trunk/rules	2005-12-11 09:18:50 UTC (rev 796)
+++ trunk/rules	2005-12-13 20:33:23 UTC (rev 797)
@@ -215,12 +215,6 @@
 	# Install man pages for files without man pages in the upstream sources
 	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
 
-	# We don't provide the "Using Samba" book in the swat package.
-	# It's provided in the samba-doc package so in the swat package
-	# we just provide a symlink to the real book.
-	ln -s ../../doc/samba-doc/htmldocs/using_samba \
-	      $(DESTDIR)/usr/share/samba/swat/using_samba
-
 	# The smbwrapper package is not being generated anymore, so we must
 	#	delete the related man pages.
 	rm $(DESTDIR)/usr/share/man/man1/smbsh.1

Modified: trunk/samba-doc.docs
===================================================================
--- trunk/samba-doc.docs	2005-12-11 09:18:50 UTC (rev 796)
+++ trunk/samba-doc.docs	2005-12-13 20:33:23 UTC (rev 797)
@@ -1,7 +1,4 @@
 README
-docs/Samba3-ByExample.pdf
-docs/Samba3-Developers-Guide.pdf
-docs/Samba3-HOWTO.pdf
 docs/THANKS
 docs/history
 docs/htmldocs/

Modified: trunk/swat.files
===================================================================
--- trunk/swat.files	2005-12-11 09:18:50 UTC (rev 796)
+++ trunk/swat.files	2005-12-13 20:33:23 UTC (rev 797)
@@ -1,3 +1,6 @@
 usr/sbin/swat
-usr/share/samba/swat
+usr/share/samba/swat/help/welcome.html
+usr/share/samba/swat/images
+usr/share/samba/swat/include
+usr/share/samba/swat/lang
 usr/share/man/man8/swat.8

Modified: trunk/swat.postinst
===================================================================
--- trunk/swat.postinst	2005-12-11 09:18:50 UTC (rev 796)
+++ trunk/swat.postinst	2005-12-13 20:33:23 UTC (rev 797)
@@ -1,26 +1,22 @@
-#!/bin/sh
-#
-#
+#!/bin/sh -e
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+action="$1"
+oldversion="$2"
 
 # Needed to run the .config script even if we don't use debconf'
 . /usr/share/debconf/confmodule
 
-case "$1" in
-	configure)
-		;;
-	abort-upgrade|abort-remove|abort-deconfigure)
-		exit 0
-		;;
-	*)
-		echo "$0: Unknown action \"$1\""
-		exit 0
-		;;
-esac
-
 # Set up swat, turned off by default.
 update-inetd --group OTHER --add \
  '#<off># swat\t\tstream\ttcp\tnowait.400\troot\t/usr/sbin/tcpd\t/usr/sbin/swat'
 
+# Fix symlinks
+for dir in manpages Samba3-ByExample Samba3-Developers-Guide Samba3-HOWTO; do
+	if [ ! -L /usr/share/samba/swat/help/$dir ] && \
+	   dpkg --compare-versions "$oldversion" lt-nl 3.0.20b-3; then
+		rm -rf /usr/share/samba/swat/help/$dir
+		ln -s ../../../doc/samba-doc/htmldocs/$dir /usr/share/samba/swat/help/$dir
+	fi
+done
+
 #DEBHELPER#

More information about the Pkg-samba-maint mailing list