[Pkg-shadow-devel] Ubuntu shadow 1:4.1.4.2+svn3283-3ubuntu3

[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: Wed, 30 Nov 2011 22:47:47 +0100
Source: shadow
Binary: passwd login
Architecture: source
Version: 1:4.1.4.2+svn3283-3ubuntu3
Distribution: precise
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Loïc Minier <loic.minier at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
Changes: 
 shadow (1:4.1.4.2+svn3283-3ubuntu3) precise; urgency=low
 .
   * Fix case of ttyAMA0-3 devices and move them near the ttyAM0-15 ones;
     Debian #544184; fixes console on Vexpress boards (e.g. in QEMU).
Checksums-Sha1: 
 74a1f3efaaac6f4920b77862cbd9bd9a23dacf97 1752 shadow_4.1.4.2+svn3283-3ubuntu3.dsc
 a24d4dc978bbaac150dde8ad07d96805b378ea73 332631 shadow_4.1.4.2+svn3283-3ubuntu3.diff.gz
Checksums-Sha256: 
 aa1c9b7eefcd75e71a62814a794a14b59f21caa02e59c218ad7602478c1307bf 1752 shadow_4.1.4.2+svn3283-3ubuntu3.dsc
 7b6ef6d0dcb0131342c050d89d30ec5069005e1e7be006b090f3dd82769da979 332631 shadow_4.1.4.2+svn3283-3ubuntu3.diff.gz
Files: 
 ee326f2995a0379d3b475e3126c34b31 1752 admin required shadow_4.1.4.2+svn3283-3ubuntu3.dsc
 ee53e3281d2a9fbfb2675a32dfe59f8e 332631 admin required shadow_4.1.4.2+svn3283-3ubuntu3.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.4.2+svn3283-3ubuntu2/debian/changelog 1:4.1.4.2+svn3283-3ubuntu3/debian/changelog
--- 1:4.1.4.2+svn3283-3ubuntu2/debian/changelog	2011-12-01 16:48:10.000000000 +0000
+++ 1:4.1.4.2+svn3283-3ubuntu3/debian/changelog	2011-12-01 16:48:04.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.1.4.2+svn3283-3ubuntu3) precise; urgency=low
+
+  * Fix case of ttyAMA0-3 devices and move them near the ttyAM0-15 ones;
+    Debian #544184; fixes console on Vexpress boards (e.g. in QEMU).
+
+ -- Loïc Minier <loic.minier at ubuntu.com>  Wed, 30 Nov 2011 22:47:47 +0100
+
 shadow (1:4.1.4.2+svn3283-3ubuntu2) oneiric; urgency=low
 
   * debian/login.defs:
diff -pruN 1:4.1.4.2+svn3283-3ubuntu2/debian/securetty.linux 1:4.1.4.2+svn3283-3ubuntu3/debian/securetty.linux
--- 1:4.1.4.2+svn3283-3ubuntu2/debian/securetty.linux	2011-12-01 16:48:10.000000000 +0000
+++ 1:4.1.4.2+svn3283-3ubuntu3/debian/securetty.linux	2011-12-01 16:48:04.000000000 +0000
@@ -230,6 +230,12 @@ ttyAM13
 ttyAM14
 ttyAM15
 
+# Embedded ARM AMBA PL011 ports (e.g. emulated by QEMU)
+ttyAMA0
+ttyAMA1
+ttyAMA2
+ttyAMA3
+
 # DataBooster serial ports
 ttyDB0
 ttyDB1
@@ -375,9 +381,3 @@ ttymxc3
 ttymxc4
 ttymxc5
 
-# Embedded ARM AMBA PL011 ports (e.g. emulated by QEMU)
-ttyama0
-ttyama1
-ttyama2
-ttyama3
-