CDRIVER-1864, CDRIVER-1865 fix Debian package build in Evergreen, 2

Author: rcsanchez97

.evergreen/config.yml

@@ -1557,15 +1557,23 @@ tasks:
               set -o errexit
               if [ "${is_patch}" = "true" ]; then
                 cd mongoc
-                git diff HEAD > ../evergreen.patch
+                git diff HEAD -- . ':!debian' > ../upstream.patch
+                git diff HEAD -- debian > ../debian.patch
                 git clean -fdx
                 git reset --hard HEAD
-                [ -d debian/patches ] || mkdir debian/patches
-                mv ../evergreen.patch debian/patches/
-                echo evergreen.patch >> debian/patches/series
-                git add debian/patches/*
-                git commit -m 'Evergreen patch build'
-                git log -n1 -p
+                if [ -s ../upstream.patch ]; then
+                  [ -d debian/patches ] || mkdir debian/patches
+                  mv ../upstream.patch debian/patches/
+                  echo upstream.patch >> debian/patches/series
+                  git add debian/patches/*
+                  git commit -m 'Evergreen patch build - upstream changes'
+                  git log -n1 -p
+                fi
+                if [ -s ../debian.patch ]; then
+                  git apply --index ../debian.patch
+                  git commit -m 'Evergreen patch build - Debian packaging changes'
+                  git log -n1 -p
+                fi
                 cd ..
               fi
               git clone https://salsa.debian.org/installer-team/debootstrap.git debootstrap.git

build/config.yml.template

@@ -1560,15 +1560,23 @@ tasks:
               set -o errexit
               if [ "${is_patch}" = "true" ]; then
                 cd mongoc
-                git diff HEAD > ../evergreen.patch
+                git diff HEAD -- . ':!debian' > ../upstream.patch
+                git diff HEAD -- debian > ../debian.patch
                 git clean -fdx
                 git reset --hard HEAD
-                [ -d debian/patches ] || mkdir debian/patches
-                mv ../evergreen.patch debian/patches/
-                echo evergreen.patch >> debian/patches/series
-                git add debian/patches/*
-                git commit -m 'Evergreen patch build'
-                git log -n1 -p
+                if [ -s ../upstream.patch ]; then
+                  [ -d debian/patches ] || mkdir debian/patches
+                  mv ../upstream.patch debian/patches/
+                  echo upstream.patch >> debian/patches/series
+                  git add debian/patches/*
+                  git commit -m 'Evergreen patch build - upstream changes'
+                  git log -n1 -p
+                fi
+                if [ -s ../debian.patch ]; then
+                  git apply --index ../debian.patch
+                  git commit -m 'Evergreen patch build - Debian packaging changes'
+                  git log -n1 -p
+                fi
                 cd ..
               fi
               git clone https://salsa.debian.org/installer-team/debootstrap.git debootstrap.git