[Pkg-samba-maint] [Git][samba-team/samba][master] 5 commits: d/rules: pam.d/samba should go to /etc, not /

[Michael Tokarev (@mjt)]

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


Commits:
05f56a0e by Michael Tokarev at 2022-10-25T13:53:34+03:00
d/rules: pam.d/samba should go to /etc, not /

- - - - -
7b93adda by Michael Tokarev at 2022-10-25T13:54:10+03:00
d/README.source.md: it is README.source.md not README.source

- - - - -
3e3fba07 by Michael Tokarev at 2022-10-25T13:54:21+03:00
d/control: bump Standards-Version to 4.6.1 (no changes)

- - - - -
bb21128d by Michael Tokarev at 2022-10-25T13:54:58+03:00
d/rules: verify that samba-libs does not depend on samba

- - - - -
e97bb2bd by Michael Tokarev at 2022-10-25T13:55:58+03:00
update changelog; upload 4.16.6+dfsg-2 to unstable

- - - - -


4 changed files:

- debian/README.source.md
- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/README.source.md
=====================================
@@ -70,7 +70,7 @@ After `gbp pull`:
     # Edit debian/watch's major version
     editor debian/watch
     # Edit this file's major version
-    editor debian/README.source
+    editor debian/README.source.md
     # Commit
     git commit -m"Update d/gbp.conf, d/watch and d/README.source for ${major_version}" debian/gbp.conf debian/watch debian/README.source.md
     # Create the new upstream branch


=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+samba (2:4.16.6+dfsg-2) unstable; urgency=medium
+
+  * d/rules: pam.d/samba should go to /etc, not /
+  * d/README.source.md: it is README.source.md not README.source
+  * d/control: bump Standards-Version to 4.6.1 (no changes)
+  * d/rules: verify that samba-libs does not depend on samba
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Tue, 25 Oct 2022 13:55:33 +0300
+
 samba (2:4.16.6+dfsg-1) unstable; urgency=medium
 
   * new upstream security release 4.16.6, fixing:


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Uploaders: Steve Langasek <vorlon at debian.org>,
            Andrew Bartlett <abartlet+debian at catalyst.net.nz>,
            Michael Tokarev <mjt at tls.msk.ru>
 Homepage: https://www.samba.org
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Build-Depends:
 	debhelper-compat (= 13),
 	dh-exec,


=====================================
debian/rules
=====================================
@@ -241,7 +241,7 @@ endif
 	install -Dp -m0644 debian/gdbcommands -t debian/samba-common/etc/samba/
 	install -Dp -m0755 debian/samba-common.dhcp debian/samba-common/etc/dhcp/dhclient-enter-hooks.d/samba
 	# we wrongly have pam file in samba-common instead of samba
-	install -Dp -m0755 debian/samba.pam debian/samba-common/pam.d/samba
+	install -Dp -m0755 debian/samba.pam debian/samba-common/etc/pam.d/samba
 
 # include a command only if the given package is being built
 ifpkg = $(if $(filter ${1},${build_packages}),${2})
@@ -308,6 +308,9 @@ 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; \



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/68ffdcae982cb95510118b1ad12cf5b7e846d356...e97bb2bd6a00b5e45e2eb2693fd115c5fc99f5fd

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/68ffdcae982cb95510118b1ad12cf5b7e846d356...e97bb2bd6a00b5e45e2eb2693fd115c5fc99f5fd
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/20221025/30c77c58/attachment-0001.htm>