Merge branch 'master' into xml-support

kdesrc-build

@@ -2147,7 +2147,7 @@ sub git_stash_and_update
 
     if ($status == -1 || $status & 127) {
         die make_exception('Runtime',
-            "$module doesn't appear to be a git module when" .
+            "$module doesn't appear to be a git module when " .
             "trying to see if there are changes.");
     }
 
@@ -2160,7 +2160,7 @@ sub git_stash_and_update
         $status = pretending() ? 0 : system('git', 'diff', '--cached', '--quiet');
         if ($status == -1 || $status & 127) {
             die make_exception('Runtime',
-                "$module doesn't appear to be a git module when" .
+                "$module doesn't appear to be a git module when " .
                 "trying to see if there are changes.");
         }
         else {
@@ -3024,6 +3024,12 @@ sub default_module_branch
         '4.3' => {
             'kdesupport' => 'tags/kdesupport-for-4.3/kdesupport',
         },
+        '4.4' => {
+            'kdesupport' => 'tags/kdesupport-for-4.4/kdesupport',
+        },
+        '4.5' => {
+            'kdesupport' => 'tags/kdesupport-for-4.5/kdesupport',
+        },
     );
 
     # qr() compiles a regex for use in later matching.
@@ -3048,13 +3054,6 @@ sub default_module_branch
         return $branched_modules_exceptions{$branch}->{$module};
     }
 
-    # kdesupport uses a naming convention to tag required kdesupport software for
-    # a release, see if we're supposed to fall under that.
-    if ($module eq 'kdesupport' && $branch =~ /^\d\.\d*$/)
-    {
-        return "tags/kdesupport-for-$branch";
-    }
-
     return $branch;
 }