[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.6+dfsg-837-g5a9fb0e

[Andrew Bartlett]

The following commit has been merged in the samba_4.0 branch:
commit 6c80614f8d487255ceb8ddd6d4a6c1d5fd38056b
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 15 16:46:53 2013 +1000

    move smbpasswd.8 samba.7 back to samba-common-bin to match 3.6
    
    This avoids needing to break and replace packages, and appears to be the correct
    location anyway.
    
    Andrew Bartlett

diff --git a/debian/samba-ad-dc.install b/debian/samba-ad-dc.install
index 2457664..1e23150 100644
--- a/debian/samba-ad-dc.install
+++ b/debian/samba-ad-dc.install
@@ -17,4 +17,3 @@ usr/sbin/samba_upgradedns
 usr/share/man/man1/oLschema2ldif.1
 usr/share/man/man8/samba.8
 usr/share/samba/setup
-usr/share/man/man7/samba.7
diff --git a/debian/samba-common-bin.install b/debian/samba-common-bin.install
index 6e6d42a..f6d61a5 100644
--- a/debian/samba-common-bin.install
+++ b/debian/samba-common-bin.install
@@ -30,4 +30,6 @@ usr/share/man/man1/dbwrap_tool.1
 usr/share/man/man5/smb.conf.5
 usr/share/man/man5/lmhosts.5
 usr/share/man/man5/smbpasswd.5
+usr/share/man/man8/smbpasswd.8
 usr/share/man/man8/net.8
+usr/share/man/man7/samba.7
diff --git a/debian/samba.install b/debian/samba.install
index 08bb5b8..a5e3c64 100644
--- a/debian/samba.install
+++ b/debian/samba.install
@@ -27,5 +27,4 @@ usr/share/man/man8/idmap_tdb2.8
 usr/share/man/man8/nmbd.8
 usr/share/man/man8/pdbedit.8
 usr/share/man/man8/smbd.8
-usr/share/man/man8/smbpasswd.8
 usr/share/man/man8/smbta-util.8

-- 
Debian packaging for Samba