From 465e35e14decefb86312199f97db7eb4a0deeb57 Mon Sep 17 00:00:00 2001
From: tdesveaux <desveaux.thomas@gmail.com>
Date: Thu, 30 May 2019 19:10:03 +0200
Subject: [PATCH 1/2] package.lua: do not use gitattributes export-ignore as
 it's used by github package as well

---
 .gitattributes      | 11 -----------
 scripts/package.lua | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index ea6322008a..0000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,11 +0,0 @@
-# Setup archive tags
-
-.DS_Store		export-ignore
-.gitignore		export-ignore
-.gitattributes	export-ignore
-.gitmodules		export-ignore
-.travis.yml		export-ignore
-.editorconfig	export-ignore
-appveyor.yml	export-ignore
-Bootstrap.*		export-ignore
-packages/*		export-ignore
diff --git a/scripts/package.lua b/scripts/package.lua
index 369cd5425f..adbefec7eb 100644
--- a/scripts/package.lua
+++ b/scripts/package.lua
@@ -217,7 +217,22 @@ if kind == "source" then
 
 	print("Creating source code package...")
 
-	if 	not execQuiet("git add -f build") or
+	local	excludeList = {
+		".gitignore",
+		".gitattributes",
+		".gitmodules",
+		".travis.yml",
+		".editorconfig",
+		"appveyor.yml",
+		"Bootstrap.*",
+		"packages/*",
+	}
+	local	includeList = {
+		"build",
+	}
+
+	if	not execQuiet("git rm --cached -r -f --ignore-unmatch "..table.concat(excludeList, ' ')) or
+		not execQuiet("git add -f "..table.concat(includeList, ' ')) or
 		not execQuiet("git stash") or
 		not execQuiet("git archive --format=zip -9 -o ../%s-src.zip --prefix=%s/ stash@{0}", pkgName, pkgName) or
 		not execQuiet("git stash drop stash@{0}")

From e4d8121f9cda079153aec273758f7bdfa342cf43 Mon Sep 17 00:00:00 2001
From: tdesveaux <desveaux.thomas@gmail.com>
Date: Thu, 30 May 2019 19:10:28 +0200
Subject: [PATCH 2/2] package.lua: Fix source package not containing scripts.c

---
 scripts/package.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/package.lua b/scripts/package.lua
index adbefec7eb..b051bb11a7 100644
--- a/scripts/package.lua
+++ b/scripts/package.lua
@@ -229,6 +229,7 @@ if kind == "source" then
 	}
 	local	includeList = {
 		"build",
+		"src/scripts.c",
 	}
 
 	if	not execQuiet("git rm --cached -r -f --ignore-unmatch "..table.concat(excludeList, ' ')) or