Merge lp:~fougner/ubuntu/oneiric/base-files/fix-for-790050 into lp:ubuntu/oneiric/base-files

[Alexander Fougner]

[lp:~fougner/ubuntu/oneiric/base-files/fix-for-790050]

76. By Alexander Fougner on 2011-06-18

changed release name in debian/changelog, natty->oneiric

[Anders Kaseorg (andersk)]

In the interest of reducing the delta from Debian <http://patches.ubuntu.com/b/base-files/base-files_6.3ubuntu2.patch>:
• There also are two copies of ‘etc/profile.d’ in debian/directory-list. The second was added by Ubuntu and should be removed.
• The comment about the default umask isn’t in Debian at all and might as well be removed now too.

When modifying share/profile, you also need to update share/profile.md5sums (by running ‘debian/rules clean’), so that old copies of /etc/profile will be automatically updated by the postinst.

[lp:~fougner/ubuntu/oneiric/base-files/fix-for-790050]

77. By Alexander Fougner on 2011-06-22

deleted duplicate entries in debian/directory-list
removed unneeded comment from share/profile

[Barry Warsaw (barry)]

Hi Alexander, thanks for your contribution to Ubuntu.

It looks to me like your patch removes too much from share/profile. While your commit message specifically says that you're removing an unneeded comment from share/profile, you're actually also removing the sourcing of /etc/profile.d/*.sh. That clearly can't be right, e.g. it would stop the sourcing of bash_completion.sh on my Oneiric machine.

Can you please push an update to your branch? I'll be happy to re-review and sponsor it when you do.

review: Needs Fixing

[Barry Warsaw (barry)]

Oh wait, never mind. I see what's going on now.

[Barry Warsaw (barry)]

review: Approve

[Barry Warsaw (barry)]

Uploaded. Thanks again for your contribution!

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-04 23:20:17 +0000
+++ debian/changelog	2011-06-22 08:29:35 +0000
@@ -1,3 +1,10 @@
+base-files (6.3ubuntu3) oneiric; urgency=low
+
+  * Removed duplicate code in share/profile, causing /etc/profile.d/*
+    scripts to be executed twice (LP: #790050)
+
+ -- Alexander Fougner <[e-mail]>  Sat, 18 Jun 2011 00:23:05 +0200
+
 base-files (6.3ubuntu2) oneiric; urgency=low
 
   * Restore /usr/share/base-files/networks.
 
=== modified file 'debian/directory-list'
--- debian/directory-list	2011-05-04 10:31:43 +0000
+++ debian/directory-list	2011-06-22 08:29:35 +0000
@@ -3,7 +3,6 @@
 dev
 etc
 etc/default
-etc/profile.d
 etc/skel
 etc/profile.d
 etc/update-motd.d
 
=== modified file 'share/profile'
--- share/profile	2011-05-04 10:31:43 +0000
+++ share/profile	2011-06-22 08:29:35 +0000
@@ -25,15 +25,3 @@
     fi
   fi
 fi
-
-# The default umask is now handled by pam_umask.
-# See pam_umask(8) and /etc/login.defs.
-
-if [ -d /etc/profile.d ]; then
-  for i in /etc/profile.d/*.sh; do
-    if [ -r $i ]; then
-      . $i
-    fi
-  done
-  unset i
-fi
 
=== modified file 'share/profile.md5sums'
--- share/profile.md5sums	2011-05-04 10:31:43 +0000
+++ share/profile.md5sums	2011-06-22 08:29:35 +0000
@@ -1,5 +1,6 @@
 4a409a5f2242928822658b14918b2ee1
 61a3f85a2dc30f4e920f615109137be5
+863ed3bf8041b035234cce25d4792fdd
 9519666d98e08940df6f25dcf4598bef
 9a279ae6bdd1251f64b7e70e960ef00d
 b59ea6ac3a1ad8c0527ec94f73bafca0