Merge lp:~abone/ubuntu/utopic/bash/fix-1358827 into lp:ubuntu/utopic/bash

[Andrey Bondarenko]

A fix for LP: #1358827 that produce the same behaviour
for users in admin group (deprecated) and sudo group
(this group is used by upstream, Debian and Ubuntu since 12.04)

[Marc Deslauriers (mdeslaur)]

Looks good, I've rebased it on Ubuntu 15.04 and have uploaded it.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-04 09:35:20 +0000
+++ debian/changelog	2014-08-19 16:42:22 +0000
@@ -1,3 +1,10 @@
+bash (4.3-8ubuntu2) utopic; urgency=medium
+
+  * debian/etc.bash.bashrc: print a hint how to get root access if user
+    is in sudo group (lp: #1358827)
+
+ -- Andrey Bondarenko <[e-mail]>  Tue, 19 Aug 2014 22:25:51 +0600
+
 bash (4.3-8ubuntu1) utopic; urgency=medium
 
   * Merge with Debian; remaining changes:
 
=== modified file 'debian/etc.bash.bashrc'
--- debian/etc.bash.bashrc	2014-05-08 11:58:40 +0000
+++ debian/etc.bash.bashrc	2014-08-19 16:42:22 +0000
@@ -39,7 +39,7 @@
 
 # sudo hint
 if [ ! -e "$HOME/.sudo_as_admin_successful" ] && [ ! -e "$HOME/.hushlogin" ] ; then
-    case " $(groups) " in *\ admin\ *)
+    case " $(groups) " in *\ admin\ *|*\ sudo\ *)
     if [ -x /usr/bin/sudo ]; then
 	cat <<-EOF
 	To run a command as administrator (user "root"), use "sudo <command>".