From 08a71b176f5b23fa4e57213dcbadcf7bdef0ab04 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 15 Aug 2016 14:42:39 +0200
Subject: Do not licence composer stuff

---
 build/license.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/license.php b/build/license.php
index 11675f21a07..cd043498c49 100644
--- a/build/license.php
+++ b/build/license.php
@@ -99,7 +99,7 @@ EOD;
 
 		$excludes = array_map(function($item) use ($folder) {
 			return $folder . '/' . $item;
-		}, ['vendor', '3rdparty', '.git', 'l10n', 'templates']);
+		}, ['vendor', '3rdparty', '.git', 'l10n', 'templates', 'composer']);
 
 		$iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
 		$iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
-- 
cgit v1.2.3


From b5f61ba0e260acd220adc3e8b4f6285b0d265ca7 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 15 Aug 2016 14:51:09 +0200
Subject: If there is no copyright notice print comment line

---
 build/license.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/license.php b/build/license.php
index cd043498c49..5ada91a0f33 100644
--- a/build/license.php
+++ b/build/license.php
@@ -154,7 +154,12 @@ With help from many libraries and frameworks including:
 		} else {
 			$license = str_replace('@AUTHORS@', $authors, $this->licenseText);
 		}
-		$license = str_replace('@COPYRIGHT@', $copyrightNotices, $license);
+
+		if ($copyrightNotices === '') {
+			$license = str_replace('@COPYRIGHT@', ' *', $license);
+		} else {
+			$license = str_replace('@COPYRIGHT@', $copyrightNotices, $license);
+		}
 
 		$source = $this->eatOldLicense($source);
 		$source = "<?php" . PHP_EOL . $license . PHP_EOL . $source;
-- 
cgit v1.2.3