[Pkg-samba-maint] [samba] 03/03: Remove the samba-doc package, and move examples files from it to relevant other packages.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch experimental
in repository samba.

commit 2e0558c27b62d42ba4bf198b70e767eb58f8f816
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Sun Nov 8 15:10:39 2015 +0000

    Remove the samba-doc package, and move examples files from it to relevant other packages.
---
 debian/changelog                   |  2 ++
 debian/control                     | 17 +----------------
 debian/libpam-winbind.examples     |  1 +
 debian/samba-common.examples       |  1 +
 debian/samba-dev.examples          |  4 ++++
 debian/samba-doc.docs              |  5 -----
 debian/samba-doc.examples          | 20 --------------------
 debian/samba-doc.install           |  1 -
 debian/samba-doc.lintian-overrides |  3 ---
 debian/samba-testsuite.examples    |  1 +
 debian/samba.examples              |  3 +++
 11 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 408c8e6..8c50894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ samba (2:4.3.1+dfsg-1) UNRELEASED; urgency=medium
   * Remove lib/zlib/contrib/dotzlib/DotZLib.chm from excluded files in
     copyright; no longer shipped upstream.
   * Remove wins2dns.awk example script.
+  * Remove the samba-doc package, and move examples files from it to
+    relevant other packages.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Thu, 01 Oct 2015 21:37:48 +0000
 
diff --git a/debian/control b/debian/control
index 7473a9d..5fee53c 100644
--- a/debian/control
+++ b/debian/control
@@ -307,8 +307,7 @@ Replaces: libdcerpc-dev (<< 2:4.0.9),
           libsmbclient-raw-dev (<< 2:4.0.9),
           libsmbd-dev (<< 2:4.0.9),
           libtorture-dev (<< 2:4.0.9),
-          samba4-dev,
-          samba-doc
+          samba4-dev
 Breaks: libdcerpc-dev (<< 2:4.0.9),
         libdcerpc-server-dev (<< 2:4.0.9),
         libgensec-dev (<< 2:4.0.9),
@@ -333,20 +332,6 @@ Description: tools for extending Samba
  This package contains include files shared by the various Samba-based
  libraries.
 
-Package: samba-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Pre-Depends: dpkg (>= 1.15.6~)
-Description: Samba documentation
- Samba is an implementation of the SMB/CIFS protocol for Unix systems,
- providing support for cross-platform file and printer sharing with
- Microsoft Windows, OS X, and other Unix systems.
- .
- This package contains all the manpage documentation for the Samba
- suite.
-
 Package: python-samba
 Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
diff --git a/debian/libpam-winbind.examples b/debian/libpam-winbind.examples
new file mode 100644
index 0000000..8fe89ad
--- /dev/null
+++ b/debian/libpam-winbind.examples
@@ -0,0 +1 @@
+examples/pam_winbind
diff --git a/debian/samba-common.examples b/debian/samba-common.examples
new file mode 100644
index 0000000..0edd0ea
--- /dev/null
+++ b/debian/samba-common.examples
@@ -0,0 +1 @@
+examples/smb.conf.default
diff --git a/debian/samba-dev.examples b/debian/samba-dev.examples
index 85df54f..998fcfe 100644
--- a/debian/samba-dev.examples
+++ b/debian/samba-dev.examples
@@ -1 +1,5 @@
 examples/VFS
+examples/libsmbclient
+examples/auth
+examples/pdb
+examples/nss
diff --git a/debian/samba-doc.docs b/debian/samba-doc.docs
deleted file mode 100644
index 76f939f..0000000
--- a/debian/samba-doc.docs
+++ /dev/null
@@ -1,5 +0,0 @@
-README
-#docs/THANKS
-#docs/history
-#docs/registry/
-WHATSNEW.txt
diff --git a/debian/samba-doc.examples b/debian/samba-doc.examples
deleted file mode 100644
index 5a5f577..0000000
--- a/debian/samba-doc.examples
+++ /dev/null
@@ -1,20 +0,0 @@
-source3/smbadduser.in
-examples/ad-bench
-examples/auth
-examples/autofs
-examples/dce-dfs
-examples/LDAP
-examples/libsmbclient
-examples/logon
-examples/misc
-examples/nss
-examples/pam_winbind
-examples/pcap2nbench
-examples/pdb
-examples/perfcounter
-examples/printer-accounting
-examples/printing
-examples/README
-examples/scripts
-examples/smb.conf.default
-examples/validchars
diff --git a/debian/samba-doc.install b/debian/samba-doc.install
deleted file mode 100644
index 8b13789..0000000
--- a/debian/samba-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/samba-doc.lintian-overrides b/debian/samba-doc.lintian-overrides
deleted file mode 100644
index 99e620e..0000000
--- a/debian/samba-doc.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# the documentation package should not have a dependency for examples
-samba-doc: script-uses-perl4-libs-without-dep usr/share/doc/samba-doc/examples/printer-accounting/hp5-redir:13 getopts.pl
-samba-doc: script-uses-perl4-libs-without-dep usr/share/doc/samba-doc/examples/printer-accounting/lp-acct:13 getopts.pl
diff --git a/debian/samba-testsuite.examples b/debian/samba-testsuite.examples
new file mode 100644
index 0000000..9161d80
--- /dev/null
+++ b/debian/samba-testsuite.examples
@@ -0,0 +1 @@
+examples/pcap2nbench
diff --git a/debian/samba.examples b/debian/samba.examples
index db0329d..96c5c35 100644
--- a/debian/samba.examples
+++ b/debian/samba.examples
@@ -1 +1,4 @@
 examples/LDAP
+examples/logon
+source3/smbadduser.in
+examples/printing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git