Merge branch 'daily' of ssh://git/srv/git/jenkins_build_script into daily

Conflicts:
	build.py

diff --cc build.py
index caa1ff9bd9d6d4bbdbc036859d0f10f611183ecf,a88084743383f1fa18dd9f9a9dbcbbb25e3d3150..2c5ecbf47e4ea3ff48ce1a2db9f8ad9f02ca34a7
--- 1/build.py
--- 2/build.py
+++ b/build.py
@@@ -363,11 -363,11 +363,11 @@@ if __name__ == '__main__'
          logger.info(stdout_msg)
  
        # i hate this: a version needs to include a . now...
 -      #cmd = ['grep-dctrl', '-n', '-s', 'Version', '.']
 -      cmd = [ "awk '/^Version: / {print $2}'"]
 +      cmd = ['grep-dctrl', '-n', '-s', 'Version', '']
-       #cmd = [ 'awk', '/^Version: / {print $2}']
++      #cmd = [ "awk '/^Version: / {print $2}'"]
        grep_dctrl =  subprocess.Popen(
                  cmd,
-                 shell=False,
+                 shell=True,
                  close_fds=True,
                stdin=parse_changelog.stdout,
                  stdout=subprocess.PIPE,