This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.25
in repository glibc.
commit 65fbea33aefb9ab86e296db361e6ef7b7ab664d2
Author: Aurelien Jarno <aurel...@aurel32.net>
Date: Sat Aug 26 15:44:32 2017 +0200
debian/debhelper.in/libc.postinst, debian/script.in/nsscheck.sh: drop
wheezy to jessie upgrade code for samba.
---
debian/changelog | 2 ++
debian/debhelper.in/libc.postinst | 7 -------
debian/script.in/nsscheck.sh | 1 +
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f2273eb..a0d4af4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ glibc (2.25-0experimental2) UNRELEASED; urgency=medium
fix FTBFS on HPPA.
* debian/debhelper.in/nscd.init: add support for the try-restart argument
to nscd's init script.
+ * debian/debhelper.in/libc.postinst, debian/script.in/nsscheck.sh: drop
+ wheezy to jessie upgrade code for samba.
-- Aurelien Jarno <aure...@debian.org> Sun, 20 Aug 2017 19:05:48 +0200
diff --git a/debian/debhelper.in/libc.postinst
b/debian/debhelper.in/libc.postinst
index 081b265..a92e331 100644
--- a/debian/debhelper.in/libc.postinst
+++ b/debian/debhelper.in/libc.postinst
@@ -138,13 +138,6 @@ then
echo "Restarting services possibly affected by the upgrade:"
failed=""
for service in $services; do
- # We can't just use a generic rewrite here, as it was
- # samba in wheezy and smbd in jessie, which confuses.
- if [ "$service" = "samba" ]; then
- if [ -x /etc/init.d/smbd ] || [ -f /etc/init/smbd
]; then
- service="smbd"
- fi
- fi
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
idl="invoke-rc.d ${service}"
elif [ -f /usr/share/file-rc/rc ] || [ -f
/usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ]; then
diff --git a/debian/script.in/nsscheck.sh b/debian/script.in/nsscheck.sh
index 95d4f7e..53f7e7d 100644
--- a/debian/script.in/nsscheck.sh
+++ b/debian/script.in/nsscheck.sh
@@ -11,6 +11,7 @@
-e's/\blpr-ppd\b/lpd-ppd/g' \
-e's/\bmysql-server\b/mysql/g' \
-e's/\bsasl2-bin\b/saslauthd/g' \
+ -e's/\bsamaba\b/smbd/g' \
)
echo
echo "Checking init scripts..."
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
