[Pkg-shadow-devel] Ubuntu shadow 1:4.1.4.2-1ubuntu2

[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: Tue, 26 Jan 2010 08:54:59 -0500
Source: shadow
Binary: passwd login
Architecture: source
Version: 1:4.1.4.2-1ubuntu2
Distribution: lucid
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Marc Deslauriers <marc.deslauriers at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
Changes: 
 shadow (1:4.1.4.2-1ubuntu2) lucid; urgency=low
 .
   * debian/{source_shadow.py,rules}: Add apport hook
   * debian/rules: fix FTBFS from newer libtools
Checksums-Sha1: 
 6691bb61568b8fdd7b11d97efe42c6e4d0acd5b5 1668 shadow_4.1.4.2-1ubuntu2.dsc
 6f48697d1b4e8bc739f625270352b64967bd02e7 80672 shadow_4.1.4.2-1ubuntu2.diff.gz
Checksums-Sha256: 
 c34ea4c21162e72a6953c162d0edf71af8b39fd824c262776406886726bd2a73 1668 shadow_4.1.4.2-1ubuntu2.dsc
 f232d4400f1b479542d1752ee2d5a2b38b662289fd0da9797244a64d8da3de8f 80672 shadow_4.1.4.2-1ubuntu2.diff.gz
Files: 
 02c25cb16db6f1960d05216a5123996d 1668 admin required shadow_4.1.4.2-1ubuntu2.dsc
 efbf876366ea3aefe630c8bdf20635d9 80672 admin required shadow_4.1.4.2-1ubuntu2.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.4.2-1ubuntu1/debian/changelog 1:4.1.4.2-1ubuntu2/debian/changelog
--- 1:4.1.4.2-1ubuntu1/debian/changelog	2010-01-26 19:30:12.000000000 +0000
+++ 1:4.1.4.2-1ubuntu2/debian/changelog	2010-01-26 19:30:11.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.1.4.2-1ubuntu2) lucid; urgency=low
+
+  * debian/{source_shadow.py,rules}: Add apport hook
+  * debian/rules: fix FTBFS from newer libtools
+
+ -- Marc Deslauriers <marc.deslauriers at ubuntu.com>  Tue, 26 Jan 2010 08:54:59 -0500
+
 shadow (1:4.1.4.2-1ubuntu1) lucid; urgency=low
 
   * Merged with debian unstable. Remaning changes (LP: #477299):
diff -pruN 1:4.1.4.2-1ubuntu1/debian/rules 1:4.1.4.2-1ubuntu2/debian/rules
--- 1:4.1.4.2-1ubuntu1/debian/rules	2010-01-26 19:30:12.000000000 +0000
+++ 1:4.1.4.2-1ubuntu2/debian/rules	2010-01-26 19:30:11.000000000 +0000
@@ -21,6 +21,7 @@ include /usr/share/cdbs/1/class/autotool
 DEB_AUTO_UPDATE_ACLOCAL  = 1.9
 DEB_AUTO_UPDATE_AUTOCONF = 1.9
 DEB_AUTO_UPDATE_AUTOMAKE = 1.9
+DEB_AUTO_UPDATE_LIBTOOL = pre
 
 # Adds extra options when calling the configure script:
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-shared --without-libcrack --without-audit --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man --disable-account-tools-setuid --with-group-name-max-length=32
@@ -45,6 +46,8 @@ binary-install/login::
 	dh_installpam -p login --name=su
 	install -c -m 444 debian/login.defs debian/login/etc/login.defs
 	install -c -m 444 debian/securetty.$(DEB_HOST_ARCH_OS) debian/login/etc/securetty
+	install -d debian/login/usr/share/apport/package-hooks
+	install -c -m 644 debian/source_shadow.py debian/login/usr/share/apport/package-hooks/source_shadow.py
 	dh_lintian -p login
 
 binary-install/passwd::
diff -pruN 1:4.1.4.2-1ubuntu1/debian/source_shadow.py 1:4.1.4.2-1ubuntu2/debian/source_shadow.py
--- 1:4.1.4.2-1ubuntu1/debian/source_shadow.py	1970-01-01 01:00:00.000000000 +0100
+++ 1:4.1.4.2-1ubuntu2/debian/source_shadow.py	2010-01-26 19:30:11.000000000 +0000
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+
+'''Apport package hook for shadow
+
+(c) 2010 Canonical Ltd.
+Contributors:
+Marc Deslauriers <marc.deslauriers at canonical.com>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+from apport.hookutils import *
+
+def add_info(report):
+
+    attach_file_if_exists(report, '/etc/login.defs', 'LoginDefs')
+
+if __name__ == '__main__':
+    report = {}
+    add_info(report)
+    for key in report:
+        print '[%s]\n%s' % (key, report[key])