[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.5+dfsg1-806-gfdbe5f7

[Ivo De Decker]

The following commit has been merged in the samba_4.0 branch:
commit 49b5b1aea1239d70dda3f8a9576ae8029c4c0386
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sat May 18 16:12:15 2013 +0200

    fix private_dir and smbpasswd location
    
    Add a waf configure option to specify the smbpasswd location, so that the
    private_dir can be changed to /var/lib/samba/private.
    This is a change from the samba 3.6 packages, which have the private files in
    /var/lib/samba, so the upgrade still needs to be handeled.

diff --git a/debian/changelog b/debian/changelog
index 76ecd58..8e255ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ samba (2:4.0.5+dfsg1-2) UNRELEASED; urgency=low
     support just like 3.6 packages
   * Re-introduce mksmbpasswd for compatibility with 3.* packages
 
+  [ Ivo De Decker ]
+  * Specify all paths using configure options, so that we can finally get rid
+    of the fhs patch. Closes: #705449
+
  -- Andrew Bartlett <abartlet at samba.org>  Thu, 09 May 2013 15:41:19 +1200
 
 samba (2:4.0.5+dfsg1-1.0) UNRELEASED; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 7a454b7..f974d4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ smbclient-pager.patch
 smbtar-bashism.patch
 usershare.patch
 VERSION.patch
+waf_smbpasswd_location
diff --git a/debian/patches/waf_smbpasswd_location b/debian/patches/waf_smbpasswd_location
new file mode 100644
index 0000000..4a20a4f
--- /dev/null
+++ b/debian/patches/waf_smbpasswd_location
@@ -0,0 +1,17 @@
+Description: Add build option for default smbpasswd location
+Author: Ivo De Decker <ivo.dedecker at ugent.be>
+Bug-Debian: http://bugs.debian.org/705449
+Forwarded: TODO
+Last-Update: 20130518
+
+--- a/dynconfig/wscript
++++ b/dynconfig/wscript
+@@ -248,6 +248,8 @@
+     'SMB_PASSWD_FILE' : {
+          'STD-PATH':  '${PRIVATE_DIR}/smbpasswd',
+          'FHS-PATH':  '${PRIVATE_DIR}/smbpasswd',
++         'OPTION':    '--with-smbpasswd-file',
++         'HELPTEXT':  'Where to put the smbpasswd file',
+          'DELAY':     True,
+     },
+ }
diff --git a/debian/rules b/debian/rules
index 66c765c..525685a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,8 @@ conf_args = \
 		--enable-fhs \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--with-privatedir=/etc/samba \
+		--with-privatedir=/var/lib/samba/private \
+		--with-smbpasswd-file=/etc/samba/smbpasswd \
 		--with-piddir=/var/run/samba \
 		--with-pammodulesdir=/lib/$(DEB_HOST_MULTIARCH)/security \
 		--with-pam \

-- 
Debian packaging for Samba