[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 02/02: debian/control.in/main, debian/rules.d/debhelper.mk: install nscd systemd files. Closes: #767707.



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch sid
in repository glibc.

commit db53c5d59449404dd6b69b4dbeb27320cf2681be
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Sat Oct 15 23:27:55 2016 +0200

    debian/control.in/main, debian/rules.d/debhelper.mk: install nscd systemd files. Closes: #767707.
---
 debian/changelog            |  2 ++
 debian/control              |  2 +-
 debian/control.in/main      |  2 +-
 debian/rules.d/debhelper.mk | 10 ++++++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c193b76..3f36674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,8 @@ glibc (2.24-4) UNRELEASED; urgency=medium
   * debian/control.in/main: add a dependency on lsb-base (>= 3.0-6) for ncsd.
   * debian/debhelper.in/nscd.init: also invalidate services and netgroup
     during reload.  Closes: #793649.
+  * debian/control.in/main, debian/rules.d/debhelper.mk: install nscd systemd
+    files. Closes: #767707.
 
  -- Aurelien Jarno <aurel32@debian.org>  Sat, 17 Sep 2016 20:03:04 +0200
 
diff --git a/debian/control b/debian/control
index 515dfdd..aef6947 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: glibc
 Section: libs
 Priority: required
 Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file, quilt,
- autoconf, gawk, debhelper (>= 9.20141010), rdfind, symlinks, netbase,
+ autoconf, gawk, debhelper (>= 9.20160709), rdfind, symlinks, netbase,
  linux-libc-dev (>= 3.9) [linux-any],
  libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
  mig (>= 1.5-3) [hurd-i386], gnumach-dev (>= 2:1.4+git20141109~) [hurd-i386],
diff --git a/debian/control.in/main b/debian/control.in/main
index 8fa9d9d..562ed73 100644
--- a/debian/control.in/main
+++ b/debian/control.in/main
@@ -2,7 +2,7 @@ Source: glibc
 Section: libs
 Priority: required
 Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file, quilt,
- autoconf, gawk, debhelper (>= 9.20141010), rdfind, symlinks, netbase,
+ autoconf, gawk, debhelper (>= 9.20160709), rdfind, symlinks, netbase,
  linux-libc-dev (>= 3.9) [linux-any],
  libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
  mig (>= 1.5-3) [hurd-i386], gnumach-dev (>= 2:1.4+git20141109~) [hurd-i386],
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index 14845f3..c6889ac 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -25,7 +25,9 @@ $(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGUL
 	else \
 		dh_installchangelogs -p$(curpass) debian/changelog.upstream ; \
 	fi
+	dh_systemd_enable -p$(curpass)
 	dh_installinit -p$(curpass)
+	dh_systemd_start -p$(curpass)
 	dh_installdocs -p$(curpass) 
 	dh_lintian -p $(curpass)
 	dh_link -p$(curpass)
@@ -146,6 +148,12 @@ $(stamp)debhelper-common:
 	  esac; \
 	done
 
+	# Install nscd systemd files on linux
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	cp nscd/nscd.service debian/nscd.service
+	cp nscd/nscd.tmpfiles debian/nscd.tmpfile
+endif
+
 	# Generate common substvars files.
 	: > tmp.substvars
 ifeq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
@@ -268,5 +276,7 @@ clean::
 	rm -f debian/*.NEWS
 	rm -f debian/*.README.Debian
 	rm -f debian/*.triggers
+	rm -f debian/*.service
+	rm -f debian/*.tmpfile
 
 	rm -f $(stamp)binaryinst*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: