Merge branch 'master.upstream' into staging.upstream

pkgs/development/python-modules/poezio/fix_requirements.patch

@@ -1,11 +0,0 @@
---- a/setup.py	2014-03-20 22:27:14.000000000 +0100
-+++ b/setup.py	2015-07-10 21:18:30.156196111 +0200
-@@ -49,7 +49,7 @@
-        scripts = ['scripts/poezio'],
-        data_files = [('share/man/man1/', ['data/poezio.1'])],
- 
--       install_requires = ['sleekxmpp==1.2.4',
-+       install_requires = ['sleekxmpp==1.2.5',
-                            'dnspython3>=1.11.1'],
-        extras_require = {'OTR plugin': 'python-potr>=1.0',
-                          'Screen autoaway plugin': 'pyinotify==0.9.4'}

pkgs/development/python-modules/poezio/make_default_config_writable.patch

@@ -1,25 +1,25 @@
 diff -ruN a/src/config.py b/src/config.py
---- a/src/config.py	2014-03-20 22:27:05.000000000 +0100
-+++ b/src/config.py	2015-07-10 21:24:37.583136078 +0200
-@@ -18,6 +18,7 @@
+--- a/src/config.py	2015-07-31 19:35:37.000000000 +0000
++++ b/src/config.py	2015-08-03 09:23:34.322098081 +0000
+@@ -14,6 +14,7 @@
  
+ import logging.config
  import os
- import logging
 +import stat
+ import sys
+ import pkg_resources
  
- from configparser import RawConfigParser, NoOptionError, NoSectionError
- from os import environ, makedirs, path, remove
-@@ -279,6 +280,13 @@
-         copy2(default, options.filename)
-     elif path.isfile(other):
-         copy2(other, options.filename)
+@@ -563,6 +564,13 @@
+             copy2(default, options.filename)
+         elif path.isfile(other):
+             copy2(other, options.filename)
 +
-+    # Inside the nixstore, the reference file is readonly, so is the copy.
-+    # Make it writable by the user who just created it.
-+    if os.path.exists(options.filename):
-+        os.chmod(options.filename,
-+                 os.stat(options.filename).st_mode | stat.S_IWUSR)
++        # Inside the nixstore, the reference file is readonly, so is the copy.
++        # Make it writable by the user who just created it.
++        if os.path.exists(options.filename):
++            os.chmod(options.filename,
++                     os.stat(options.filename).st_mode | stat.S_IWUSR)
 +
-     firstrun = True
+         global firstrun
+         firstrun = True
  
- try: