From eeab5f5b5e7957eddd6ea0a0c420e95d288b8145 Mon Sep 17 00:00:00 2001
From: TheBrokenRail <17478432+TheBrokenRail@users.noreply.github.com>
Date: Sat, 11 Jan 2020 19:33:14 -0500
Subject: [PATCH] --exclude-vcs Breaks the DSC Build (#627)

* --exclude-vcs Breaks the DSC Build

* Allow Customizing Distro and Email

* Python 2 is required to build

* Remove Unneeded Arg

* Update lintian-overrides

* Prevent https://bugs.launchpad.net/launchpad/+bug/330711
---
 debian/control                  |  2 +-
 debian/rules                    |  2 +-
 debian/source/lintian-overrides |  2 ++
 tools/makedeb                   | 12 ++++++------
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index fd5f60e75..8e83da48f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Lubos Dolezel <lubos@dolezel.info>
 Section: misc
 Priority: optional
 Standards-Version: 4.4.0
-Build-Depends: cmake, clang, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build
+Build-Depends: cmake, clang, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build, python2
 
 Package: darling
 Architecture: amd64
diff --git a/debian/rules b/debian/rules
index fa91309e4..93b6707cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --builddirectory=debbuild --parallel
+	dh $@ --builddirectory=debbuild
 
 override_dh_auto_configure:
 	mkdir debbuild
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 18d7d3f58..cbf5567bb 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,3 +2,5 @@ darling source: configure-generated-file-in-source *
 darling source: autotools-pkg-config-macro-not-cross-compilation-safe *
 darling source: source-contains-prebuilt-windows-binary *
 darling source: maintainer-script-lacks-debhelper-token debian/*
+darling source: debhelper-but-no-misc-depends darling-dkms
+darling source: package-needs-versioned-debhelper-build-depends 10
diff --git a/tools/makedeb b/tools/makedeb
index 0702a5aba..7570eb365 100755
--- a/tools/makedeb
+++ b/tools/makedeb
@@ -3,16 +3,16 @@ set -e
 
 DATE=$(date +%Y%m%d)
 rm -f debian/changelog
-EDITOR=true NAME="Darling build server" EMAIL=noreply@darlinghq.org dch -u low -v 0.1.${DATE} --create --distribution testing --package darling "Daily build"
+DISTRO=${DEB_DISTRO:-testing}
+VERSION=0.1.${DATE}~${DISTRO}
+EDITOR=true NAME="Darling build server" EMAIL=${DEB_EMAIL:-noreply@darlinghq.org} dch -u low -v ${VERSION} --create --distribution ${DISTRO} --package darling "Daily build"
 
 if [ "$1" = "--dsc" ]; then
     ARG='-S'
-    if [ -e "../darling_0.1.${DATE}.orig.tar.xz" ]; then
-        rm ../darling_0.1.${DATE}.orig.tar.xz
+    if [ -e "../darling_${VERSION}.orig.tar.xz" ]; then
+        rm ../darling_${VERSION}.orig.tar.xz
     fi
-    tar --exclude-vcs --exclude-vcs-ignores -cf ../darling_0.1.${DATE}.orig.tar .
-    tar -rf ../darling_0.1.${DATE}.orig.tar debian/changelog
-    xz ../darling_0.1.${DATE}.orig.tar
+    tar -cJf ../darling_${VERSION}.orig.tar.xz .
 else
     ARG='-b'
 fi