[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: remove static/fixed branding d/patches/VERSION.patch

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
c15308c1 by Michael Tokarev at 2022-10-27T16:59:27+03:00
remove static/fixed branding d/patches/VERSION.patch

- - - - -
0aee7382 by Michael Tokarev at 2022-10-27T16:59:27+03:00
d/rules: implement dynamic branding of VERSION file based on dpkg-vendor

- - - - -
d70bdef6 by Michael Tokarev at 2022-10-27T17:00:16+03:00
d/rules: simplify package interdependency checking

- - - - -
d0ec0b5b by Michael Tokarev at 2022-10-27T17:33:22+03:00
d/rules: add a lot more interpackage dependency checks

- - - - -


3 changed files:

- − debian/patches/VERSION.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/VERSION.patch deleted
=====================================
@@ -1,19 +0,0 @@
-From: Eloy A. Paris <peloy at debian.org>
-Subject: Add "Debian" as vendor suffix
-
-Forwarded: not-needed
----
- VERSION | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/VERSION b/VERSION
-index d91963a..2650887 100644
---- a/VERSION
-+++ b/VERSION
-@@ -123,5 +123,5 @@ SAMBA_VERSION_RELEASE_NICKNAME=
- #  ->  "3.0.0rc2-VendorVersion"                        #
- #                                                      #
- ########################################################
--SAMBA_VERSION_VENDOR_SUFFIX=
-+SAMBA_VERSION_VENDOR_SUFFIX=Debian
- SAMBA_VERSION_VENDOR_PATCH=


=====================================
debian/patches/series
=====================================
@@ -2,7 +2,6 @@ libsmbclient-ensure-lfs-221618.patch
 README_nosmbldap-tools.patch
 smbclient-pager.patch
 usershare.patch
-VERSION.patch
 heimdal-rfc3454.txt
 add-so-version-to-private-libraries
 smbd.service-Run-update-apparmor-samba-profile-befor.patch


=====================================
debian/rules
=====================================
@@ -108,6 +108,12 @@ install install-arch install-indep: %:
 configure: bin/configured.stamp
 .PHONY: configure
 bin/configured.stamp:
+# branding
+	if [ ! -f VERSION.orig ]; then \
+	  mv VERSION VERSION.orig; \
+	  sed -r -e 's/^(SAMBA_VERSION_VENDOR_SUFFIX).*/\1=${DEB_VENDOR}/' \
+		VERSION.orig > VERSION; \
+	fi
 	${WAF} -j1 configure -C ${conf_args} || \
 	  { $(if ${V},echo "==== contents of config.log:"; cat bin/config.log;) false; }
 # #1021371: we only need the single "version" symbol LDB_2.4.4 in the library
@@ -286,6 +292,10 @@ override_dh_makeshlibs:
 
 	rm -f debian/python3-ldb.symbols
 
+# depcheck package, dep1|dep2... -- dependencies which should NOT be there
+depcheck = if egrep '^shlibs.Depends=.* ($(strip $2)) ' debian/$(strip $1).substvars; \
+	then echo 'E: $(strip $1) should not depend on $(strip $2)' >&2; exit 1; fi
+
 override_dh_shlibdeps:
 # for specific executables/modules, put dependencies in separate variables
 # to change Depends to Recommends for them in d/control
@@ -304,19 +314,13 @@ ifneq (,$(filter samba-vfs-modules,${build_packages}))
 	    $(if ${with_glusterfs}, debian/samba-vfs-modules/usr/lib/*/samba/vfs/glusterfs.so)
 endif
 # after shlibdeps run, check that we don't have wrong depdendencies
-	# samba-libs should not depend on samba (!)
-	if egrep "^shlibs.Depends=.* samba " debian/samba-libs.substvars; \
-	then echo "E: samba-libs should not depend on samba" >&2; exit 1; fi
-	# libldb2 should not depend on samba-libs
-	# (also see debian/patches/use-bzero-instead-of-memset_s.diff)
-	if egrep "^shlibs.Depends=.* (samba-libs|samba) " debian/libldb2.substvars; \
-	then echo "E: libldb2 should not depend on samba libs" >&2; exit 1; fi
-	# python3-samba should not depend on samba
-	if egrep "^shlibs.Depends=.* (samba) " debian/python3-samba.substvars; \
-	then echo "E: python3-samba should not depend on samba" >&2; exit 1; fi
-	# libwbclient0 should not depend on samba-libs
-	if egrep "^shlibs.Depends=.* (samba-libs|samba) " debian/libwbclient0.substvars; \
-	then echo "E: libwbclient0 should not depend on samba libs" >&2; exit 1; fi
+	$(call depcheck, samba-libs, samba|winbind|smbclient|ctdb)
+	$(call depcheck, smbclient, samba|winbind|ctdb)
+	$(call depcheck, ctdb, samba|winbind|smbclient)
+	$(call depcheck, libldb2, samba|samba-libs|winbind|libwbclient0) # use-bzero-instead-of-memset_s.diff
+	$(call depcheck, python3-samba, samba|winbind|ctdb)
+	$(call depcheck, libwbclient0, samba|samba-libs|winbind|smbclient|ctdb)
+	$(call depcheck, libsmbclient, samba|winbind|smbclient|ctdb)
 
 override_dh_gencontrol:
 	dh_gencontrol $(addprefix -p,${LDB_PACKAGES}) -- -v${LDB_DEB_VERSION}
@@ -326,3 +330,4 @@ clean:
 	# see also debian/clean
 	dh_clean bin/ testbuild/
 	rm -f ${EXTRA_ABI_VERSION_FILES}
+	[ ! -f VERSION.orig ] || mv -f VERSION.orig VERSION



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/f388e03fdf841c755c52ee2e589233a6533a89e1...d0ec0b5b2554d081cebb02008b83f1541553b0a5

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/f388e03fdf841c755c52ee2e589233a6533a89e1...d0ec0b5b2554d081cebb02008b83f1541553b0a5
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/20221027/24721200/attachment-0001.htm>