[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: d/gbp.conf: sign-tags = True

[Mathieu Parent]

Mathieu Parent pushed to branch master at Debian Samba Team / samba


Commits:
d98ab800 by Mathieu Parent at 2019-10-02T20:19:31Z
d/gbp.conf: sign-tags = True

- - - - -
2f20b143 by Mathieu Parent at 2019-10-02T20:21:16Z
Do not check smb.conf with testparm when server role=active directory domain controller (Closes: #931734)

Thanks Gernot Schilling

- - - - -
50178f6c by Mathieu Parent at 2019-10-03T05:52:03Z
Force one job during configure step with -j 1 (Closes: #941467)

Not setting -j leads to default which is number of cpus.

See https://salsa.debian.org/samba-team/samba/blob/478603e68024a9c352072c20e0f4f712dd4c5a1c/third_party/waf/waflib/Options.py#L177-212

- - - - -
2b5f7e79 by Mathieu Parent at 2019-10-03T05:52:56Z
Release 2:4.11.0+dfsg-8

- - - - -


4 changed files:

- debian/changelog
- debian/gbp.conf
- debian/rules
- debian/samba-common-bin.postinst


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+samba (2:4.11.0+dfsg-8) unstable; urgency=medium
+
+  * d/gbp.conf: sign-tags = True
+  * Do not check smb.conf with testparm when server role=active directory domain
+    controller (Closes: #931734)
+  * Force one job during configure step with -j 1 (Closes: #941467).
+    Not setting -j leads to default which is number of cpus
+
+ -- Mathieu Parent <sathieu at debian.org>  Thu, 03 Oct 2019 07:52:39 +0200
+
 samba (2:4.11.0+dfsg-7) unstable; urgency=medium
 
   * Always evaluate WAF_NO_PARALLEL to ensure correct value (Closes: #941467)


=====================================
debian/gbp.conf
=====================================
@@ -1,4 +1,5 @@
 [DEFAULT]
+sign-tags = True
 pristine-tar = True
 upstream-branch = upstream_4.11
 # don't hardcode the debian branch


=====================================
debian/rules
=====================================
@@ -25,7 +25,7 @@ export PYSHORT=python3
 export PYTHON=$(shell which $(PYSHORT))
 export PYTHON_CONFIG="$(PYTHON)-config"
 WAF := $(PYTHON) ./buildtools/bin/waf -v
-WAF_NO_PARALLEL := $(WAF)
+WAF_NO_PARALLEL := $(WAF) -j 1
 
 # wrapper around cups-config, to work around #726726
 export PATH:=$(CURDIR)/debian/bin:$(PATH)


=====================================
debian/samba-common-bin.postinst
=====================================
@@ -2,15 +2,15 @@
 
 set -e
 
-echo "Checking smb.conf with testparm"
-testparm -d1 --suppress-prompt > /dev/null
-echo "Done"
-
 SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1`
 if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
     echo "Checking smb.conf with samba-tool"
     samba-tool testparm -d1 --suppress-prompt > /dev/null
     echo "Done"
+else
+    echo "Checking smb.conf with testparm"
+    testparm -d1 --suppress-prompt > /dev/null
+    echo "Done"
 fi
 
 #DEBHELPER#



View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/478603e68024a9c352072c20e0f4f712dd4c5a1c...2b5f7e79e1b23eb059220678a7bf3ac2e0025bca

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/478603e68024a9c352072c20e0f4f712dd4c5a1c...2b5f7e79e1b23eb059220678a7bf3ac2e0025bca
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20191003/e1827d3d/attachment-0001.html>