# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ceg@localhost-20100326211333-o1pe0qt4hltzgkdv
# target_branch: http://bazaar.launchpad.net/~ubuntu-\
#   branches/ubuntu/lucid/pam/lucid/
# testament_sha1: 0541d5200f3a81f676f506f1b1894f34cf4cd1bd
# timestamp: 2010-03-26 22:13:55 +0100
# base_revision_id: james.westby@ubuntu.com-20100218120418-\
#   0wng4m8llb70gv7o
# 
# Begin patch
=== modified file 'debian/local/common-session'
--- debian/local/common-session	2009-03-20 19:12:10 +0000
+++ debian/local/common-session	2010-03-26 21:13:33 +0000
@@ -22,4 +22,9 @@
 session	required			pam_permit.so
 # and here are more per-package modules (the "Additional" block)
 $session_additional
+# The pam_umask module will set the umask according to the system default in
+# /etc/login.defs and user settings, solving the problem of different
+# umask settings with different shells, display managers, remote sessions etc.
+# See "man pam_umask".
+session optional pam_umask.so usergroups
 # end of pam-auth-update config

=== modified file 'debian/local/common-session-noninteractive'
--- debian/local/common-session-noninteractive	2009-08-23 20:14:58 +0000
+++ debian/local/common-session-noninteractive	2010-03-26 21:13:33 +0000
@@ -22,4 +22,9 @@
 session	required			pam_permit.so
 # and here are more per-package modules (the "Additional" block)
 $session_nonint_additional
+# The pam_umask module will set the umask according to the system default in
+# /etc/login.defs and user settings, solving the problem of different
+# umask settings with different shells, display managers, remote sessions etc.
+# See "man pam_umask".
+session optional pam_umask.so usergroups
 # end of pam-auth-update config

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTyqNi4AAhxfgAAQWHf/91IE
TAC////wUAUu8KAdtOyxhQDCU1SnqflMJpoan4qZqeo9TQaaAD0gDUT1GkyP1Rk2poDRgTQyaaGQ
0xhoaAAADQAAAAAkUEnlCj2jUY0U3ooeieU2k8pkZNMFUhATEYkxMmhPQRlTTNNJpk2prJfIva3T
xFq9zUQMjlozNplYzERVSJ555qjgXxp5jScjKNjWj9YF06ZpxC0gSlLyxh1Lz++h1P2fUmdq1/mb
+JqODY7mN0TfyrUYJxNRasbFitYbnZWmqZslaja4/bh9K863D0enhvfMKpQe70Eo9/XDNFIk0dOi
tPNKOQsVT3M7+tfkMSceO94LrP7hY4MoaqX5uCpg2caId6XacQ5jOUQnrNxhtoqJgRW0GO1lkw/l
YLEBK7ItLsVtkKrZIfMX5oly3XxD3r6tfbbaNtVfs4Rv2Ya8a9Ktg7n8mj9or/rbPSVi181RrGj4
x5L6UXtrNRXw7xdrymQ3LYqS7xdFLDB9ea4ZX3lj6LmudkNHPZ09LYmoLPDR0cpwaWCwXJOOmWnl
axV+at5P88jcZ5F0s4kTTJ539HerbW21VHnx1yUpd7CXxGXRtxYT2R483aGpg6QlK+Fk9MVhylet
N/07l7IYlsp2o9zktWq92R6sLG6wlFUaMdF95Nok8IuRu0Ties191e5Wa1WYTxZtzys+sUhNxMID
CWBmCyOdRgwsZ3IPZllQ4/AkgeRKmkDUSFqIB0diqilXn4rbsKnE0RGGHQswQckWVGm35w6+mRjU
vSh/rzoecRM7knVq48l/N1d70k/PNno+3jjMVt0kYj/s70jnVKI/dGrUFPkZ7EvIJiWg8Dj98RFX
HA8JkJ9DnzRajgLXAHQpXkVSIasg8DI4r3ngyJssMb+iteTD6L1SkrB8KBQ6uwdXhMPBwe87/VbD
mmvbWazJjFR2SXzOcdh42vKPqUSJv1omwwF3i671LNf9/Z7tvuylO1ZDhVn7OmEn9jsuGhWbQeMX
xt3LPxmNBAuLjabkzUsgxLHSUQktZtuRg5JD8UQN5wIBlRjRZeZz5nEvzPdM6H21li/LDVclyPwd
huanQbik0FQLS8DsJhvXaaM8oaRf4mLLE3gYILQmZspj8/dDnsS0i7ijhHm+YY9lywwj8dN9u8ix
IxL4XtlH0ssb74Zx+6qOUh1nmaDuhyuztYJORshSZ6px5O33TdpKLkJuX6Ret/L7vzB8K2KxL5H2
VEob4yiL3ZdEPWKh4ZvG8WpxGxZZHnbFqpKCZhOJAxEFJEWjcmEL2u8GdxGAqJTTTYZQnHt2dXc6
3jVSIS1feNFS12hGAsiSPjDOKFRs+JbG22F6cbaRzgua3J9S8d6SRXVH7Ceb3w4foXr6LXE4LTUV
dO9E4eknEwVFcRh6VRVHvbGxxpP6q4rKO90VtzvTZF0Pww407jPN3MUpNBVFNFFyNZSJFGMQwPj8
LVrIjugkj9WKK2TZvTWMhPqK6Uf0TRWYYK1dbbTYbLU0X3cMVxyedr2xhiXSMNpOGQ2Q1PiEo6Zs
XCJJHhDLVUfK6I6OsZ03RuLWIY7GKiIIwah7G+NwjWxiXE9rSAzf4u5IpwoSB5VGxcA=