[Pkg-shadow-devel] Ubuntu shadow 1:4.1.5.1-1ubuntu3

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Mon, 18 Mar 2013 03:23:31 +0000
Source: shadow
Binary: passwd login
Architecture: source
Version: 1:4.1.5.1-1ubuntu3
Distribution: raring
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
Changes: 
 shadow (1:4.1.5.1-1ubuntu3) raring; urgency=low
 .
   * Install upstart job by-hand, instead of using dh_installinit to avoid
     dependency on upstart-job.
Checksums-Sha1: 
 f9513b24dcf5e257dd04f154f15eaf3838af2dfd 2331 shadow_4.1.5.1-1ubuntu3.dsc
 9d2137eed5d77d4eb1c77c1117d8dcd7d9f26d2a 85551 shadow_4.1.5.1-1ubuntu3.diff.gz
Checksums-Sha256: 
 afe964491db71f9af1223f928b3c3c52f803e1b9d4d53cb86f4c0748f93eed1a 2331 shadow_4.1.5.1-1ubuntu3.dsc
 0f45d946318ec20c9aec3d59008f3a362686a6b51a4fe3b2acbcf0af381ef084 85551 shadow_4.1.5.1-1ubuntu3.diff.gz
Files: 
 20abc8ef1fca1bb72f24f8bfff8f8966 2331 admin required shadow_4.1.5.1-1ubuntu3.dsc
 5e1ec03c36b6d23cb1a1d5bfa4a18764 85551 admin required shadow_4.1.5.1-1ubuntu3.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.5.1-1ubuntu2/debian/changelog 1:4.1.5.1-1ubuntu3/debian/changelog
--- 1:4.1.5.1-1ubuntu2/debian/changelog	2013-03-18 06:05:53.000000000 +0000
+++ 1:4.1.5.1-1ubuntu3/debian/changelog	2013-03-18 06:05:53.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.1.5.1-1ubuntu3) raring; urgency=low
+
+  * Install upstart job by-hand, instead of using dh_installinit to avoid
+    dependency on upstart-job.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Mon, 18 Mar 2013 03:23:31 +0000
+
 shadow (1:4.1.5.1-1ubuntu2) raring; urgency=low
 
   * Revert build-dependency from gettext:any to gettext, now that gettext is
diff -pruN 1:4.1.5.1-1ubuntu2/debian/passwd.conf 1:4.1.5.1-1ubuntu3/debian/passwd.conf
--- 1:4.1.5.1-1ubuntu2/debian/passwd.conf	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.1.5.1-1ubuntu3/debian/passwd.conf	2013-03-18 06:05:53.000000000 +0000
@@ -0,0 +1,18 @@
+# passwd - clear locks on passwd and related files
+#
+# Copyright 2012 Canonical Ltd.
+# Author: Dmitrijs Ledkovs
+#
+# This helper clears locks on passwd to avoid million duplicate bug reports
+# like this one: https://launchpad.net/bugs/523896
+# Ideally we'd know what lock-up, and doesn't clear the lock, and fix that.
+# But it appears to be safe enough to clear them unconditionally on boot.
+#
+
+description	"Clear passwd locks"
+
+start on filesystem
+
+task
+
+exec rm -f /etc/gshadow.lock /etc/shadow.lock /etc/passwd.lock /etc/group.lock
diff -pruN 1:4.1.5.1-1ubuntu2/debian/passwd.dirs 1:4.1.5.1-1ubuntu3/debian/passwd.dirs
--- 1:4.1.5.1-1ubuntu2/debian/passwd.dirs	2013-03-18 06:05:53.000000000 +0000
+++ 1:4.1.5.1-1ubuntu3/debian/passwd.dirs	2013-03-18 06:05:53.000000000 +0000
@@ -1,2 +1,3 @@
 usr/share/lintian/overrides
 etc/default
+etc/init
diff -pruN 1:4.1.5.1-1ubuntu2/debian/passwd.upstart 1:4.1.5.1-1ubuntu3/debian/passwd.upstart
--- 1:4.1.5.1-1ubuntu2/debian/passwd.upstart	2013-03-18 06:05:53.000000000 +0000
+++ 1:4.1.5.1-1ubuntu3/debian/passwd.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-# passwd - clear locks on passwd and related files
-#
-# Copyright 2012 Canonical Ltd.
-# Author: Dmitrijs Ledkovs
-#
-# This helper clears locks on passwd to avoid million duplicate bug reports
-# like this one: https://launchpad.net/bugs/523896
-# Ideally we'd know what lock-up, and doesn't clear the lock, and fix that.
-# But it appears to be safe enough to clear them unconditionally on boot.
-#
-
-description	"Clear passwd locks"
-
-start on filesystem
-
-task
-
-exec rm -f /etc/gshadow.lock /etc/shadow.lock /etc/passwd.lock /etc/group.lock
diff -pruN 1:4.1.5.1-1ubuntu2/debian/rules 1:4.1.5.1-1ubuntu3/debian/rules
--- 1:4.1.5.1-1ubuntu2/debian/rules	2013-03-18 06:05:53.000000000 +0000
+++ 1:4.1.5.1-1ubuntu3/debian/rules	2013-03-18 06:05:53.000000000 +0000
@@ -19,11 +19,6 @@ DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 # the other arch, DEB_DESTDIR already points to debian/tmp)
 DEB_DESTDIR=$(CURDIR)/debian/tmp
 
-## Ubuntu
-# Upstart job for clearing locks
-DEB_DH_INSTALLINIT_ARGS=--upstart-only --no-start
-##
-
 include /usr/share/cdbs/1/class/autotools.mk
 # Automatically update autoconf, etc.
 DEB_AUTO_UPDATE_ACLOCAL  = 1.9
@@ -68,6 +63,12 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	install -c -m 444 debian/login.defs debian/passwd/etc/login.defs
 endif
 	install -c -m 644 debian/useradd.default debian/passwd/etc/default/useradd
+
+	## Ubuntu
+	# Upstart job for clearing locks
+	install -m 644 debian/passwd.conf debian/passwd/etc/init/passwd.conf
+	##
+
 	install -d debian/passwd/sbin
 	install -c -m 555 debian/shadowconfig.sh debian/passwd/sbin/shadowconfig
 	install -c -m 444 debian/cpgr.8 debian/passwd/usr/share/man/man8