Fixed a couple of Debian packaging bugs and cleaned out tabs from

[refind] / mkdistrib

diff --git a/mkdistrib b/mkdistrib
index 537db79b1bf77dbe61c8a8f2b55b4f81d72e80d8..938679932c2510309592a1bc913a37c3abe997a2 100755 (executable)
--- a/mkdistrib
+++ b/mkdistrib
@@ -44,10 +44,13 @@ set -e
 
 make clean
 
+# Remove temporary files from the "debian" subdirectory
+rm -rf debian/refind debian/*.log
+
 # Prepare a place and copy files there....
 mkdir -p ../snapshots/$1/refind-$1/icons
-cp --preserve=timestamps icons/*.icns ../snapshots/$1/refind-$1/icons/
-cp -a docs images keys fonts banners include EfiLib libeg mok refind filesystems gptsync refind.spec install.sh mkrlconf.sh mvrefind.sh CREDITS.txt NEWS.txt BUILDING.txt COPYING.txt LICENSE.txt README.txt refind.inf Make.tiano Make.common Makefile refind.conf-sample ../snapshots/$1/refind-$1
+cp --preserve=timestamps icons/*png ../snapshots/$1/refind-$1/icons/
+cp -a debian docs images keys fonts banners include EfiLib libeg mok net refind filesystems gptsync refind.spec install.sh mkrlconf.sh mvrefind.sh CREDITS.txt NEWS.txt BUILDING.txt COPYING.txt LICENSE.txt README.txt refind.inf Make.tiano Make.common Makefile refind.conf-sample ../snapshots/$1/refind-$1
 
 # Go there and prepare a souce code zip file....
 cd ../snapshots/$1/
@@ -56,7 +59,7 @@ zip -9r refind-src-$1.zip refind-$1
 
 # Build the IA32 binaries
 cd refind-$1
-ARCH=ia32 make -j4
+ARCH=ia32 make -j1
 ARCH=ia32 make fs
 mkdir -p refind-bin-$1/refind/drivers_ia32
 cp --preserve=timestamps drivers_ia32/*_ia32.efi refind-bin-$1/refind/drivers_ia32/
@@ -68,7 +71,7 @@ cp --preserve=timestamps gptsync/gptsync_ia32.efi refind-bin-$1/refind/tools_ia3
 
 # Build the X64 binaries
 make clean
-make -j4
+make -j1
 make fs
 mkdir -p refind-bin-$1/refind/drivers_x64
 cp -a icons refind-bin-$1/refind/
@@ -100,7 +103,7 @@ zip -9r ../refind-bin-$1.zip refind-bin-$1
 
 # Prepare a variant with the x86-64 version built with GNU-EFI....
 make clean
-make -j4 gnuefi
+make -j1 gnuefi
 if [[ $SignIt == 1 ]] ; then
    $SBSign --key $KeysDir/refind.key --cert $KeysDir/refind.crt --output refind-bin-$1/refind/refind_x64.efi refind/refind_x64.efi
 else